request-log-analyzer 1.1.0 → 1.1.1

data/lib/request_log_analyzer/tracker/hourly_spread.rb

@@ -1,5 +1,5 @@
 module RequestLogAnalyzer::Tracker
-
+  
   # Determines the average hourly spread of the parsed requests.
   # This spread is shown in a graph form.
   #
@@ -26,15 +26,15 @@ module RequestLogAnalyzer::Tracker
   #   17:00 - 213 hits        : ░░░░░
   #   18:00 - 107 hits        : ░░
   #   ................
-  class HourlySpread < RequestLogAnalyzer::Tracker::Base
+  class HourlySpread < Base
 
     attr_reader :first, :last, :request_time_graph
-  
+
     def prepare
       options[:field] ||= :timestamp
       @request_time_graph = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
     end
-              
+            
     def update(request)
       request = request.attributes
       timestamp = request[options[:field]]
@@ -43,10 +43,10 @@ module RequestLogAnalyzer::Tracker
       @first = timestamp if @first.nil? || timestamp < @first
       @last  = timestamp if @last.nil?  || timestamp > @last
     end
-  
+
     def report(output)
       output.title("Requests graph - average per day per hour")
-      
+    
       if @request_time_graph == [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
         output << "None found.\n"
         return
@@ -56,12 +56,12 @@ module RequestLogAnalyzer::Tracker
       last_date      = DateTime.parse(@last.to_s, '%Y%m%d%H%M%S')
       days           = (@last && @first) ? (last_date - first_date).ceil : 1
       total_requests = @request_time_graph.inject(0) { |sum, value| sum + value }
-      
+    
       output.table({}, {:align => :right}, {:type => :ratio, :width => :rest, :treshold => 0.15}) do |rows|
         @request_time_graph.each_with_index do |requests, index|
           ratio = requests.to_f / total_requests.to_f
           requests_per_day = requests / days
-      
+    
           rows << ["#{index.to_s.rjust(3)}:00", "#{requests_per_day} hits", ratio]
         end
       end

data/lib/request_log_analyzer/tracker/timespan.rb

@@ -1,5 +1,5 @@
 module RequestLogAnalyzer::Tracker
-
+  
   # Determines the datetime of the first request and the last request
   # Also determines the amount of days inbetween these.
   #
@@ -16,30 +16,30 @@ module RequestLogAnalyzer::Tracker
   #  First request:        2008-07-13 06:25:06
   #  Last request:         2008-07-20 06:18:06
   #  Total time analyzed:  7 days
-  class Timespan < RequestLogAnalyzer::Tracker::Base
+  class Timespan < Base
 
     attr_reader :first, :last, :request_time_graph
-  
+
     def prepare
       options[:field] ||= :timestamp
     end
-              
+            
     def update(request)
       timestamp = request[options[:field]]
 
       @first = timestamp if @first.nil? || timestamp < @first
       @last  = timestamp if @last.nil?  || timestamp > @last
     end
-  
+
     def report(output)
       output.title(options[:title]) if options[:title]
-      
+    
       first_date  = DateTime.parse(@first.to_s, '%Y%m%d%H%M%S') rescue nil
       last_date   = DateTime.parse(@last.to_s, '%Y%m%d%H%M%S') rescue nil
-      
+    
       if @last && @first
         days        = (@last && @first) ? (last_date - first_date).ceil : 1
-             
+           
         output.with_style(:cell_separator => false) do         
           output.table({:width => 20}, {}) do |rows|
             rows << ['First request:', first_date.strftime('%Y-%m-%d %H:%M:%I')]
@@ -48,7 +48,7 @@ module RequestLogAnalyzer::Tracker
           end
         end
       end
-      
+    
     end
   end
-end
+end

data/spec/controller_spec.rb

@@ -12,22 +12,23 @@ describe RequestLogAnalyzer::Controller do
   it "should call the aggregators when run" do
     
     mock_output = mock('output')
+    mock_output.stub!(:io).and_return($stdout)
     mock_output.should_receive(:header)
-    mock_output.should_receive(:footer)    
+    mock_output.should_receive(:footer)
     
     file_format = RequestLogAnalyzer::FileFormat.load(:rails)
-    source      = RequestLogAnalyzer::Source::LogFile.new(file_format, :source_files => log_fixture(:rails_1x))  
+    source      = RequestLogAnalyzer::Source::LogParser.new(file_format, :source_files => log_fixture(:rails_1x))  
     controller  = RequestLogAnalyzer::Controller.new(source, :output => mock_output)
     
     mock_aggregator = mock('aggregator')
     mock_aggregator.should_receive(:prepare).once.ordered
-    mock_aggregator.should_receive(:aggregate).with(an_instance_of(RequestLogAnalyzer::Request)).at_least(:twice).ordered
+    mock_aggregator.should_receive(:aggregate).with(an_instance_of(file_format.class::Request)).at_least(:twice).ordered
     mock_aggregator.should_receive(:finalize).once.ordered
     mock_aggregator.should_receive(:report).once.ordered
     
     another_mock_aggregator = mock('another aggregator')
     another_mock_aggregator.should_receive(:prepare).once.ordered
-    another_mock_aggregator.should_receive(:aggregate).with(an_instance_of(RequestLogAnalyzer::Request)).at_least(:twice).ordered
+    another_mock_aggregator.should_receive(:aggregate).with(an_instance_of(file_format.class::Request)).at_least(:twice).ordered
     another_mock_aggregator.should_receive(:finalize).once.ordered  
     another_mock_aggregator.should_receive(:report).once.ordered  
 

data/spec/database_inserter_spec.rb

@@ -8,7 +8,7 @@ describe RequestLogAnalyzer::Aggregator::Database, "schema creation" do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    log_parser = RequestLogAnalyzer::LogParser.new(spec_format)
+    log_parser = RequestLogAnalyzer::Source::LogParser.new(spec_format)
     @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => TEST_DATABASE_FILE)
   end
   
@@ -68,16 +68,13 @@ describe RequestLogAnalyzer::Aggregator::Database, "record insertion" do
   include RequestLogAnalyzerSpecHelper  
   
   before(:each) do
-    log_parser = RequestLogAnalyzer::LogParser.new(spec_format)    
+    log_parser = RequestLogAnalyzer::Source::LogParser.new(spec_format)    
     @database_inserter = RequestLogAnalyzer::Aggregator::Database.new(log_parser, :database => TEST_DATABASE_FILE)
     @database_inserter.prepare
         
-    @incomplete_request = RequestLogAnalyzer::Request.create(spec_format, {:line_type => :first, :request_no => 564})
-    @completed_request = RequestLogAnalyzer::Request.create(spec_format, 
-                          {:line_type => :first, :request_no  => 564},
-                          {:line_type => :test, :test_capture => "awesome"},
-                          {:line_type => :test, :test_capture => "indeed"},                                                    
-                          {:line_type => :last, :request_no   => 564})    
+    @incomplete_request = spec_format.create_request( {:line_type => :first, :request_no => 564})
+    @completed_request = spec_format.create_request( {:line_type => :first, :request_no  => 564}, {:line_type => :test, :test_capture => "awesome"},
+                          {:line_type => :test, :test_capture => "indeed"}, {:line_type => :last, :request_no   => 564})    
   end
   
   after(:each) do

data/spec/file_format_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe RequestLogAnalyzer::FileFormat, :format_definition do
   
   before(:each) do
-    @first_file_format = Class.new(RequestLogAnalyzer::FileFormat)
-    @second_file_format = Class.new(RequestLogAnalyzer::FileFormat)
+    @first_file_format = Class.new(RequestLogAnalyzer::FileFormat::Base)
+    @second_file_format = Class.new(RequestLogAnalyzer::FileFormat::Base)
   end
     
   it "should specify lines with a hash" do

data/spec/file_formats/spec_format.rb

@@ -1,4 +1,4 @@
-class SpecFormat < RequestLogAnalyzer::FileFormat
+class SpecFormat < RequestLogAnalyzer::FileFormat::Base
 
   format_definition.first do |line|
     line.header = true
@@ -23,4 +23,5 @@ class SpecFormat < RequestLogAnalyzer::FileFormat
   report do |analyze|
     analyze.category :test_capture, :title => 'What is testing exactly?'
   end
+  
 end

data/spec/filter_spec.rb

@@ -1,7 +1,4 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/../lib/request_log_analyzer/filter/timespan'
-require File.dirname(__FILE__) + '/../lib/request_log_analyzer/filter/field'
-require File.dirname(__FILE__) + '/../lib/request_log_analyzer/filter/anonimize'
 
 describe RequestLogAnalyzer::Filter::Timespan, 'both before and after'  do
   include RequestLogAnalyzerSpecHelper

data/spec/log_parser_spec.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe RequestLogAnalyzer::LogParser, :requests do
+describe RequestLogAnalyzer::Source::LogParser, :requests do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @log_parser = RequestLogAnalyzer::LogParser.new(spec_format)
+    @log_parser = RequestLogAnalyzer::Source::LogParser.new(spec_format)
   end
   
   it "should have multiple line definitions" do
@@ -16,13 +16,13 @@ describe RequestLogAnalyzer::LogParser, :requests do
   end
   
   it "should parse more lines than requests" do
-    @log_parser.should_receive(:handle_request).with(an_instance_of(RequestLogAnalyzer::Request)).twice
+    @log_parser.should_receive(:handle_request).with(an_instance_of(SpecFormat::Request)).twice
     @log_parser.parse_file(log_fixture(:test_language_combined))
     @log_parser.parsed_lines.should > 2    
   end
   
   it "should parse requests spanned over multiple files" do
-    @log_parser.should_receive(:handle_request).with(an_instance_of(RequestLogAnalyzer::Request)).once
+    @log_parser.should_receive(:handle_request).with(an_instance_of(SpecFormat::Request)).once
     @log_parser.parse_files([log_fixture(:multiple_files_1), log_fixture(:multiple_files_2)])
   end
   
@@ -47,11 +47,11 @@ describe RequestLogAnalyzer::LogParser, :requests do
   
 end
 
-describe RequestLogAnalyzer::LogParser, :warnings do
+describe RequestLogAnalyzer::Source::LogParser, :warnings do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @log_parser = RequestLogAnalyzer::LogParser.new(spec_format)
+    @log_parser = RequestLogAnalyzer::Source::LogParser.new(spec_format)
   end
     
   it "should warn about teaser matching problems" do

data/spec/merb_format_spec.rb

@@ -1,38 +1,38 @@
-# require File.dirname(__FILE__) + '/spec_helper'
-# 
-# describe RequestLogAnalyzer::LogParser, "Merb" do
-#   include RequestLogAnalyzerSpecHelper
-#   
-#   before(:each) do
-#     @log_parser = RequestLogAnalyzer::LogParser.new(:merb)
-#   end
-#   
-#   it "should have a valid language definitions" do
-#     @log_parser.file_format.should be_valid
-#   end
-#   
-#   it "should parse a stream and find valid requests" do
-#     File.open(log_fixture(:merb), 'r') do |io|
-#       @log_parser.parse_io(io) do |request| 
-#         request.should be_kind_of(RequestLogAnalyzer::Request)
-#       end
-#     end
-#   end
-#
-#   it "should find 11 completed requests" do
-#     @log_parser.should_receive(:handle_request).exactly(11).times
-#     @log_parser.parse_file(log_fixture(:merb))
-#   end
-#   
-#   it "should parse all details from a request correctly" do
-#     request = nil
-#     @log_parser.parse_file(log_fixture(:merb)) { |found_request| request ||= found_request }
-#     
-#     request.should be_completed
-#     request[:timestamp].should == DateTime.parse('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
-# end
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe RequestLogAnalyzer::Source::LogParser, :merb do
+  include RequestLogAnalyzerSpecHelper
+  
+  before(:each) do
+    @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:merb))
+  end
+  
+  it "should have a valid language definitions" do
+    @log_parser.file_format.should be_valid
+  end
+  
+  it "should parse a stream and find valid requests" do
+    File.open(log_fixture(:merb), 'r') do |io|
+      @log_parser.parse_io(io) do |request| 
+        request.should be_kind_of(RequestLogAnalyzer::Request)
+      end
+    end
+  end
+
+  it "should find 11 completed requests" do
+    @log_parser.should_receive(:handle_request).exactly(11).times
+    @log_parser.parse_file(log_fixture(:merb))
+  end
+  
+  it "should parse all details from a request correctly" do
+    request = nil
+    @log_parser.parse_file(log_fixture(:merb)) { |found_request| request ||= found_request }
+    
+    request.should be_completed
+    #request[:timestamp].should == DateTime.parse('Fri Aug 29 11:10:23 +0200 2008') # FIX ME
+    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
+end

data/spec/rails_format_spec.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe RequestLogAnalyzer::LogParser, "Rails" do
+describe RequestLogAnalyzer::Source::LogParser, "Rails" do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @log_parser = RequestLogAnalyzer::LogParser.new(RequestLogAnalyzer::FileFormat.load(:rails))
+    @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:rails))
   end
   
   it "should have a valid language definitions" do

data/spec/request_spec.rb

@@ -5,7 +5,7 @@ describe RequestLogAnalyzer::Request, :incomplete_request do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @incomplete_request = RequestLogAnalyzer::Request.new(spec_format)
+    @incomplete_request = spec_format.create_request
     @incomplete_request << { :line_type => :test, :lineno => 1, :test_capture => 'awesome!' }
   end
   
@@ -37,7 +37,7 @@ describe RequestLogAnalyzer::Request, :completed_request do
   include RequestLogAnalyzerSpecHelper
   
   before(:each) do
-    @completed_request = RequestLogAnalyzer::Request.new(spec_format)
+    @completed_request = spec_format.create_request
     @completed_request << { :line_type => :first, :lineno =>  1, :name => 'first line!' }    
     @completed_request << { :line_type => :test,  :lineno =>  4, :test_capture => 'testing' }        
     @completed_request << { :line_type => :test,  :lineno =>  7, :test_capture => 'testing some more' }            

data/spec/spec_helper.rb

@@ -21,47 +21,13 @@ module RequestLogAnalyzerSpecHelper
     File.dirname(__FILE__) + "/fixtures/#{name}.log"
   end
   
-  def request(fields, format = TestFileFormat)
+  def request(fields, format = spec_format)
     if fields.kind_of?(Array)
-      RequestLogAnalyzer::Request.create(format, *fields)
+      format.create_request(*fields)
     else
-      RequestLogAnalyzer::Request.create(format, fields)
+      format.create_request(fields)      
     end
   end
   
 end
 
-module TestFileFormat
-  
-  module Summarizer
-    def self.included(base)
-      # monkey patching for summarizer here :-)
-    end
-  end
-  
-  module LogParser
-    def self.included(base)
-      # monkey patching for log parser here :-)
-    end
-  end
-  
-  LINE_DEFINITIONS = {
-    :first => {
-      :header => true,
-      :teaser => /processing /,
-      :regexp => /processing request (\d+)/,
-      :captures => [{ :name => :request_no, :type => :integer, :anonymize => :slightly }]    
-    },
-    :test => {
-      :teaser => /testing /,
-      :regexp => /testing is (\w+)/,
-      :captures => [{ :name => :test_capture, :type => :string, :anonymize => true}]
-    }, 
-    :last => {
-      :footer => true,
-      :teaser => /finishing /,
-      :regexp => /finishing request (\d+)/,
-      :captures => [{ :name => :request_no, :type => :integer}]
-    }
-  }
-end

data/tasks/github-gem.rake

@@ -241,7 +241,8 @@ module Rake
     
     def release_task
       puts
-      puts "Released #{@name} - version#{@specification.version}"
+      puts '------------------------------------------------------------'
+      puts "Released #{@name} - version #{@specification.version}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-18 00:00:00 +01:00
+date: 2009-01-21 00:00:00 +01:00
 default_executable: request-log-analyzer
 dependencies: []
 
@@ -37,7 +37,7 @@ files:
 - lib/request_log_analyzer
 - lib/request_log_analyzer.rb
 - lib/request_log_analyzer/aggregator
-- lib/request_log_analyzer/aggregator/base.rb
+- lib/request_log_analyzer/aggregator.rb
 - lib/request_log_analyzer/aggregator/database.rb
 - lib/request_log_analyzer/aggregator/echo.rb
 - lib/request_log_analyzer/aggregator/summarizer.rb
@@ -48,12 +48,11 @@ files:
 - lib/request_log_analyzer/file_format/rails.rb
 - lib/request_log_analyzer/file_format/rails_development.rb
 - lib/request_log_analyzer/filter
+- lib/request_log_analyzer/filter.rb
 - lib/request_log_analyzer/filter/anonimize.rb
-- lib/request_log_analyzer/filter/base.rb
 - lib/request_log_analyzer/filter/field.rb
 - lib/request_log_analyzer/filter/timespan.rb
 - lib/request_log_analyzer/line_definition.rb
-- lib/request_log_analyzer/log_parser.rb
 - lib/request_log_analyzer/log_processor.rb
 - lib/request_log_analyzer/output
 - lib/request_log_analyzer/output.rb
@@ -61,10 +60,10 @@ files:
 - lib/request_log_analyzer/output/html.rb
 - lib/request_log_analyzer/request.rb
 - lib/request_log_analyzer/source
-- lib/request_log_analyzer/source/base.rb
-- lib/request_log_analyzer/source/log_file.rb
+- lib/request_log_analyzer/source.rb
+- lib/request_log_analyzer/source/log_parser.rb
 - lib/request_log_analyzer/tracker
-- lib/request_log_analyzer/tracker/base.rb
+- lib/request_log_analyzer/tracker.rb
 - lib/request_log_analyzer/tracker/category.rb
 - lib/request_log_analyzer/tracker/duration.rb
 - lib/request_log_analyzer/tracker/hourly_spread.rb