wvanbergen-request-log-analyzer 1.2.4 → 1.2.5

data/lib/request_log_analyzer.rb

@@ -11,7 +11,7 @@ module RequestLogAnalyzer
   
   # The current version of request-log-analyzer.
   # This will be diplayed in output reports etc.  
-  VERSION = '1.2.1'
+  VERSION = '1.2.5'
   
   # Loads constants in the RequestLogAnalyzer namespace using self.load_default_class_file(base, const)
   # <tt>const</tt>:: The constant that is not yet loaded in the RequestLogAnalyzer namespace. This should be passed as a string or symbol.

data/lib/request_log_analyzer/file_format/merb.rb

@@ -16,18 +16,16 @@ module RequestLogAnalyzer::FileFormat
       line.teaser = /Params/
       line.regexp = /Params\:\ (\{.+\})/
       line.captures << { :name => :params, :type => :eval, :provides => { 
-            :namespace => :string, :controller => :string, :action => :string, :format => :string } }
+            :namespace => :string, :controller => :string, :action => :string, :format => :string, :method => :string } }
     end
 
     # ~ {:dispatch_time=>0.006117, :after_filters_time=>6.1e-05, :before_filters_time=>0.000712, :action_time=>0.005833}
     line_definition :completed do |line|
       line.footer = true
-      line.teaser = /\{:dispatch_time/
-      line.regexp = /\{\:dispatch_time=>(\d+\.\d+(?:e-?\d+)?), (?:\:after_filters_time=>(\d+\.\d+(?:e-?\d+)?), )?(?:\:before_filters_time=>(\d+\.\d+(?:e-?\d+)?), )?\:action_time=>(\d+\.\d+(?:e-?\d+)?)\}/
-      line.captures << { :name => :dispatch_time,       :type => :duration } \
-                    << { :name => :after_filters_time,  :type => :duration } \
-                    << { :name => :before_filters_time, :type => :duration } \
-                    << { :name => :action_time,         :type => :duration }
+      line.regexp = /(\{.*\:dispatch_time\s*=>\s*\d+\.\d+.*\})/
+      line.captures << { :name => :times_hash, :type => :eval, :provides => {
+            :dispatch_time => :duration, :after_filters_time => :duration,
+            :before_filters_time => :duration, :action_time => :duration } }
     end
     
     REQUEST_CATEGORIZER = Proc.new do |request| 

data/spec/fixtures/merb_prefixed.log

@@ -0,0 +1,9 @@
+Aug 31 18:35:23 typekit-web001 merb:  ~
+Aug 31 18:35:23 typekit-web001 merb: cache: [GET /] miss
+Aug 31 18:35:24 typekit-web001 merb:  ~ Started request handling: Mon Aug 31 18:35:25 +0000 2009
+Aug 31 18:35:24 typekit-web001 merb:  ~ Routed to: {"action"=>"index", "controller"=>"home"}
+Aug 31 18:35:24 typekit-web001 merb:  ~ Params: {"action"=>"index", "controller"=>"home"}
+Aug 31 18:35:24 typekit-web001 merb:  ~ In repository block default
+Aug 31 18:35:24 typekit-web001 merb:  ~ (0.000000) SELECT `id`, `created_at`, `updated_at`, `braintree_vault_id`, `cancelled_at` FROM `accounts` WHERE (`id` IN (6214)) ORDER BY `id`
+Aug 31 18:35:24 typekit-web001 merb:  ~ Redirecting to: /plans (302)
+Aug 31 18:35:24 typekit-web001 merb:  ~ {:after_filters_time=>0.0, :before_filters_time=>0.0, :dispatch_time=>0.012001, :action_time=>0.012001}

data/spec/unit/file_format/merb_format_spec.rb

@@ -23,15 +23,34 @@ describe RequestLogAnalyzer::Source::LogParser, :merb do
     @log_parser.parse_file(log_fixture(:merb))
   end
   
-  it "should parse all details from a request correctly" do
+  it "should parse all details from the first request correctly" do
     request = nil
     @log_parser.parse_file(log_fixture(:merb)) { |found_request| request ||= found_request }
     
     request.should be_completed
+    request[:controller].should == 'session'
+    request[:action].should == 'destroy'    
+    request[:method].should == 'delete'
+    request[:params].should be_kind_of(Hash)      
     request[:timestamp].should == 20080829111023 # 'Fri Aug 29 11:10:23 +0200 2008'
     request[:dispatch_time].should == 0.243424
     request[:after_filters_time].should == 6.9e-05
     request[:before_filters_time].should == 0.213213
     request[:action_time].should == 0.241652
+
+  end
+  
+  it "should parse a prefixed Merb file correctly" do
+    request = nil
+    @log_parser.parse_file(log_fixture(:merb_prefixed)) { |found_request| request ||= found_request }
+    
+    request.should be_completed
+    request[:timestamp].should == 20090831183525
+    request[:controller].should == 'home'
+    request[:action].should == 'index'
+    request[:dispatch_time].should == 0.012001
+    request[:after_filters_time].should == 0.0
+    request[:before_filters_time].should == 0.0
+    request[:action_time].should == 0.012001
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -80,6 +80,7 @@ files:
 - spec/fixtures/decompression.tgz
 - spec/fixtures/header_and_footer.log
 - spec/fixtures/merb.log
+- spec/fixtures/merb_prefixed.log
 - spec/fixtures/multiple_files_1.log
 - spec/fixtures/multiple_files_2.log
 - spec/fixtures/rails_1x.log