Merge pull request #57 from GrahamCampbell/master

Minor Tweaks

.travis.yml

@@ -1,13 +1,19 @@
 language: php
 
-php: 
+php:
   - 5.3
   - 5.4
   - 5.5
+  - hhvm
 
 before_script:
   - composer self-update
-  - composer install --prefer-source --no-interaction --dev
+  - composer install --no-interaction --prefer-source --dev
 
 script:
   - phpunit
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true

LICENSE.md

@@ -1,15 +1,15 @@
-MIT License 
+MIT License
 
 Copyright (c) 2013 Micheal Mand
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

README.md

@@ -103,7 +103,7 @@ By default, LogViewer will register itself a couple of routes:
  * `logviewer/$app/$sapi/$date/delete` -> Delete log from `$sapi` (see: [php\_sapi\_name](http://php.net/manual/en/function.php-sapi-name.php)) on `$date` (`Y-m-d` format).
  * `logviewer/$app/$sapi/$date/$level?` -> Show log from `$sapi` on `$date` with `$level` (if not supplied, defaults to all).
 
-LogViewer also registers a couple filters: 
+LogViewer also registers a couple filters:
 
  * `logviewer.logs`: aggregates all the logs in your configured monitored directories and shares them with the `$logs` variable.
  * `logviewer.messages`: Checks if there are success, error, or info flash messages in the session and sets the `$has_messages` variable as true or false.

composer.json

@@ -29,7 +29,7 @@
     },
     "autoload": {
         "classmap": [
-            
+
         ],
         "psr-0": {
             "Kmd\\Logviewer": "src/"

src/Kmd/Logviewer/Logviewer.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Lang;
 use Psr\Log\LogLevel;
 use ReflectionClass;
 
@@ -18,7 +17,7 @@ class Logviewer
 
     /**
      * Create a new Logviewer.
-     * 
+     *
      * @access public
      * @param string
      * @param string
@@ -36,7 +35,7 @@ public function __construct($app, $sapi, $date, $level = 'all')
 
     /**
      * Check if the log is empty.
-     * 
+     *
      * @access public
      * @return boolean
      */
@@ -47,7 +46,7 @@ public function isEmpty()
 
     /**
      * Open and parse the log.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -100,7 +99,7 @@ public function log()
 
     /**
      * Delete the log.
-     * 
+     *
      * @access public
      * @return boolean
      */
@@ -115,7 +114,7 @@ public function delete()
 
     /**
      * Get the log levels from psr/log.
-     * 
+     *
      * @access public
      * @return array
      */

src/Kmd/Logviewer/LogviewerFacade.php

@@ -1,9 +1,9 @@
 <?php
 
 namespace Kmd\Logviewer;
- 
+
 use Illuminate\Support\Facades\Facade;
- 
+
 class LogviewerFacade extends Facade
 {
     /**

src/filters.php

@@ -8,9 +8,9 @@
     foreach (Lang::get('logviewer::logviewer.sapi') as $sapi => $human) {
         $logs[$sapi]['sapi'] = $human;
         $dirs = Config::get('logviewer::log_dirs');
-        
+
         $files = array();
-        
+
         foreach ($dirs as $app => $dir) {
             $files[$app] = glob($dir.'/log-'.$sapi.'*', GLOB_BRACE);
             if (is_array($files[$app])) {
@@ -22,10 +22,10 @@
                 $files[$app] = array();
             }
         }
-        
+
         $logs[$sapi]['logs'] = $files;
     }
-    
+
     View::share('logs', $logs);
 });
 

src/lang/de/logviewer.php

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    
+
     'delete' => array(
         'modal' => array(
             'header' => 'Bist du dir sicher?',
@@ -36,5 +36,5 @@
         'cli' => 'CLI',
     ),
     'title' => 'Laravel 4 LogViewer',
-    
+
 );

src/lang/en/logviewer.php

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    
+
     'delete' => array(
         'modal' => array(
             'header' => 'Are you sure?',
@@ -36,5 +36,5 @@
         'cli' => 'CLI',
     ),
     'title' => 'Laravel 4 LogViewer',
-    
+
 );

src/lang/es/logviewer.php

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    
+
     'delete' => array(
         'modal' => array(
             'header' => '¿Está seguro?',
@@ -36,5 +36,5 @@
         'cli' => 'CLI',
     ),
     'title' => 'Laravel 4 LogViewer',
-    
+
 );

src/lang/nl/logviewer.php

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    
+
     'delete' => array(
         'modal' => array(
             'header' => 'Weet je het zeker?',
@@ -36,5 +36,5 @@
         'cli' => 'CLI',
     ),
     'title' => 'Laravel 4 LogViewer',
-    
+
 );

src/views/viewer.blade.php

@@ -1,35 +1,35 @@
 <!DOCTYPE html>
 <html lang="{{ Config::get('app.locale') }}">
-    
+
     <head>
         <meta charset="utf-8">
         <title>{{ Lang::get('logviewer::logviewer.title') }}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        
+
         {{ HTML::style('//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.no-icons.min.css') }}
         {{ HTML::style('//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css') }}
         {{ HTML::style('//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css') }}
         {{ HTML::style('packages/kmd/logviewer/css/style.css') }}
-        
+
         <link rel="shortcut icon" href="{{ URL::to('packages/kmd/logviewer/ico/favicon.png') }}">
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ URL::to('packages/kmd/logviewer/ico/apple-touch-icon-144-precomposed.png') }}">
         <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ URL::to('packages/kmd/logviewer/ico/apple-touch-icon-114-precomposed.png') }}">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ URL::to('packages/kmd/logviewer/ico/apple-touch-icon-72-precomposed.png') }}">
         <link rel="apple-touch-icon-precomposed" href="{{ URL::to('packages/kmd/logviewer/ico/apple-touch-icon-57-precomposed.png') }}">
-        
+
         <!--[if lt IE 9]>
             <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
-        
+
         {{ HTML::script('//cdnjs.cloudflare.com/ajax/libs/respond.js/1.3.0/respond.min.js') }}
     </head>
-    
+
     <body>
-        
+
         <div class="wrapper">
-            
+
             <div class="container-fluid">
-                
+
                 <header>
                     <div class="navbar navbar-static-top navbar-inverse">
                         <div class="navbar-inner">
@@ -50,9 +50,9 @@
                         </div>
                     </div>
                 </header>
-                
+
                 <div class="row-fluid">
-                    
+
                     <div class="span2">
                         <div id="nav" class="well">
                             <ul class="nav nav-list">
@@ -76,7 +76,7 @@
                             </ul>
                         </div>
                     </div>
-                    
+
                     <div class="span10">
                         <div class="row-fluid{{ ! $has_messages ? ' hidden' : '' }}">
                             <div class="span12" id="messages">
@@ -133,13 +133,13 @@
                             </div>
                         </div>
                     </div>
-                    
+
                 </div>
-                
+
             </div>
-            
+
         </div>
-        
+
         <div id="delete_modal" class="modal hide fade">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">×</button>
@@ -153,12 +153,12 @@
                 <button class="btn btn-danger" data-dismiss="modal">{{ Lang::get('logviewer::logviewer.delete.modal.btn.no') }}</button>
             </div>
         </div>
-        
+
         {{ HTML::script('//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js') }}
         <script>window.jQuery || document.write('<script src="{{ URL::to("packages/kmd/logviewer/js/jquery-1.10.2.min.js") }}"><\/script>')</script>
         {{ HTML::script('//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js') }}
         {{ HTML::script('packages/kmd/logviewer/js/script.js') }}
-        
+
     </body>
-    
+
 </html>

tests/LogviewerTest.php

@@ -6,11 +6,11 @@
 class LogviewerTest extends PHPUnit_Framework_TestCase
 {
     public $logviewer;
-    
+
     public function setUp()
     {
         parent::setUp();
-        
+
         $app = m::mock('AppMock');
         $app->shouldReceive('instance')->once()->andReturn($app);
 
@@ -19,16 +19,16 @@ public function setUp()
 
         $config->shouldReceive('get')->once()->with('logviewer::log_dirs')
             ->andReturn(array('app' => 'app/storage/logs'));
-        
+
         $this->logviewer = new Logviewer('app', 'cgi-fcgi', '2013-06-01');
     }
-    
+
     public function tearDown()
     {
         $this->logviewer = null;
         m::close();
     }
-    
+
     public function testLogLevels()
     {
         $levels = array(
@@ -41,28 +41,28 @@ public function testLogLevels()
             'INFO' => 'info',
             'DEBUG' => 'debug',
         );
-        
+
         $psr = $this->logviewer->getLevels();
-        
+
         $this->assertEquals(count($levels), count($psr));
-        
+
         $this->assertEquals($levels, $psr);
     }
-    
+
     public function testLogAggregationRegex()
     {
         $date = '2013-06-01';
-        
+
         $pattern = '/.*(\d{4}-\d{2}-\d{2}).*/';
-        
+
         $files = array(
             '/path/to/laravel/app/storage/logs/log-cli-2013-06-01.txt',
             '/path/to/laravel/app/storage/logs/log-apache2handler-2013-06-01.txt',
             '/path/to/laravel/app/storage/logs/log-apache2filter-2013-06-01.txt',
             '/path/to/laravel/app/storage/logs/log-apache-2013-06-01.txt',
             '/path/to/laravel/app/storage/logs/log-cgi-fcgi-2013-06-01.txt',
         );
-        
+
         foreach ($files as &$file) {
             $file = preg_replace($pattern, '$1', basename($file));
             $this->assertEquals($file, $date);