clarity 0.9.5 → 0.9.7

data/Manifest.txt

@@ -7,7 +7,7 @@ bin/clarity
 config/config.yml.sample
 lib/clarity.rb
 lib/clarity/cli.rb
-lib/clarity/commands/command_builder.rb
+lib/clarity/commands/grep_command_builder.rb
 lib/clarity/commands/tail_command_builder.rb
 lib/clarity/grep_renderer.rb
 lib/clarity/process_tree.rb
@@ -22,12 +22,9 @@ public/stylesheets/app.css
 script/console
 script/destroy
 script/generate
-test/commands/command_builder_test.rb
+test/commands/grep_command_builder_test.rb
 test/commands/tail_command_builder_test.rb
 test/files/logfile.log
-test/parsers/hostname_parser_test.rb
-test/parsers/shop_parser_test.rb
-test/parsers/time_parser_test.rb
 test/test_helper.rb
 test/test_string_scanner.rb
 views/_header.html.erb

data/README.rdoc

@@ -8,8 +8,8 @@ Clarity - a log search tool
 By John Tajima & Tobi Lütke
 
 Clarity is a Splunk like web interface for your server log files. It supports 
-searching (using grep) as well as trailing log files. It has been written using 
-the event based architecture based on EventMachine and so allows real-time search
+searching (using grep) as well as trailing log files in realtime. It has been written 
+using the event based architecture based on EventMachine and so allows real-time search
 of very large log files. If you hit the browser Stop button it will also kill 
 the grep / tail utility. 
 
@@ -20,6 +20,21 @@ big success internally that we decided to release it as open source.
 == USAGE:
 
   clarity --username=admin --password=secret --port=8989 /var/log
+  
+== COMMANDLINE:
+  
+  Specific options:
+      -f, --config=FILE                Config file (yml)
+      -p, --port=PORT                  Port to listen on
+      -b, --address=ADDRESS            Address to bind to (default 0.0.0.0)
+          --include=MASK               File mask of logs to add (default: **/*.log*)
+          --user=USER                  User to run as   
+  Password protection:
+          --username=USER              Enable httpauth username
+          --password=PASS              Enable httpauth password   
+  Misc:
+      -h, --help                       Show this message.
+  
 
 == SCREENSHOT: 
 
@@ -29,6 +44,7 @@ http://img.skitch.com/20091104-je9kq1a2gfr586ia8y246bq4n8.png
 
   * eventmachine
   * eventmachine_httpserver
+  * json
 
 == INSTALL:
 

data/Rakefile

@@ -12,9 +12,11 @@ Hoe.plugin :newgem
 $hoe = Hoe.spec 'clarity' do
   self.developer 'Tobias Lütke', 'tobi@shopify.com'
   self.developer 'John Tajima', 'john@shopify.com'
-  self.post_install_message = 'PostInstall.txt'  
-  self.extra_deps         = [['eventmachine','>= 0.12.10'], ['eventmachine_httpserver','>= 0.2.0']]
-  self.test_globs = ['test/**/*_test.rb']
+  self.summary = 'Web interface for grep and tail -f'  
+  #self.post_install_message = 'PostInstall.txt'  
+  self.readme_file          = 'README.rdoc'  
+  self.extra_deps           = [['eventmachine','>= 0.12.10'], ['eventmachine_httpserver','>= 0.2.0'], ["json", ">= 1.0.0"]]
+  self.test_globs           = ['test/**/*_test.rb']
 end
 
 require 'newgem/tasks'

data/lib/clarity.rb

@@ -2,18 +2,16 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
 
 require 'eventmachine'
 require 'evma_httpserver'
+require 'json'
 require 'yaml'
 require 'base64'
 require 'clarity/server'
-require 'clarity/commands/command_builder'
+require 'clarity/commands/grep_command_builder'
 require 'clarity/commands/tail_command_builder'
-require 'clarity/parsers/time_parser'
-require 'clarity/parsers/hostname_parser'
-require 'clarity/parsers/shop_parser'
 require 'clarity/renderers/log_renderer'
 
 module Clarity
-  VERSION = '0.9.5'  
+  VERSION = '0.9.7'  
   
   Templates = File.dirname(__FILE__) + '/../views'
   Public    = File.dirname(__FILE__) + '/../public'

data/lib/clarity/cli.rb

@@ -69,18 +69,18 @@ module Clarity
 
         begin
           opts.parse!(arguments)
+   
+          options[:log_files] ||= ['**/*.log*']
           
           if arguments.first
             Dir.chdir(arguments.first)
+            
+            ::Clarity::Server.run(options)
+            
+          else
+            puts opts
+            exit(1)
           end
-          
-          options[:log_files] ||= ['**/*.log*']
-          
-          ::Clarity::Server.run(options)
-          
-        #rescue
-        #  puts opts
-        #  exit
         end
       end
             

data/lib/clarity/commands/{command_builder.rb → grep_command_builder.rb}

@@ -1,4 +1,4 @@
-class CommandBuilder
+class GrepCommandBuilder
 
   # parameter names
   TermParameters = ['term1', 'term2', 'term3']

data/lib/clarity/commands/tail_command_builder.rb

@@ -1,7 +1,7 @@
 # 
 # Handles tailing of log files
 #
-class TailCommandBuilder < CommandBuilder
+class TailCommandBuilder < GrepCommandBuilder
   
   def valid?
     raise InvalidParameterError, "Log file parameter not supplied or invalid log file" unless filename && !filename.empty? && File.extname(filename) == ".log"

data/lib/clarity/renderers/log_renderer.rb

@@ -29,7 +29,7 @@ class LogRenderer
   private
     
   def html_link(url)
-    uri = URI.parse(url)
+    uri = URI.parse(url) rescue url
     "<a href='#{uri}'>#{url}</a>"
   end
   

data/lib/clarity/server.rb

@@ -28,14 +28,16 @@ module Clarity
           a.required_password = options[:password]
         end
 
-        STDERR.puts "Listening #{options[:address]}:#{options[:port]}..."
+        STDERR.puts "Clarity #{Clarity::VERSION} starting up."
+        STDERR.puts " * listening on #{options[:address]}:#{options[:port]}"
         
         if options[:user]
-          STDERR.puts "Running as user #{options[:user]}"
+          STDERR.puts " * Running as user #{options[:user]}"
           EventMachine.set_effective_user(options[:user])
         end
         
-        STDERR.puts "Adding log files: #{options[:log_files].inspect}"
+        STDERR.puts " * Log mask(s): #{options[:log_files].join(', ')}"
+        STDERR.puts
       end      
     end
 
@@ -55,7 +57,7 @@ module Clarity
         else
           # get command
           command = case params['tool']
-            when 'grep' then CommandBuilder.new(params).command
+            when 'grep' then GrepCommandBuilder.new(params).command
             when 'tail' then TailCommandBuilder.new(params).command
             else raise InvalidParameterError, "Invalid Tool parameter"
           end

data/test/commands/{command_builder_test.rb → grep_command_builder_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class CommandBuilderTest < Test::Unit::TestCase
+class GrepCommandBuilderTest < Test::Unit::TestCase
   
   def setup
     @params = { 
@@ -10,29 +10,29 @@ class CommandBuilderTest < Test::Unit::TestCase
       "term2" => nil,
       "term3" => nil
     }
-    @command = CommandBuilder.new(@params)
+    @command = GrepCommandBuilder.new(@params)
   end
   
   def test_create_new_builder
-    assert @command.is_a?(CommandBuilder)
+    assert @command.is_a?(GrepCommandBuilder)
     assert_equal "testfile.log", @command.filename
     assert_equal 1, @command.terms.size
   end
   
   def test_raises_error_if_no_file
-    assert_raises CommandBuilder::InvalidParameterError do
-      command = CommandBuilder.new(@params.merge("file" => nil))
+    assert_raises GrepCommandBuilder::InvalidParameterError do
+      command = GrepCommandBuilder.new(@params.merge("file" => nil))
     end
   end
   
   def test_exec_functions_for_log
-    command = CommandBuilder.new(@params)
+    command = GrepCommandBuilder.new(@params)
     assert_equal 1, command.exec_functions.size
     assert_match(/^grep/, command.exec_functions.first)
   end
   
   def test_exec_functions_with_multiple_terms_for_log
-    command = CommandBuilder.new(@params.merge("term2" => "bar", "term3" => "baz"))
+    command = GrepCommandBuilder.new(@params.merge("term2" => "bar", "term3" => "baz"))
     assert_equal 3, command.exec_functions.size
     assert_match(/^grep/, command.exec_functions[0])
     assert_match(/^grep/, command.exec_functions[1])
@@ -40,19 +40,19 @@ class CommandBuilderTest < Test::Unit::TestCase
   end
   
   def test_exec_function_with_no_terms_for_log
-    command = CommandBuilder.new(@params.merge("term1" => nil))
+    command = GrepCommandBuilder.new(@params.merge("term1" => nil))
     assert_equal 1, command.exec_functions.size
     assert_match(/^cat/, command.exec_functions[0])
   end
 
   def test_exec_funcations_for_gzip
-    command = CommandBuilder.new(@params.merge("file" => "testfile.gz"))
+    command = GrepCommandBuilder.new(@params.merge("file" => "testfile.gz"))
     assert_equal 1, command.exec_functions.size
     assert_match(/^zgrep/, command.exec_functions.first)
   end
     
   def test_exec_functions_with_multiple_terms_for_gzip
-    command = CommandBuilder.new(@params.merge("file" => "testfile.gz", "term2" => "bar", "term3" => "baz"))
+    command = GrepCommandBuilder.new(@params.merge("file" => "testfile.gz", "term2" => "bar", "term3" => "baz"))
     assert_equal 3, command.exec_functions.size
     assert_match(/^zgrep/, command.exec_functions[0])
     assert_match(/^grep/, command.exec_functions[1])
@@ -60,38 +60,38 @@ class CommandBuilderTest < Test::Unit::TestCase
   end
   
   def test_exec_function_with_no_terms_for_gzip
-    command = CommandBuilder.new(@params.merge("file" => "testfile.gz", "term1" => nil))
+    command = GrepCommandBuilder.new(@params.merge("file" => "testfile.gz", "term1" => nil))
     assert_equal 1, command.exec_functions.size
     assert_match "gzcat", command.exec_functions[0]
   end
 
   def test_command_for_log
-    command = CommandBuilder.new(@params)
+    command = GrepCommandBuilder.new(@params)
     assert_equal "sh -c 'grep  -e foo testfile.log'", command.command
   end
 
   def test_command_with_no_terms_for_log
-    command = CommandBuilder.new(@params.merge("term1" => nil))
+    command = GrepCommandBuilder.new(@params.merge("term1" => nil))
     assert_equal "sh -c 'cat testfile.log'", command.command    
   end
   
   def test_command_with_multiple_terms_for_log
-    command = CommandBuilder.new(@params.merge("term2" => "bar", "term3" => "baz"))
+    command = GrepCommandBuilder.new(@params.merge("term2" => "bar", "term3" => "baz"))
     assert_equal "sh -c 'grep  -e foo testfile.log | grep  -e bar | grep  -e baz'", command.command
   end
 
   def test_command_for_gzip
-    command = CommandBuilder.new(@params.merge("file" => "testfile.gz"))
+    command = GrepCommandBuilder.new(@params.merge("file" => "testfile.gz"))
     assert_equal "sh -c 'zgrep  -e foo testfile.gz'", command.command
   end
 
   def test_command_with_no_terms_for_gzip
-    command = CommandBuilder.new(@params.merge("file" => "testfile.gz","term1" => nil))
+    command = GrepCommandBuilder.new(@params.merge("file" => "testfile.gz","term1" => nil))
     assert_equal "sh -c 'gzcat testfile.gz'", command.command    
   end
   
   def test_command_with_multiple_terms_for_gzip
-    command = CommandBuilder.new(@params.merge("file" => "testfile.gz","term2" => "bar", "term3" => "baz"))
+    command = GrepCommandBuilder.new(@params.merge("file" => "testfile.gz","term2" => "bar", "term3" => "baz"))
     assert_equal "sh -c 'zgrep  -e foo testfile.gz | grep  -e bar | grep  -e baz'", command.command
   end
 

data/test/commands/tail_command_builder_test.rb

@@ -20,7 +20,7 @@ class TailCommandBuilderTest < Test::Unit::TestCase
   end
   
   def test_raises_error_if_invalid_file
-    assert_raises CommandBuilder::InvalidParameterError do
+    assert_raises GrepCommandBuilder::InvalidParameterError do
       command = TailCommandBuilder.new(@params.merge("file" => "testfile.gz"))
     end
   end

data/views/_toolbar.html.erb

@@ -43,32 +43,6 @@
           <td>
           </td>
         </tr>
-        <tr id='advanced-options'>
-          <td></td>
-          <td>
-            <span class='small'>
-              <a href="#" id="enable-advanced" onclick="Search.showAdvanced(); return false;">Enable Advanced Options</a>
-              <a href="#" id="disable-advanced" onclick="Search.hideAdvanced(); return false;" style='display:none'>Disable Advanced Options</a>
-            </span>
-          </td>
-          <td colspan=2 id='start-time' class='advanced-options' style='display:none'>
-            <span class='small'>Start Time</span> 
-            <input type='text' name='sh' class='time' id='sh'> :
-            <input type='text' name='sm' class='time' id='sm'> :
-            <input type='text' name='ss' class='time' id='ss'>
-          </td>
-          <td colspan=2 id='end-time' class='advanced-options' style='display:none'>
-            <span class='small'>End Time</span> 
-            <input type='text' name='eh' class='time' id='eh'> :
-            <input type='text' name='em' class='time' id='em'> :
-            <input type='text' name='es' class='time' id='es'>
-          </td>
-          <td class='advanced-options' style='display:none'> 
-            <span class="small">
-              <a href="#" onclick="Search.clearAdvanced();return false">clear advanced</a>
-            </span>
-          </td>
-        </tr>
       </table>
       </form>
     </div>
@@ -81,9 +55,9 @@
     </div>
     
     <script>
-        Search.init({ 'grep': <%= logfiles.map {|f| f }.inspect %>, 
-                      'tail': <%= logfiles.map {|f| f if f =~ /log$/ }.compact.inspect %> },
-                      <%= params.empty? ? 'null' : params.inspect %> );
+        Search.init({ 'grep': <%= logfiles.map {|f| f }.to_json %>, 
+                      'tail': <%= logfiles.map {|f| f if f =~ /log$/ }.compact.to_json %> },
+                      <%= params.empty? ? 'null' : params.to_json %> );
                       
         
     </script>

metadata

@@ -1,16 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: clarity
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors: 
 - "Tobias L\xC3\xBCtke"
 - John Tajima
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDAR0b2Jp
+  MRgwFgYKCZImiZPyLGQBGRYIbGVldHNvZnQxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  HhcNMDkwNjA4MDAyMjE2WhcNMTAwNjA4MDAyMjE2WjA+MQ0wCwYDVQQDDAR0b2Jp
+  MRgwFgYKCZImiZPyLGQBGRYIbGVldHNvZnQxEzARBgoJkiaJk/IsZAEZFgNjb20w
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9eY669CSPwqcWqdZR28wy
+  LE6lF1RRS9KX2MEwiQML81UiY/yXz53Z082ISzUEcfzMUfVBwBO7y3NJF2th1/zt
+  MoEl24Me7ToU1wYfH0TOO6+gT++FmQyaGSuXWgXxEXyvnOP3k2wJ3IIgHvF8AUyW
+  i8GKFJKDmV/crocqOKu0A82Ugz0QGJbH+3gRk/BG926VffQUwQhcMV3c8+IWh/Ye
+  mx5mc1Wtykj945+G3XuCQFHcOUi4JKfDp5i/tce39ePNiXk74sn7X04O8aPrYRju
+  TPJC7yuwM1vOiR2yKutB+cjIG8srZiKN5IgqyECviHIpAOy7nDK5L5CexOYWEFxj
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQkWqDl
+  Oe9BDb/KLIhD4wMtnv8zkDANBgkqhkiG9w0BAQUFAAOCAQEAA6xfeq0PIZtUoz5i
+  Kr2bYQqgongNY/Mw4NMWN7cYYmIh1BUjWDnuOVffC3w3vnsUGOUUPeeBtQye4Dyy
+  zleZjlzOiOA4vFOnItldoElAo+gc5xoEmiE/P8AnCaIHEdgroeW+bZj3U3ReY7iu
+  z6rSwN5jLOnP2BmCdP/AgbAV3rW7hhgaz6nGx7O4hehQ/F1SbYhl115B6RpYF+tN
+  p9h9ap2kONwGQwBlo6oGQmuatzbfiVQRxhDj7JzyNaYQM4DR0+4vbu59vYFVSFHf
+  oz7Ippbls3jwI136whTuoiGZi/LDBc1Hw6iw99GGDR0vDGCLmPHyiJLfD6TbzzNo
+  oB0pMQ==
+  -----END CERTIFICATE-----
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2009-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +54,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -46,8 +77,8 @@ dependencies:
 description: "Clarity - a log search tool\n\
   By John Tajima & Tobi L\xC3\xBCtke\n\n\
   Clarity is a Splunk like web interface for your server log files. It supports \n\
-  searching (using grep) as well as trailing log files. It has been written using \n\
-  the event based architecture based on EventMachine and so allows real-time search\n\
+  searching (using grep) as well as trailing log files in realtime. It has been written \n\
+  using the event based architecture based on EventMachine and so allows real-time search\n\
   of very large log files. If you hit the browser Stop button it will also kill \n\
   the grep / tail utility. \n\n\
   We wrote Clarity to allow our support staff to use a simple interface to look\n\
@@ -74,7 +105,7 @@ files:
 - config/config.yml.sample
 - lib/clarity.rb
 - lib/clarity/cli.rb
-- lib/clarity/commands/command_builder.rb
+- lib/clarity/commands/grep_command_builder.rb
 - lib/clarity/commands/tail_command_builder.rb
 - lib/clarity/grep_renderer.rb
 - lib/clarity/process_tree.rb
@@ -89,12 +120,9 @@ files:
 - script/console
 - script/destroy
 - script/generate
-- test/commands/command_builder_test.rb
+- test/commands/grep_command_builder_test.rb
 - test/commands/tail_command_builder_test.rb
 - test/files/logfile.log
-- test/parsers/hostname_parser_test.rb
-- test/parsers/shop_parser_test.rb
-- test/parsers/time_parser_test.rb
 - test/test_helper.rb
 - test/test_string_scanner.rb
 - views/_header.html.erb
@@ -105,7 +133,7 @@ has_rdoc: true
 homepage: http://github.com/tobi/clarity
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
 - --main
 - README.rdoc
@@ -129,10 +157,7 @@ rubyforge_project: clarity
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: "Clarity - a log search tool By John Tajima & Tobi L\xC3\xBCtke  Clarity is a Splunk like web interface for your server log files"
+summary: Web interface for grep and tail -f
 test_files: 
-- test/commands/command_builder_test.rb
+- test/commands/grep_command_builder_test.rb
 - test/commands/tail_command_builder_test.rb
-- test/parsers/hostname_parser_test.rb
-- test/parsers/shop_parser_test.rb
-- test/parsers/time_parser_test.rb

metadata.gz.sig

@@ -0,0 +1 @@
+�#�3��koh���P k0�����u�*ضC�8E��o�tLZJҩ%PՌBh]׋��C��|8�a�/�LA0�t��\�
��ơ�HBR~�����Ii֖4#P�t��hw��';�:���Q��ͭz�n�9��jn��\��k��؂3��:7��&/ޛ 䤆�ވ?d�np��07�F C��;�<���h��Vٟ����Yq��|�vC�<#9��T�\j�����N�����G<��.eCaN�o�ޏ

data/test/parsers/hostname_parser_test.rb

@@ -1,39 +0,0 @@
-require 'test_helper'
-
-class HostnameParserTest < Test::Unit::TestCase
-  
-  def setup
-    @params = { "sh" => "12", "sm" => "00", "ss" => "10", "eh" => "12", "em" => "00", "es" => "59" }    
-    @lines = %|Jul 24 14:58:21 app3 rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
-Jul 24 12:00:21 192.168.5.1 rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
-Jul 24 12:00:31 192.168.5.1 rails.shopify[9855]: [test.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
-Jul 24 12:00:41 192.168.5.1 rails.shopify[9855]: [test2.myshopify.com]   Processing some other line of text 
-|.split("\n")
-    @parser = HostnameParser.new(nil)
-  end
-  
-  
-  def test_parse_strips_out_ip_and_appname
-    line = @lines[1][16..-1] # strip out first 16 lines
-    out = @parser.parse(line)
-    
-    assert out.has_key?(:line)
-    assert_equal "[wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]", out[:line]
-  end
-  
-  def test_parse_strips_out_host_and_appname
-    line = @lines.first[16..-1] # strip out first 16 lines
-    out = @parser.parse(line)
-    
-    assert out.has_key?(:line)
-    assert_equal "[wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]", out[:line]    
-  end
-  
-  def test_parse_returns_line_if_no_match
-    line = "in@valid rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]"
-    out = @parser.parse(line)
-    assert out.has_key?(:line)
-    assert_equal line, out[:line]
-  end
-  
-end

data/test/parsers/shop_parser_test.rb

@@ -1,53 +0,0 @@
-require 'test_helper'
-
-class ShopParserTest < Test::Unit::TestCase
-  
-  def setup
-    @parser = ShopParser.new(nil)
-    @lines = %|[wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
- [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
-[test.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
-[my-shop.myshopify.com]   Processing some other line of text
-Jul  7 20:12:11 staging rails.shopify[27975]: [jessetesting.staging.shopify.com]   Processing Admin::ProductsController#index (for 67.70.29.242 at 2009-07-07 20:12:11) [GET]
-|.split("\n")
-  end
-  
-  def test_parse_shop_name
-    line = @lines.first
-    out  = @parser.parse(line)
-    
-    assert out.has_key?(:shop)
-    assert out.has_key?(:line)
-    assert_equal "wadedemt.myshopify.com", out[:shop]
-    assert_equal "Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]", out[:line]
-  end
-  
-  def test_parse_shop_name_with_extra_space
-    line = @lines[1]
-    out  = @parser.parse(line)
-    
-    assert out.has_key?(:shop)
-    assert out.has_key?(:line)
-    assert_equal "wadedemt.myshopify.com", out[:shop]
-    assert_equal "Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]", out[:line]    
-  end
-  
-  def test_parse_shop_name_with_dashes
-    line = @lines[3]
-    out  = @parser.parse(line)
-    
-    assert out.has_key?(:shop)
-    assert out.has_key?(:line)
-    assert_equal "my-shop.myshopify.com", out[:shop]
-    assert_equal "Processing some other line of text", out[:line]        
-  end
-  
-  def test_parse_with_no_shop_returns_line
-    line = @lines[4]
-    out  = @parser.parse(line)
-    assert !out.has_key?(:shop)
-    assert_equal line, out[:line]
-  end
-  
-end
-  

data/test/parsers/time_parser_test.rb

@@ -1,83 +0,0 @@
-require 'test_helper'
-
-class TimeParserTest < Test::Unit::TestCase
-  
-  def setup
-    @params = { "sh" => "12", "sm" => "00", "ss" => "10", "eh" => "12", "em" => "00", "es" => "59" }    
-    @lines = %|Jul 24 14:58:21 app3 rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]
-Jul 24 12:00:21 192.168.5.1 rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET] 
-Jul 24 12:00:31 192.168.5.1 rails.shopify[9855]: [test.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET] 
-Jul 24 12:00:41 192.168.5.1 rails.shopify[9855]: [test2.myshopify.com]   Processing some other line of text 
-|.split("\n")
-  end
-  
-  def test_parse_timestamp
-    @parser = TimeParser.new(nil, {})
-    line = @lines.first
-    elements = @parser.parse(line)
-    
-    assert elements.has_key?(:timestamp)
-    assert_equal "Jul 24 14:58:21", elements[:timestamp]
-    assert_equal "app3 rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET]", elements[:line]
-  end
-  
-  def test_parse_with_start_time_and_early_timestamp
-    @parser = TimeParser.new(nil, {"sh" => "15", "sm" => "00", "ss" => "10"})
-    line = @lines.first
-    elements = @parser.parse(line)
-
-    # does not match - reject line all together
-    assert elements.empty?    
-  end
-  
-  def test_parse_with_start_time_and_later_timestamp
-    @parser = TimeParser.new(nil, {"sh" => "12", "sm" => "00", "ss" => "10"})
-    line = @lines[1]
-    elements = @parser.parse(line)
-    
-    assert elements.has_key?(:timestamp)
-    assert elements.has_key?(:line)    
-  end
-
-  def test_parse_with_end_time_and_early_timestamp
-    @parser = TimeParser.new(nil, {"eh" => "12", "em" => "00", "es" => "00"})
-    line = @lines.first
-    elements = @parser.parse(line)
-    
-    assert elements.empty?    
-  end
-  
-  def test_parse_with_end_time_and_later_timestamp
-    @parser = TimeParser.new(nil, {"eh" => "13", "em" => "00", "es" => "00"})
-    line = @lines[1]
-    elements = @parser.parse(line)
-    
-    assert elements.has_key?(:timestamp)
-    assert elements.has_key?(:line)    
-  end
-  
-  def test_parse_with_entry_between_start_and_end
-    @parser = TimeParser.new(nil, {"sh" => "14", "sm" => "00", "ss" => "00", "eh" => "15", "em" => "00", "es" => "00"})
-    line = @lines.first
-    elements = @parser.parse(line)
-    
-    assert elements.has_key?(:timestamp)
-    assert elements.has_key?(:line)    
-  end
-  
-  def test_parse_with_entry_outside_start_and_end
-    @parser = TimeParser.new(nil, {"sh" => "14", "sm" => "00", "ss" => "00", "eh" => "15", "em" => "00", "es" => "00"})
-    line = @lines[1]
-    elements = @parser.parse(line)
-    
-    assert elements.empty?    
-  end
-  
-  def test_parse_returns_entry_if_doesnt_match_parser
-    line = "July 24, 1999 12:00:21 192.168.5.1 rails.shopify[9855]: [wadedemt.myshopify.com]   Processing ShopController#products (for 192.168.1.230 at 2009-07-24 14:58:21) [GET] "
-    @parser = TimeParser.new(nil)
-    elements = @parser.parse(line)
-    assert_equal line, elements[:line]
-  end
-  
-end