request-log-analyzer 1.3.4 → 1.4.0

data/lib/request_log_analyzer/file_format/merb.rb

@@ -1,50 +1,67 @@
 module RequestLogAnalyzer::FileFormat
-  
+
+  # The Merb file format parses the request header with the timestamp, the params line
+  # with the most important request information and the durations line which contains
+  # the different request durations that can be used for analysis.
   class Merb < Base
 
     # ~ Started request handling: Fri Aug 29 11:10:23 +0200 2008
     line_definition :started do |line|
       line.header = true
-      line.teaser = /Started/
+      line.teaser = /Started request handling\:/
       line.regexp = /Started request handling\:\ (.+)/
       line.captures << { :name => :timestamp, :type => :timestamp }
-    end    
-    
+    end
+
     # ~ Params: {"action"=>"create", "controller"=>"session"}
     # ~ Params: {"_method"=>"delete", "authenticity_token"=>"[FILTERED]", "action"=>"d}
     line_definition :params do |line|
-      line.teaser = /Params/
+      line.teaser = /Params\:\ /
       line.regexp = /Params\:\ (\{.+\})/
-      line.captures << { :name => :params, :type => :eval, :provides => { 
+      line.captures << { :name => :params, :type => :eval, :provides => {
             :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 = Regexp.new(Regexp.quote('~ {:'))
       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| 
+
+    REQUEST_CATEGORIZER = Proc.new do |request|
       category = "#{request[:controller]}##{request[:action]}"
       category = "#{request[:namespace]}::#{category}" if request[:namespace]
       category = "#{category}.#{request[:format]}"     if request[:format]
       category
     end
-    
+
     report do |analyze|
-      analyze.timespan :line_type => :started
-      analyze.frequency :category => REQUEST_CATEGORIZER, :amount => 20, :title => "Top 20 by hits"
-      analyze.hourly_spread :line_type => :started
+
+      analyze.timespan
+      analyze.hourly_spread
+
+      analyze.frequency :category => REQUEST_CATEGORIZER, :title => "Top 20 by hits"
       analyze.duration :dispatch_time, :category => REQUEST_CATEGORIZER, :title => 'Request dispatch duration'
+
       # analyze.duration :action_time, :category => REQUEST_CATEGORIZER, :title => 'Request action duration'
       # analyze.duration :after_filters_time, :category => REQUEST_CATEGORIZER, :title => 'Request after_filter duration'
       # analyze.duration :before_filters_time, :category => REQUEST_CATEGORIZER, :title => 'Request before_filter duration'
     end
-        
+
+    class Request < RequestLogAnalyzer::Request
+
+      MONTHS = {'Jan' => '01', 'Feb' => '02', 'Mar' => '03', 'Apr' => '04', 'May' => '05', 'Jun' => '06',
+                'Jul' => '07', 'Aug' => '08', 'Sep' => '09', 'Oct' => '10', 'Nov' => '11', 'Dec' => '12' }
+
+      # Speed up timestamp conversion
+      def convert_timestamp(value, definition)
+        "#{value[26,4]}#{MONTHS[value[4,3]]}#{value[8,2]}#{value[11,2]}#{value[14,2]}#{value[17,2]}".to_i
+      end
+    end
   end
 
 end

data/lib/request_log_analyzer/file_format/rack.rb

@@ -0,0 +1,11 @@
+module RequestLogAnalyzer::FileFormat
+
+  class Rack < Apache
+
+    def self.create(*args)
+      super(:rack, *args)
+    end
+
+  end
+
+end

data/lib/request_log_analyzer/file_format/rails.rb

@@ -1,103 +1,173 @@
 module RequestLogAnalyzer::FileFormat
-  
+
+  # Default FileFormat class for Rails logs.
+  #
+  # Instances will be created dynamically based on the lines you want it to parse. You can
+  # specify what lines should be included in the parser by providing a list to the create
+  # method as first argument.
   class Rails < Base
-  
-    # Processing EmployeeController#index (for 123.123.123.123 at 2008-07-13 06:00:00) [GET]
-    line_definition :processing do |line|
-      line.header = true # this line is the first log line for a request 
-      line.teaser = /Processing /
-      line.regexp = /Processing ((?:\w+::)?\w+)#(\w+)(?: to (\w+))? \(for (\d+\.\d+\.\d+\.\d+) at (\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)\) \[([A-Z]+)\]/
-      line.captures << { :name => :controller, :type  => :string } \
-                    << { :name => :action,     :type  => :string } \
-                    << { :name => :format,     :type  => :format } \
-                    << { :name => :ip,         :type  => :string } \
-                    << { :name => :timestamp,  :type  => :timestamp } \
-                    << { :name => :method,     :type  => :string }
-    end
 
-    # Filter chain halted as [#<ActionController::Caching::Actions::ActionCacheFilter:0x2a999ad620 @check=nil, @options={:store_options=>{}, :layout=>nil, :cache_path=>#<Proc:0x0000002a999b8890@/app/controllers/cached_controller.rb:8>}>] rendered_or_redirected.    
-    line_definition :cache_hit do |line|
-      line.regexp = /Filter chain halted as \[\#<ActionController::Caching::Actions::ActionCacheFilter:.+>\] rendered_or_redirected/
-    end
-  
-    # RuntimeError (Cannot destroy employee):  /app/models/employee.rb:198:in `before_destroy' 
-    line_definition :failed do |line|
-      line.footer = true
-      line.regexp = /((?:[A-Z]\w+\:\:)*[A-Z]\w+) \((.*)\)(?: on line #(\d+) of .+)?\:(.*)/
-      line.captures << { :name => :error,       :type => :string } \
-                    << { :name => :message,     :type => :string } \
-                    << { :name => :line,        :type => :integer } \
-                    << { :name => :file,        :type => :string } \
-                    << { :name => :stack_trace, :type => :string }
+    # Creates a Rails FileFormat instance.
+    #
+    # The lines that will be parsed can be defined by the argument to this function, 
+    # which should be an array of line names, or a list of line names as comma separated
+    # string. The resulting report depends on the lines that will be parsed. You can 
+    # also provide s string that describes a common set of lines, like "production",
+    # "development" or "production".
+    def self.create(lines = 'production')
+      definitions_hash = line_definer.line_definitions.clone
+      
+      lines = lines.to_s.split(',') if lines.kind_of?(String)
+      lines = [lines.to_s]          if lines.kind_of?(Symbol)
+      
+      lines.each do |line|
+        line = line.to_sym
+        if LINE_COLLECTIONS.has_key?(line)
+          LINE_COLLECTIONS[line].each { |l| definitions_hash[l] = LINE_DEFINITIONS[l] }
+        elsif LINE_DEFINITIONS.has_key?(line)
+          definitions_hash[line] = LINE_DEFINITIONS[line]
+        else
+          raise "Unrecognized Rails log line name: #{line.inspect}!"
+        end
+      end
+
+      return self.new(definitions_hash, report_trackers(definitions_hash))
     end
+    
+    # Creates trackers based on the specified line definitions.
+    #
+    # The more lines that will be parsed, the more information will appear in the report.
+    def self.report_trackers(lines)
+      analyze = RequestLogAnalyzer::Aggregator::Summarizer::Definer.new
+      
+      analyze.timespan
+      analyze.hourly_spread
+      
+      analyze.frequency :category => REQUEST_CATEGORIZER, :title => 'Most requested'
+      analyze.frequency :method, :title => 'HTTP methods'
+      analyze.frequency :status, :title => 'HTTP statuses returned'
+      
+      if lines.has_key?(:cache_hit)
+        analyze.frequency(:category => lambda { |request| request =~ :cache_hit ? 'Cache hit' : 'No hit' }, 
+              :title => 'Rails action cache hits')
+      end
+      
+      analyze.duration :duration, :category => REQUEST_CATEGORIZER, :title => "Request duration",    :line_type => :completed
+      analyze.duration :view,     :category => REQUEST_CATEGORIZER, :title => "View rendering time", :line_type => :completed
+      analyze.duration :db,       :category => REQUEST_CATEGORIZER, :title => "Database time",       :line_type => :completed
+      
+      analyze.frequency :category => REQUEST_CATEGORIZER, :title => 'Process blockers (> 1 sec duration)',
+        :if => lambda { |request| request[:duration] && request[:duration] > 1.0 }
+      
+      if lines.has_key?(:failure)
+        analyze.frequency :error, :title => 'Failed requests', :line_type => :failure
+      end
+
+      if lines.has_key?(:rendered)
+        analyze.duration :render_duration, :category => :render_file, :multiple_per_request => true, :title => 'Partial rendering duration'
+      end
 
+      if lines.has_key?(:query_executed)
+        analyze.duration :query_duration, :category => :query_sql, :multiple_per_request => true, :title => 'Query duration'
+      end
+      
+      return analyze.trackers + report_definer.trackers
+    end
 
     # Rails < 2.1 completed line example
     # Completed in 0.21665 (4 reqs/sec) | Rendering: 0.00926 (4%) | DB: 0.00000 (0%) | 200 OK [http://demo.nu/employees]
     RAILS_21_COMPLETED = /Completed in (\d+\.\d{5}) \(\d+ reqs\/sec\) (?:\| Rendering: (\d+\.\d{5}) \(\d+\%\) )?(?:\| DB: (\d+\.\d{5}) \(\d+\%\) )?\| (\d\d\d).+\[(http.+)\]/
 
     # Rails > 2.1 completed line example
-    # Completed in 614ms (View: 120, DB: 31) | 200 OK [http://floorplanner.local/demo]  
+    # Completed in 614ms (View: 120, DB: 31) | 200 OK [http://floorplanner.local/demo]
     RAILS_22_COMPLETED = /Completed in (\d+)ms \((?:View: (\d+), )?DB: (\d+)\) \| (\d\d\d).+\[(http.+)\]/
 
-    # The completed line uses a kind of hack to ensure that both old style logs and new style logs 
-    # are both parsed by the same regular expression. The format in Rails 2.2 was slightly changed,
-    # but the line contains exactly the same information.
-    line_definition :completed do |line|
-    
-      line.footer = true
-      line.teaser = /Completed in /
-      line.regexp = Regexp.new("(?:#{RAILS_21_COMPLETED}|#{RAILS_22_COMPLETED})")
-    
-      line.captures << { :name => :duration, :type => :duration, :unit => :sec } \
-                    << { :name => :view,     :type => :duration, :unit => :sec } \
-                    << { :name => :db,       :type => :duration, :unit => :sec } \
-                    << { :name => :status,   :type => :integer } \
-                    << { :name => :url,      :type => :string } # Old variant 
-                  
-      line.captures << { :name => :duration, :type => :duration, :unit => :msec } \
-                    << { :name => :view,     :type => :duration, :unit => :msec } \
-                    << { :name => :db,       :type => :duration, :unit => :msec } \
-                    << { :name => :status,   :type => :integer } \
-                    << { :name => :url,      :type => :string }  # 2.2 variant 
-    end
+    # A hash of definitions for all common lines in Rails logs.
+    LINE_DEFINITIONS = {
+      :processing => RequestLogAnalyzer::LineDefinition.new(:processing, :header => true,
+            :teaser   => /Processing /,
+            :regexp   => /Processing ((?:\w+::)?\w+)#(\w+)(?: to (\w+))? \(for (\d+\.\d+\.\d+\.\d+) at (\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)\) \[([A-Z]+)\]/,
+            :captures => [{ :name => :controller, :type  => :string },
+                          { :name => :action,     :type  => :string },
+                          { :name => :format,     :type  => :string, :default => 'html' },
+                          { :name => :ip,         :type  => :string },
+                          { :name => :timestamp,  :type  => :timestamp },
+                          { :name => :method,     :type  => :string }]),
+
+      :completed => RequestLogAnalyzer::LineDefinition.new(:completed, :footer => true,
+            :teaser   => /Completed in /,
+            :regexp   => Regexp.union(RAILS_21_COMPLETED, RAILS_22_COMPLETED),
+            :captures => [{ :name => :duration, :type => :duration, :unit => :sec },   # First old variant capture
+                          { :name => :view,     :type => :duration, :unit => :sec },
+                          { :name => :db,       :type => :duration, :unit => :sec },
+                          { :name => :status,   :type => :integer },
+                          { :name => :url,      :type => :string },                    # Last old variant capture
+                          { :name => :duration, :type => :duration, :unit => :msec },  # First new variant capture
+                          { :name => :view,     :type => :duration, :unit => :msec },
+                          { :name => :db,       :type => :duration, :unit => :msec },
+                          { :name => :status,   :type => :integer },
+                          { :name => :url,      :type => :string }]),                  # Last new variant capture
+
+      :failure => RequestLogAnalyzer::LineDefinition.new(:failure, :footer => true,
+          :teaser   => /((?:[A-Z]\w*[a-z]\w+\:\:)*[A-Z]\w*[a-z]\w+) \((.*)\)(?: on line #(\d+) of (.+))?\:/,
+          :regexp   => /((?:[A-Z]\w*[a-z]\w+\:\:)*[A-Z]\w*[a-z]\w+) \((.*)\)(?: on line #(\d+) of (.+))?\:\s*$/,
+          :captures => [{ :name => :error,       :type => :string },
+                        { :name => :message,     :type => :string },
+                        { :name => :line,        :type => :integer },
+                        { :name => :file,        :type => :string }]),
+
+      :cache_hit => RequestLogAnalyzer::LineDefinition.new(:cache_hit,
+          :regexp => /Filter chain halted as \[\#<ActionController::Caching::Actions::ActionCacheFilter/),
+
+      :parameters => RequestLogAnalyzer::LineDefinition.new(:parameters,
+          :teaser   => /  Parameters:/,
+          :regexp   => /  Parameters:\s+(\{.*\})/,
+          :captures => [{ :name => :params, :type => :eval }]),
+          
+      :rendered => RequestLogAnalyzer::LineDefinition.new(:rendered,
+          :teaser   => /Rendered /,
+          :regexp   => /Rendered (\w+(?:\/\w+)+) \((\d+\.\d+)ms\)/,
+          :captures => [{ :name => :render_file,     :type  => :string },
+                        { :name => :render_duration, :type  => :duration, :unit => :msec }]),
+
+      :query_executed => RequestLogAnalyzer::LineDefinition.new(:query_executed,
+          :regexp   => /\s+(?:\e\[4;36;1m)?((?:\w+::)*\w+) Load \((\d+\.\d+)ms\)(?:\e\[0m)?\s+(?:\e\[0;1m)?([^\e]+) ?(?:\e\[0m)?/,
+          :captures => [{ :name => :query_class,    :type  => :string },
+                        { :name => :query_duration, :type  => :duration, :unit => :msec },
+                        { :name => :query_sql,      :type  => :sql }]),
+
+      :query_cached => RequestLogAnalyzer::LineDefinition.new(:query_cached,
+          :regexp   => /\s+(?:\e\[4;35;1m)?CACHE \((\d+\.\d+)ms\)(?:\e\[0m)?\s+(?:\e\[0m)?([^\e]+) ?(?:\e\[0m)?/,
+          :captures => [{ :name => :cached_duration, :type  => :duration, :unit => :msec },
+                        { :name => :cached_sql,      :type  => :sql }])
+    }
 
+    # Definitions of common combinations of lines that can be parsed
+    LINE_COLLECTIONS = {
+      :minimal     => [:processing, :completed],
+      :production  => [:processing, :completed, :failure, :cache_hit],
+      :development => [:processing, :completed, :failure, :rendered, :query_executed, :query_cached],
+      :all         => LINE_DEFINITIONS.keys
+    }
 
 
+    # Simple function to categorize Rails requests using controller/actions/format and method.
     REQUEST_CATEGORIZER = Proc.new do |request|
       "#{request[:controller]}##{request[:action]}.#{request[:format]} [#{request[:method]}]"
     end
 
-    report do |analyze|
-      analyze.timespan :line_type => :processing
-      analyze.frequency :category => REQUEST_CATEGORIZER, :title => 'Top 20 hits', :amount => 20, :line_type => :processing
-      analyze.frequency :method, :title => 'HTTP methods'
-      analyze.frequency :status, :title => 'HTTP statuses returned'
-      analyze.frequency :category => lambda { |request| request =~ :cache_hit ? 'Cache hit' : 'No hit' }, :title => 'Rails action cache hits'
-    
-      analyze.duration :duration, :category => REQUEST_CATEGORIZER, :title => "Request duration",    :line_type => :completed
-      analyze.duration :view,     :category => REQUEST_CATEGORIZER, :title => "View rendering time", :line_type => :completed
-      analyze.duration :db,       :category => REQUEST_CATEGORIZER, :title => "Database time",       :line_type => :completed
-    
-      analyze.frequency :category => REQUEST_CATEGORIZER, :title => 'Process blockers (> 1 sec duration)', 
-              :if => lambda { |request| request[:duration] && request[:duration] > 1.0 }, :amount => 20
-            
-      analyze.hourly_spread :line_type => :processing
-      analyze.frequency :error, :title => 'Failed requests', :line_type => :failed, :amount => 20
-    end
-
     # Define a custom Request class for the Rails file format to speed up timestamp handling
     # and to ensure that a format is always set.
     class Request < RequestLogAnalyzer::Request
 
       # Do not use DateTime.parse
       def convert_timestamp(value, definition)
-        value.gsub(/[^0-9]/, '')[0...14].to_i unless value.nil?
+        value.gsub(/[^0-9]/, '')[0...14].to_i
       end
-      
-      # Set 'html' as default format for a request
-      def convert_format(value, definition)
-        value || 'html'
+
+      # Sanitizes SQL queries so that they can be grouped
+      def convert_sql(sql, definition)
+        sql.gsub(/\b\d+\b/, ':int').gsub(/`([^`]+)`/, '\1').gsub(/'[^']*'/, ':string').rstrip
       end
     end
 

data/lib/request_log_analyzer/file_format/rails_development.rb

@@ -1,57 +1,12 @@
 module RequestLogAnalyzer::FileFormat
-  
+
   # The RailsDevelopment FileFormat is an extention to the default Rails file format. It includes
   # all lines of the normal Rails file format, but parses SQL queries and partial rendering lines
   # as well.
   class RailsDevelopment < Rails
-  
-    #   Parameters: {"action"=>"demo", "controller"=>"page"}
-    line_definition :parameters do |line|
-      line.teaser = /Parameters/
-      line.regexp = /\s+Parameters:\s+(\{.*\})/
-      line.captures << { :name => :params, :type => :eval }
-    end
-  
-    # Rendered layouts/_footer (2.9ms)
-    line_definition :rendered do |line|
-      line.regexp = /Rendered (\w+(?:\/\w+)+) \((\d+\.\d+)ms\)/
-      line.captures << { :name => :render_file,     :type  => :string } \
-                    << { :name => :render_duration, :type  => :duration, :unit => :msec }
-    end
-  
-    #  User Load (0.4ms)   SELECT * FROM `users` WHERE (`users`.`id` = 18205844) 
-    line_definition :query_executed do |line|
-      line.regexp = /\s+(?:\e\[4;36;1m)?((?:\w+::)*\w+) Load \((\d+\.\d+)ms\)(?:\e\[0m)?\s+(?:\e\[0;1m)?([^\e]+) ?(?:\e\[0m)?/
-      line.captures << { :name => :query_class,    :type  => :string } \
-                    << { :name => :query_duration, :type  => :duration, :unit => :msec } \
-                    << { :name => :query_sql,      :type  => :sql }
-    end
-
-    #  CACHE (0.0ms)   SELECT * FROM `users` WHERE (`users`.`id` = 0)   
-    line_definition :query_cached do |line|
-      line.regexp = /\s+(?:\e\[4;35;1m)?CACHE \((\d+\.\d+)ms\)(?:\e\[0m)?\s+(?:\e\[0m)?([^\e]+) ?(?:\e\[0m)?/
-      line.captures << { :name => :cached_duration, :type  => :duration, :unit => :msec } \
-                    << { :name => :cached_sql,      :type  => :sql }
-    end  
-
-    # Define the reporting for the additional parsed lines
-    report(:append) do |analyze|
-      
-      analyze.duration :render_duration, :category => :render_file, :multiple_per_request => true, 
-              :amount => 20, :title => 'Partial rendering duration'
-              
-      analyze.duration :query_duration, :category => :query_sql, :multiple_per_request => true, 
-              :amount => 20, :title => 'Query duration'
-              
-    end  
-    
-    # Add a converter method for the SQL fields the the Rails request class
-    class Request < Rails::Request
-      
-      # Sanitizes SQL queries so that they can be grouped
-      def convert_sql(sql, definition) 
-        sql.gsub(/\b\d+\b/, ':int').gsub(/`([^`]+)`/, '\1').gsub(/'[^']*'/, ':string').rstrip
-      end
+    def self.create
+      puts 'DEPRECATED: use --rails-format development instead!'
+      super('development')
     end
   end
 end

data/lib/request_log_analyzer/file_format.rb

@@ -1,9 +1,9 @@
 module RequestLogAnalyzer::FileFormat
-  
+
   def self.const_missing(const)
     RequestLogAnalyzer::load_default_class_file(self, const)
-  end  
-  
+  end
+
   # Loads a FileFormat::Base subclass instance.
   # You can provide:
   # * A FileFormat instance (which will return itself)
@@ -34,58 +34,46 @@ module RequestLogAnalyzer::FileFormat
 
     else
       # load a provided file format
-      klass = RequestLogAnalyzer::FileFormat.const_get(RequestLogAnalyzer::to_camelcase(file_format))      
+      klass = RequestLogAnalyzer::FileFormat.const_get(RequestLogAnalyzer::to_camelcase(file_format))
     end
-    
+
     # check the returned klass to see if it can be used
     raise "Could not load a file format from #{file_format.inspect}" if klass.nil?
     raise "Invalid FileFormat class" unless klass.kind_of?(Class) && klass.ancestors.include?(RequestLogAnalyzer::FileFormat::Base)
-    
+
     @current_file_format = klass.create(*args) # return an instance of the class
-  end  
-  
-  # Makes classes aware of a file format by registering the file_format variable
-  module Awareness
-    
-    def self.included(base)
-      base.send(:attr_reader, :file_format)
-    end
-    
-    def register_file_format(format)
-      @file_format = format
-    end
-  end  
+  end
 
-  # Base class for all log file format definitions. This class provides functions for subclasses to 
+  # Base class for all log file format definitions. This class provides functions for subclasses to
   # define their LineDefinitions and to define a summary report.
   #
   # A subclass of this class is instantiated when request-log-analyzer is started and this instance
   # is shared with all components of the application so they can act on the specifics of the format
   class Base
-    
+
     attr_reader :line_definitions, :report_trackers
-    
+
     ####################################################################################
     # CLASS METHODS for format definition
     ####################################################################################
-    
+
     # Registers the line definer instance for a subclass.
     def self.inherited(subclass)
       if subclass.superclass == RequestLogAnalyzer::FileFormat::Base
 
         # Create aline and report definer for this class
-        subclass.class_eval do 
+        subclass.class_eval do
           instance_variable_set(:@line_definer, RequestLogAnalyzer::LineDefinition::Definer.new)
           instance_variable_set(:@report_definer, RequestLogAnalyzer::Aggregator::Summarizer::Definer.new)
           class << self; attr_accessor :line_definer, :report_definer; end
-        end        
+        end
 
         # Create a custom Request class for this file format
         subclass.const_set('Request', Class.new(RequestLogAnalyzer::Request)) unless subclass.const_defined?('Request')
       else
 
         # Copy the line and report definer from the parent class.
-        subclass.class_eval do 
+        subclass.class_eval do
           instance_variable_set(:@line_definer, superclass.line_definer.clone)
           instance_variable_set(:@report_definer, superclass.report_definer.clone)
           class << self; attr_accessor :line_definer, :report_definer; end
@@ -125,7 +113,7 @@ module RequestLogAnalyzer::FileFormat
       return self.new(line_definer.line_definitions, report_definer.trackers)
     end
 
-    def initialize(line_definitions = [], report_trackers = [])
+    def initialize(line_definitions = {}, report_trackers = [])
       @line_definitions, @report_trackers = line_definitions, report_trackers
     end
 
@@ -165,7 +153,7 @@ module RequestLogAnalyzer::FileFormat
         match = definition.matches(line, &warning_handler)
         return match if match
       end
-      
+
       return nil
     end
   end

data/lib/request_log_analyzer/filter/anonymize.rb

@@ -1,12 +1,12 @@
 module RequestLogAnalyzer::Filter
-  
+
   # Filter to anonymize parsed values
   # Options
   # * <tt>:mode</tt> :reject or :accept.
   # * <tt>:field</tt> Specific field to accept or reject.
   # * <tt>:value</tt> Value that the field should match to be accepted or rejected.
   class Anonymize < Base
-   
+
     def generate_random_ip
       "#{rand(256)}.#{rand(256)}.#{rand(256)}.#{rand(256)}"
     end
@@ -14,12 +14,13 @@ module RequestLogAnalyzer::Filter
     def anonymize_url(value)
       return value.sub(/^https?\:\/\/[A-Za-z0-9\.-]+\//, "http://example.com/")
     end
-    
+
     def fuzz(value)
       value * ((75 + rand(50)) / 100.0)
     end
 
-    def filter(request)    
+    def filter(request)
+      # TODO: request.attributes is bad practice
       request.attributes.each do |key, value|
         if key == :ip
           request.attributes[key] = generate_random_ip
@@ -30,9 +31,9 @@ module RequestLogAnalyzer::Filter
           request.attributes[key] = fuzz(value)
         end
       end
-      
+
       return request
-    end 
+    end
   end
-  
+
 end

data/lib/request_log_analyzer/filter/field.rb

@@ -1,24 +1,24 @@
 module RequestLogAnalyzer::Filter
-  
+
   # Filter to select or reject a specific field
   # Options
   # * <tt>:mode</tt> :reject or :accept.
   # * <tt>:field</tt> Specific field to accept or reject.
   # * <tt>:value</tt> Value that the field should match to be accepted or rejected.
   class Field < Base
-   
+
     attr_reader :field, :value, :mode
-   
+
     def initialize(file_format, options = {})
       super(file_format, options)
       setup_filter
     end
-   
+
     # Setup mode, field and value.
     def setup_filter
       @mode = (@options[:mode] || :accept).to_sym
       @field = @options[:field].to_sym
-      
+
       # Convert the timestamp to the correct formats for quick timestamp comparisons
       if @options[:value].kind_of?(String) && @options[:value][0, 1] == '/' && @options[:value][-1, 1] == '/'
         @value = Regexp.new(@options[:value][1..-2])
@@ -26,17 +26,17 @@ module RequestLogAnalyzer::Filter
         @value = @options[:value] # TODO: convert value?
       end
     end
-    
+
     # Keep request if @mode == :select and request has the field and value.
     # Drop request if @mode == :reject and request has the field and value.
     # Returns nil otherwise.
     # <tt>request</tt> Request Object
     def filter(request)
-      found_field = request.every(@field).any? { |value| @value === value.to_s }      
+      found_field = request.every(@field).any? { |value| @value === value.to_s }
       return nil if !found_field && @mode == :select
       return nil if found_field && @mode == :reject
       return request
-    end 
+    end
   end
-  
+
 end

data/lib/request_log_analyzer/filter/timespan.rb

@@ -1,26 +1,28 @@
 module RequestLogAnalyzer::Filter
-  
+
   # Reject all requests not in given timespan
   # Options
   # * <tt>:after</tt> Only keep requests after this DateTime.
   # * <tt>:before</tt> Only keep requests before this DateTime.
   class Timespan < Base
-   
+
     attr_reader :before, :after
-   
+
     def initialize(file_format, options = {})
+      @after  = nil
+      @before = nil
       super(file_format, options)
       setup_filter
     end
-   
-   
+
+
     # Convert the timestamp to the correct formats for quick timestamp comparisons.
     # These are stored in the before and after attr_reader fields.
     def setup_filter
-      @after  = @options[:after].strftime('%Y%m%d%H%M%S').to_i  if options[:after]     
+      @after  = @options[:after].strftime('%Y%m%d%H%M%S').to_i  if options[:after]
       @before = @options[:before].strftime('%Y%m%d%H%M%S').to_i if options[:before]
     end
-    
+
     # Returns request if:
     #   * @after <= request.timestamp <= @before
     #   * @after <= request.timestamp
@@ -32,12 +34,12 @@ module RequestLogAnalyzer::Filter
         return request
       elsif @after && @before.nil? && @after <= request.timestamp
         return request
-      elsif @before && @after.nil? && request.timestamp <= @before 
+      elsif @before && @after.nil? && request.timestamp <= @before
         return request
       end
 
       return nil
-    end 
+    end
   end
-  
+
 end