request-log-analyzer 1.12.4 → 1.12.5

data/.travis.yml

@@ -4,11 +4,19 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - ruby-head
   - ree
   - jruby-18mode
-  #- jruby-19mode
-  #- rbx-18mode
-  #- rbx-19mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode
+    - rvm: jruby-head
+    - rvm: ruby-head
 notifications:
   email:
-    - info@railsdoctors.com
+    - info@railsdoctors.com

data/README.rdoc

@@ -7,6 +7,7 @@ This is a simple command line tool to analyze request log files in various forma
 * Uses several metrics, including cumulative request time, mean request time, process blockers, database and rendering time, HTTP methods and statuses, Rails action cache statistics, etc.) (Sample output: http://github.com/wvanbergen/request-log-analyzer/wiki/sample-output)
 * Low memory footprint and reasonably fast, so it is safe to run on a production server.
 * MIT licensed
+* Runs on all rubies {<img src="https://secure.travis-ci.org/wvanbergen/request-log-analyzer.png" />}[http://travis-ci.org/wvanbergen/request-log-analyzer]
 
 See the project wiki at http://github.com/wvanbergen/request-log-analyzer/wiki for documentation and additional information.
 

data/bin/request-log-analyzer

@@ -54,7 +54,7 @@ begin
 
     command_line.switch(:boring, :b)
     command_line.option(:output, :alias => :o, :default => 'fixedwidth')
-    command_line.option(:report_width,  :default => terminal_width - 1)
+    command_line.option(:report_width,  :default => CommandLine::Tools.terminal_width - 1)
     command_line.option(:report_amount, :default => 20)
     command_line.option(:report_sort,   :default => 'sum,mean')
 
@@ -111,7 +111,7 @@ end
 
 case arguments.command
 when :install
-  install_rake_tasks(arguments.parameters[0])
+  CommandLine::Tools.install_rake_tasks(arguments.parameters[0])
 when :console
   require 'cli/database_console'
   DatabaseConsole.new(arguments).run!

data/lib/cli/command_line_arguments.rb

@@ -17,7 +17,7 @@ module CommandLine
     # <tt>definition</tt> The definition of the flag.
     def initialize(name, definition = {})
       @name            = CommandLine::Option.rewrite(name)
-      @alias           = definition[:alias].to_sym if definition[:alias]
+      @alias           = definition[:alias] ? definition[:alias].to_sym : nil
       @required        = definition.has_key?(:required) && definition[:required] == true
       @parameter_count = definition[:parameters] || 1
       @multiple        = definition[:multiple]   || false
@@ -103,7 +103,7 @@ module CommandLine
 
       def [](option_name)
         option_symbol = CommandLine::Option.rewrite(option_name)
-        if the_option = @options.detect { |(name, odef)| odef =~ option_symbol }
+        if the_option = @options.detect { |(_, odef)| odef =~ option_symbol }
           the_option[1]
         else
           raise CommandLine::UnknownOption, option_name
@@ -164,7 +164,7 @@ module CommandLine
     end
 
     def [](option)
-      if the_option = @options.detect { |(key, value)| key =~ option }
+      if the_option = @options.detect { |(key, _)| key =~ option }
         the_option[1]
       else
         @current_definition[option].default_value

data/lib/cli/database_console_init.rb

@@ -30,7 +30,7 @@ class Request
       inspect_line = "   - #{line.line_type} (line #{line.lineno})"
       if (inspect_attributes = line.attributes.reject { |(k, v)| [:id, :source_id, :request_id, :lineno].include?(k.to_sym) }).any?
         inspect_attributes = inspect_attributes.map { |(k,v)| "#{k} = #{v.inspect}" }.join(', ')
-        inspect_line << "\n      " + wordwrap(inspect_attributes, terminal_width - 6, "      ")
+        inspect_line << "\n      " + wordwrap(inspect_attributes, CommandLine::Tools.terminal_width - 6, "      ")
       end
       inspect_line
     end

data/lib/cli/progressbar.rb

@@ -29,6 +29,7 @@ module CommandLine
       clear
       show
     end
+
     attr_reader   :title
     attr_reader   :current
     attr_reader   :total
@@ -120,13 +121,13 @@ module CommandLine
     end
 
     def show
-      arguments = @format_arguments.map {|method|
+      arguments = @format_arguments.map do |method|
         method = sprintf("fmt_%s", method)
         send(method)
-      }
+      end
       line = sprintf(@format, *arguments)
 
-      width = terminal_width(80)
+      width = CommandLine::Tools.terminal_width(80, @out)
       if line.length == width - 1
         @out.print(line + eol)
         @out.flush
@@ -159,7 +160,7 @@ module CommandLine
     public
     def clear
       @out.print "\r"
-      @out.print(" " * (terminal_width(80) - 1))
+      @out.print(" " * (CommandLine::Tools.terminal_width(80) - 1))
       @out.print "\r"
     end
 

data/lib/cli/tools.rb

@@ -1,50 +1,54 @@
-# Try to determine the terminal with.
-# If it is not possible to to so, it returns the default_width.
-# <tt>default_width</tt> Defaults to 81
-def terminal_width(default_width = 81)
-  
-  begin
-    tiocgwinsz = 0x5413
-    data = [0, 0, 0, 0].pack("SSSS")
-    if !RUBY_PLATFORM.include?('java') && @out.ioctl(tiocgwinsz, data) >= 0 # JRuby crashes on ioctl
-      rows, cols, xpixels, ypixels = data.unpack("SSSS")
-      raise unless cols > 0
-      cols
-    else
-      raise
-    end
-  rescue 
-    begin
-      IO.popen('stty -a 2>&1') do |pipe|
-        column_line = pipe.detect { |line| /(\d+) columns/ =~ line }
-        raise unless column_line
-        $1.to_i
+module CommandLine
+  module Tools
+    extend self
+
+    # Try to determine the terminal with.
+    # If it is not possible to to so, it returns the default_width.
+    # <tt>default_width</tt> Defaults to 81
+    def terminal_width(default_width = 81, out = STDOUT)
+
+      begin
+        tiocgwinsz = 0x5413
+        data = [0, 0, 0, 0].pack("SSSS")
+        if !RUBY_PLATFORM.include?('java') && out.ioctl(tiocgwinsz, data) >= 0 # JRuby crashes on ioctl
+          _, cols, _, _ = data.unpack("SSSS")
+          raise unless cols > 0
+          cols
+        else
+          raise
+        end
+      rescue
+        begin
+          IO.popen('stty -a 2>&1') do |pipe|
+            column_line = pipe.detect { |line| /(\d+) columns/ =~ line }
+            raise unless column_line
+            $1.to_i
+          end
+        rescue
+          default_width
+        end
       end
-    rescue
-      default_width
     end
-  end
-end
 
-# Copies request-log-analyzer analyzer rake tasks into the /lib/tasks folder of a project, for easy access and
-# environment integration.
-# <tt>install_type</tt> Type of project to install into. Defaults to :rails.
-# Raises if it cannot find the project folder or if the install_type is now known.
-def install_rake_tasks(install_type = :rails)
-  if install_type.to_sym == :rails
-    require 'fileutils'
-    if File.directory?('./lib/tasks/')
-      task_file = File.expand_path('../../tasks/request_log_analyzer.rake', File.dirname(__FILE__))
-      FileUtils.copy(task_file, './lib/tasks/request_log_analyze.rake')
-      puts "Installed rake tasks."
-      puts "To use, run: rake rla:report"
-    else
-      puts "Cannot find /lib/tasks folder. Are you in your Rails directory?"
-      puts "Installation aborted."
+    # Copies request-log-analyzer analyzer rake tasks into the /lib/tasks folder of a project, for easy access and
+    # environment integration.
+    # <tt>install_type</tt> Type of project to install into. Defaults to :rails.
+    # Raises if it cannot find the project folder or if the install_type is now known.
+    def install_rake_tasks(install_type = :rails)
+      if install_type.to_sym == :rails
+        require 'fileutils'
+        if File.directory?('./lib/tasks/')
+          task_file = File.expand_path('../../tasks/request_log_analyzer.rake', File.dirname(__FILE__))
+          FileUtils.copy(task_file, './lib/tasks/request_log_analyze.rake')
+          puts "Installed rake tasks."
+          puts "To use, run: rake rla:report"
+        else
+          puts "Cannot find /lib/tasks folder. Are you in your Rails directory?"
+          puts "Installation aborted."
+        end
+      else
+        raise "Cannot perform this install type! (#{install_type.to_s})"
+      end
     end
-  else
-    raise "Cannot perform this install type! (#{install_type.to_s})"
   end
 end
-
-

data/lib/ordered_hash.rb

@@ -0,0 +1,167 @@
+if RUBY_VERSION.to_f <= 1.8
+
+  # Simplified version copied from Activesupport::OrderedHash
+  class OrderedHash < ::Hash #:nodoc:
+    # In MRI the Hash class is core and written in C. In particular, methods are
+    # programmed with explicit C function calls and polymorphism is not honored.
+    #
+    # For example, []= is crucial in this implementation to maintain the @keys
+    # array but hash.c invokes rb_hash_aset() originally. This prevents method
+    # reuse through inheritance and forces us to reimplement stuff.
+    #
+    # For instance, we cannot use the inherited #merge! because albeit the algorithm
+    # itself would work, our []= is not being called at all by the C code.
+
+    def initialize(*args, &block)
+      super
+      @keys = []
+    end
+
+    def self.[](*args)
+      ordered_hash = new
+
+      if (args.length == 1 && args.first.is_a?(Array))
+        args.first.each do |key_value_pair|
+          next unless (key_value_pair.is_a?(Array))
+          ordered_hash[key_value_pair[0]] = key_value_pair[1]
+        end
+
+        return ordered_hash
+      end
+
+      unless (args.size % 2 == 0)
+        raise ArgumentError.new("odd number of arguments for Hash")
+      end
+
+      args.each_with_index do |val, ind|
+        next if (ind % 2 != 0)
+        ordered_hash[val] = args[ind + 1]
+      end
+
+      ordered_hash
+    end
+
+    def initialize_copy(other)
+      super
+      # make a deep copy of keys
+      @keys = other.keys
+    end
+
+    def []=(key, value)
+      @keys << key unless has_key?(key)
+      super
+    end
+
+    def delete(key)
+      if has_key? key
+        index = @keys.index(key)
+        @keys.delete_at index
+      end
+      super
+    end
+
+    def delete_if
+      super
+      sync_keys!
+      self
+    end
+
+    def reject!
+      super
+      sync_keys!
+      self
+    end
+
+    def reject(&block)
+      dup.reject!(&block)
+    end
+
+    def keys
+      @keys.dup
+    end
+
+    def values
+      @keys.collect { |key| self[key] }
+    end
+
+    def to_hash
+      self
+    end
+
+    def to_a
+      @keys.map { |key| [ key, self[key] ] }
+    end
+
+    def each_key
+      return to_enum(:each_key) unless block_given?
+      @keys.each { |key| yield key }
+      self
+    end
+
+    def each_value
+      return to_enum(:each_value) unless block_given?
+      @keys.each { |key| yield self[key]}
+      self
+    end
+
+    def each
+      return to_enum(:each) unless block_given?
+      @keys.each {|key| yield [key, self[key]]}
+      self
+    end
+
+    alias_method :each_pair, :each
+
+    alias_method :select, :find_all
+
+    def clear
+      super
+      @keys.clear
+      self
+    end
+
+    def shift
+      k = @keys.first
+      v = delete(k)
+      [k, v]
+    end
+
+    def merge!(other_hash)
+      if block_given?
+        other_hash.each { |k, v| self[k] = key?(k) ? yield(k, self[k], v) : v }
+      else
+        other_hash.each { |k, v| self[k] = v }
+      end
+      self
+    end
+
+    alias_method :update, :merge!
+
+    def merge(other_hash, &block)
+      dup.merge!(other_hash, &block)
+    end
+
+    # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+    def replace(other)
+      super
+      @keys = other.keys
+      self
+    end
+
+    def invert
+      OrderedHash[self.to_a.map!{|key_value_pair| key_value_pair.reverse}]
+    end
+
+    def inspect
+      "#<OrderedHash #{super}>"
+    end
+
+    private
+      def sync_keys!
+        @keys.delete_if {|k| !has_key?(k)}
+      end
+  end
+  
+else
+  ::OrderedHash = ::Hash
+end

data/lib/request_log_analyzer.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'ordered_hash'
 
 # RequestLogAnalyzer is the base namespace in which all functionality of RequestLogAnalyzer is implemented.
 # This module itselfs contains some functions to help with class and source file loading. The actual 

data/lib/request_log_analyzer/aggregator/database_inserter.rb

@@ -35,7 +35,7 @@ module RequestLogAnalyzer::Aggregator
       @request_object = RequestLogAnalyzer::Database::Request.new(:first_lineno => request.first_lineno, :last_lineno => request.last_lineno)
       request.lines.each do |line|
         class_columns = database.get_class(line[:line_type]).column_names.reject { |column| ['id', 'source_id', 'request_id'].include?(column) }
-        attributes = Hash[*line.select { |(k, v)| class_columns.include?(k.to_s)}.flatten]
+        attributes = Hash[*line.select { |(key, _)| class_columns.include?(key.to_s)}.flatten]
         
         # Fix encoding patch for 1.9.2
         attributes.each do |k,v|

data/lib/request_log_analyzer/aggregator/echo.rb

@@ -12,7 +12,7 @@ module RequestLogAnalyzer::Aggregator
     # Display every parsed line immediately to the terminal
     def aggregate(request)
       puts "\nRequest: \n" + request.lines.map { |l| 
-        "\t#{l[:lineno]}:#{l[:line_type]}: #{l.reject { |(k,v)| [:lineno, :line_type].include?(k) }.inspect}" }.join("\n")
+        "\t#{l[:lineno]}:#{l[:line_type]}: #{l.reject { |(k,_)| [:lineno, :line_type].include?(k) }.inspect}" }.join("\n")
     end
 
     # Capture all warnings during parsing

data/lib/request_log_analyzer/aggregator/summarizer.rb

@@ -26,12 +26,12 @@ module RequestLogAnalyzer::Aggregator
       def method_missing(tracker_method, *args)
         track(tracker_method, *args)
       end
-      
+
       # Helper function to initialize a tracker and add it to the tracker array.
       # <tt>tracker_class</tt> The class to include
       # <tt>optiont</tt> The options to pass to the trackers.
       def track(tracker_klass, value_field = {}, other_options = {})
-        options = value_field.kind_of?(Symbol) ? other_options.merge(:value => value_field) : value_field.merge(other_options) 
+        options = value_field.kind_of?(Symbol) ? other_options.merge(:value => value_field) : value_field.merge(other_options)
         tracker_klass = RequestLogAnalyzer::Tracker.const_get(RequestLogAnalyzer.to_camelcase(tracker_klass)) if tracker_klass.kind_of?(Symbol)
         @trackers << tracker_klass.new(options)
       end
@@ -108,9 +108,12 @@ module RequestLogAnalyzer::Aggregator
 
       output.with_style(:cell_separator => false) do
         output.table({:width => 20}, {:font => :bold}) do |rows|
-          rows << ['Parsed lines:',    source.parsed_lines]
-          rows << ['Skipped lines:',   source.skipped_lines]
-          rows << ['Parsed requests:', source.parsed_requests]
+          source.processed_files.each do |f|
+            rows << ['Processsed File:', f]
+          end
+          rows << ['Parsed lines:',     source.parsed_lines]
+          rows << ['Skipped lines:',    source.skipped_lines]
+          rows << ['Parsed requests:',  source.parsed_requests]
           rows << ['Skipped requests:', source.skipped_requests]
           rows << ["Warnings:", @warnings_encountered.map { |(key, value)| "#{key}: #{value}" }.join(', ')] if has_warnings?
         end
@@ -134,7 +137,7 @@ module RequestLogAnalyzer::Aggregator
 
     # Returns true if there were any warnings generated by the trackers
     def has_warnings?
-      @warnings_encountered.inject(0) { |result, (key, value)| result += value } > 0
+      @warnings_encountered.inject(0) { |result, (_, value)| result += value } > 0
     end
 
     # Returns true if there were any log ordering warnings

data/lib/request_log_analyzer/database/base.rb

@@ -26,8 +26,7 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
   class_attribute :line_definition
   cattr_accessor :database
 
-  def self.subclass_from_line_definition(definition)
-    klass = Class.new(RequestLogAnalyzer::Database::Base)
+  def self.subclass_from_line_definition(definition, klass = Class.new(RequestLogAnalyzer::Database::Base))
     klass.table_name = "#{definition.name}_lines"
 
     klass.line_definition = definition
@@ -47,10 +46,9 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
     return klass
   end
 
-  def self.subclass_from_table(table)
+  def self.subclass_from_table(table, klass = Class.new(RequestLogAnalyzer::Database::Base))
     raise "Table #{table} not found!" unless database.connection.table_exists?(table)
-
-    klass = Class.new(RequestLogAnalyzer::Database::Base)
+    
     klass.table_name = table
 
     if klass.column_names.include?('request_id')

data/lib/request_log_analyzer/file_format.rb

@@ -258,7 +258,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 = OrderedHash.new, report_trackers = [])
       @line_definitions, @report_trackers = line_definitions, report_trackers
     end
 
@@ -287,7 +287,7 @@ module RequestLogAnalyzer::FileFormat
     # Checks whether the line definitions form a valid language.
     # A file format should have at least a header and a footer line type    
     def valid_line_definitions?
-      line_definitions.any? { |(name, ld)| ld.header } && line_definitions.any? { |(name, ld)| ld.footer }
+      line_definitions.any? { |(_, ld)| ld.header } && line_definitions.any? { |(_, ld)| ld.footer }
     end
     
     # Checks whether the request class inherits from the base Request class.
@@ -297,7 +297,7 @@ module RequestLogAnalyzer::FileFormat
 
     # Returns true if this language captures the given symbol in one of its line definitions
     def captures?(name)
-      line_definitions.any? { |(name, ld)| ld.captures?(name) }
+      line_definitions.any? { |(_, ld)| ld.captures?(name) }
     end
 
     # Function that a file format con implement to monkey patch the environment.

data/lib/request_log_analyzer/file_format/mysql.rb

@@ -93,7 +93,7 @@ module RequestLogAnalyzer::FileFormat
 
       # Convert the timestamp to an integer
       def convert_timestamp(value, definition)
-        all,y,m,d,h,i,s = value.split(/(\d\d)(\d\d)(\d\d)\s+(\d?\d):(\d\d):(\d\d)/)
+        _, y, m, d, h, i, s = value.split(/(\d\d)(\d\d)(\d\d)\s+(\d?\d):(\d\d):(\d\d)/)
         ('20%s%s%s%s%s%s' % [y,m,d,h.rjust(2, '0'),i,s]).to_i
       end
     end

data/lib/request_log_analyzer/file_format/oink.rb

@@ -43,27 +43,27 @@ class RequestLogAnalyzer::FileFormat::Oink < RequestLogAnalyzer::FileFormat::Rai
   end
 
   class Request < RequestLogAnalyzer::FileFormat::Rails::Request
-   # Overrides the #validate method to handle PID updating.
-   def validate
-     update_pids
-     super
-   end
+    # Overrides the #validate method to handle PID updating.
+    def validate
+      update_pids
+      super
+    end
    
-   # Accessor for memory information associated with the specified request PID. If no memory exists
-   # for this request's :pid, the memory tracking is initialized.
-   def pid_memory
-     file_format.pids[self[:pid]] ||= { :last_memory_reading => -1, :current_memory_reading => -1 }
-   end
+    # Accessor for memory information associated with the specified request PID. If no memory exists
+    # for this request's :pid, the memory tracking is initialized.
+    def pid_memory
+      file_format.pids[self[:pid]] ||= { :last_memory_reading => -1, :current_memory_reading => -1 }
+    end
     
-   # Calculates :memory_diff for each request based on the last completed request that was not a failure.
-   def update_pids
-     # memory isn't recorded with exceptions. need to set #last_memory_reading+ to -1 as
-     # the memory used could have changed. for the next request the memory change will not be recorded.
-     #
-     # NOTE - the failure regex was not matching with a Rails Development log file.
-     if has_line_type?(:failure) and processing = has_line_type?(:processing)
-       pid_memory[:last_memory_reading] = -1
-     elsif mem_line = has_line_type?(:memory_usage)
+    # Calculates :memory_diff for each request based on the last completed request that was not a failure.
+    def update_pids
+      # memory isn't recorded with exceptions. need to set #last_memory_reading+ to -1 as
+      # the memory used could have changed. for the next request the memory change will not be recorded.
+      #
+      # NOTE - the failure regex was not matching with a Rails Development log file.
+      if has_line_type?(:failure) and processing = has_line_type?(:processing)
+        pid_memory[:last_memory_reading] = -1
+      elsif mem_line = has_line_type?(:memory_usage)
         memory_reading = mem_line[:memory]
         pid_memory[:current_memory_reading] = memory_reading
         # calcuate the change in memory
@@ -79,18 +79,18 @@ class RequestLogAnalyzer::FileFormat::Oink < RequestLogAnalyzer::FileFormat::Rai
         pid_memory[:current_memory_reading] = -1
       end # if mem_line
       return true
-   end # def update_pids
+    end
 
-  def convert_pipe_separated_counts(value, capture_definition)
-    count_strings = value.split(' | ')
-    count_arrays = count_strings.map do |count_string|
-      if count_string =~ /^(\w+): (\d+)/
-        [$1, $2.to_i]
+    def convert_pipe_separated_counts(value, capture_definition)
+      count_strings = value.split(' | ')
+      count_arrays = count_strings.map do |count_string|
+        if count_string =~ /^(\w+): (\d+)/
+          [$1, $2.to_i]
+        end
       end
-    end
 
-    Hash[count_arrays]
-  end
+      Hash[count_arrays]
+    end
   
   end # class Request
 end

data/lib/request_log_analyzer/file_format/postgresql.rb

@@ -61,7 +61,7 @@ module RequestLogAnalyzer::FileFormat
 
       # Convert the timestamp to an integer
       def convert_timestamp(value, definition)
-        all,y,m,d,h,i,s = value.split(/(\d\d)-(\d\d)-(\d\d)\s+(\d?\d):(\d\d):(\d\d)/)
+        _, y, m, d, h, i, s = value.split(/(\d\d)-(\d\d)-(\d\d)\s+(\d?\d):(\d\d):(\d\d)/)
         ('20%s%s%s%s%s%s' % [y,m,d,h.rjust(2, '0'),i,s]).to_i
       end
     end

data/lib/request_log_analyzer/file_format/w3c.rb

@@ -8,7 +8,7 @@ module RequestLogAnalyzer::FileFormat
     line_definition :access do |line|
       line.header = true
       line.footer = true
-      line.regexp = /^(#{timestamp('%Y-%m-%d %H:%M:%S')}) (#{ip_address}) (.*) (#{ip_address}) (\d+) (\w+) ([\w|\/|.]+) \- (\d+) (\d+) (\d+) (\d+) (.*) (\S+)/
+      line.regexp = /^(#{timestamp('%Y-%m-%d %H:%M:%S')}) (#{ip_address}) (.*) (#{ip_address}) (\d+) (\w+) (\S+) \- (\d+) (\d+) (\d+) (\d+) (.*) (\S+)/
       
       line.capture(:timestamp).as(:timestamp)
       line.capture(:remote_ip)
@@ -49,8 +49,5 @@ module RequestLogAnalyzer::FileFormat
         "#{value[0,4]}#{value[5,2]}#{value[8,2]}#{value[11,2]}#{value[14,2]}#{value[17,2]}".to_i
       end
     end
-    
-
   end
-  
 end

data/lib/request_log_analyzer/line_definition.rb

@@ -10,7 +10,7 @@ module RequestLogAnalyzer
       attr_accessor :line_definitions
 
       def initialize
-        @line_definitions = {}
+        @line_definitions = OrderedHash.new
       end
 
       def initialize_copy(other)
@@ -66,7 +66,9 @@ module RequestLogAnalyzer
     end
     
     def capture(name)
-      new_capture_hash = { :name => name, :type => :string}
+      new_capture_hash = OrderedHash.new()
+      new_capture_hash[:name] = name
+      new_capture_hash[:type] = :string
       captures << new_capture_hash
       CaptureDefiner.new(new_capture_hash)
     end

data/lib/request_log_analyzer/log_processor.rb

@@ -52,7 +52,7 @@ module RequestLogAnalyzer
     # in which the actual processing is performed.
     # <tt>file</tt> The file to process
     def process_file(file)
-      File.open(file, 'r') { |file| process_io(file) }
+      File.open(file, 'r') { |io| process_io(io) }
     end
 
     # Processes an input stream by iteration over each line and processing it according to

data/lib/request_log_analyzer/output/fixed_width.rb

@@ -164,7 +164,6 @@ module RequestLogAnalyzer::Output
       end
 
       if column_widths.include?(nil)
-        fill_column = columns[column_widths.index(nil)]
         width_left = options[:width] - ((columns.length - 1) * (style[:cell_separator] ? 3 : 1)) - column_widths.compact.inject(0) { |sum, col| sum + col}
         column_widths[column_widths.index(nil)] = width_left
       end

data/lib/request_log_analyzer/source/log_parser.rb

@@ -15,7 +15,7 @@ module RequestLogAnalyzer::Source
 
     # The maximum number of bytes to read from a line.
     DEFAULT_MAX_LINE_LENGTH = 8096
-    
+
     DEFAULT_LINE_DIVIDER = "\n"
 
     # The default parse strategy that will be used to parse the input.
@@ -24,7 +24,7 @@ module RequestLogAnalyzer::Source
     # All available parse strategies.
     PARSE_STRATEGIES = ['cautious', 'assume-correct']
 
-    attr_reader :source_files, :current_file, :current_lineno
+    attr_reader :source_files, :current_file, :current_lineno, :processed_files
     attr_reader :warnings, :parsed_lines, :parsed_requests, :skipped_lines, :skipped_requests
 
     # Initializes the log file parser instance.
@@ -44,8 +44,10 @@ module RequestLogAnalyzer::Source
       @current_source   = nil
       @current_file     = nil
       @current_lineno   = nil
+      @processed_files  = []
       @source_files     = options[:source_files]
       @progress_handler = nil
+      @warning_handler  = nil
 
       @options[:parse_strategy] ||= DEFAULT_PARSE_STRATEGY
       unless PARSE_STRATEGIES.include?(@options[:parse_strategy])
@@ -56,7 +58,7 @@ module RequestLogAnalyzer::Source
     def max_line_length
       file_format.max_line_length || DEFAULT_MAX_LINE_LENGTH
     end
-    
+
     def line_divider
       file_format.line_divider || DEFAULT_LINE_DIVIDER
     end
@@ -128,6 +130,9 @@ module RequestLogAnalyzer::Source
 
         @progress_handler.call(:finished, file) if @progress_handler
         @progress_handler = nil
+
+        @processed_files.push(@current_source.dup)
+
       else
         IO.popen(decompress_file?(file), 'rb') { |f| parse_io(f, options, &block) }
       end
@@ -145,7 +150,7 @@ module RequestLogAnalyzer::Source
     def parse_stream(stream, options = {}, &block)
       parse_io(stream, options, &block)
     end
-    
+
     # Parses a string. It will simply call parse_io. This function does not support progress updates.
     # <tt>string</tt>:: The string that should be parsed.
     # <tt>options</tt>:: A Hash of options that will be pased to parse_io.
@@ -180,7 +185,7 @@ module RequestLogAnalyzer::Source
       warn(:unfinished_request_on_eof, "End of file reached, but last request was not completed!") unless @current_request.nil?
       @current_lineno = nil
     end
-    
+
     # This method loops over each line of the input stream. It will try to parse this line as any of
     # the lines that are defined by the current file format (see RequestLogAnalyazer::FileFormat).
     # It will then combine these parsed line into requests using heuristics. These requests (see
@@ -194,7 +199,7 @@ module RequestLogAnalyzer::Source
     # This is a Ruby 1.8 specific version that doesn't offer memory protection.
     #
     # <tt>io</tt>:: The IO instance to use as source
-    # <tt>options</tt>:: A hash of options that can be used by the parser.    
+    # <tt>options</tt>:: A hash of options that can be used by the parser.
     def parse_io_18(io, options = {}, &block) # :yields: request
       @line_divider    = options[:line_divider]    || line_divider
       @current_lineno  = 0
@@ -207,9 +212,9 @@ module RequestLogAnalyzer::Source
       warn(:unfinished_request_on_eof, "End of file reached, but last request was not completed!") unless @current_request.nil?
       @current_lineno = nil
     end
-    
+
     alias_method :parse_io, RUBY_VERSION.to_f < 1.9 ? :parse_io_18 : :parse_io_19
-    
+
     # Parses a single line using the current file format. If successful, use the parsed
     # information to build a request
     # <tt>line</tt>:: The line to parse

data/lib/request_log_analyzer/tracker/numeric_value.rb

@@ -68,7 +68,7 @@ module RequestLogAnalyzer::Tracker
       top_categories = output.slice_results(sorted_by(sort))
       output.with_style(:top_line => true) do
         output.table(*statistics_header(:title => options[:title], :highlight => sort)) do |rows|
-          top_categories.each { |(cat, info)| rows << statistics_row(cat) }
+          top_categories.each { |(category, _)| rows << statistics_row(category) }
         end
       end
     end
@@ -292,12 +292,12 @@ module RequestLogAnalyzer::Tracker
 
     # Get the cumlative duration of a all categories.
     def sum_overall
-      @categories.inject(0.0) { |sum, (name, cat)| sum + cat[:sum] }
+      @categories.inject(0.0) { |sum, (_, cat)| sum + cat[:sum] }
     end
 
     # Get the total hits of a all categories.
     def hits_overall
-      @categories.inject(0) { |sum, (name, cat)| sum + cat[:hits] }
+      @categories.inject(0) { |sum, (_, cat)| sum + cat[:hits] }
     end
 
     # Return categories sorted by a given key.

data/request-log-analyzer.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "1.12.4"
-  s.date    = "2012-08-05"
+  s.version = "1.12.5"
+  s.date    = "2012-09-20"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -45,6 +45,6 @@ Gem::Specification.new do |s|
 
   # The files and test_files directives are set automatically by the release script.
   # Do not change them by hand, but make sure to add the files to the git repository.
-  s.files      = %w(.gitignore .infinity_test .travis.yml DESIGN.rdoc Gemfile LICENSE README.rdoc Rakefile bin/request-log-analyzer lib/cli/command_line_arguments.rb lib/cli/database_console.rb lib/cli/database_console_init.rb lib/cli/progressbar.rb lib/cli/tools.rb lib/request_log_analyzer.rb lib/request_log_analyzer/aggregator.rb lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/aggregator/echo.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/controller.rb lib/request_log_analyzer/database.rb lib/request_log_analyzer/database/base.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/database/request.rb lib/request_log_analyzer/database/source.rb lib/request_log_analyzer/database/warning.rb lib/request_log_analyzer/file_format.rb lib/request_log_analyzer/file_format/amazon_s3.rb lib/request_log_analyzer/file_format/apache.rb lib/request_log_analyzer/file_format/delayed_job.rb lib/request_log_analyzer/file_format/delayed_job2.rb lib/request_log_analyzer/file_format/delayed_job21.rb lib/request_log_analyzer/file_format/haproxy.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/mysql.rb lib/request_log_analyzer/file_format/oink.rb lib/request_log_analyzer/file_format/postgresql.rb lib/request_log_analyzer/file_format/rack.rb lib/request_log_analyzer/file_format/rails.rb lib/request_log_analyzer/file_format/rails3.rb lib/request_log_analyzer/file_format/rails_development.rb lib/request_log_analyzer/file_format/w3c.rb lib/request_log_analyzer/filter.rb lib/request_log_analyzer/filter/anonymize.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_processor.rb lib/request_log_analyzer/mailer.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/request.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/tracker/frequency.rb lib/request_log_analyzer/tracker/hourly_spread.rb lib/request_log_analyzer/tracker/numeric_value.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/tracker/traffic.rb request-log-analyzer.gemspec spec/database.yml spec/fixtures/apache_combined.log spec/fixtures/apache_common.log spec/fixtures/decompression.log spec/fixtures/decompression.log.bz2 spec/fixtures/decompression.log.gz spec/fixtures/decompression.log.zip spec/fixtures/decompression.tar.gz 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/mysql_slow_query.log spec/fixtures/oink_22.log spec/fixtures/oink_22_failure.log spec/fixtures/postgresql.log spec/fixtures/rails.db spec/fixtures/rails_1x.log spec/fixtures/rails_22.log spec/fixtures/rails_22_cached.log spec/fixtures/rails_unordered.log spec/fixtures/sinatra.log spec/fixtures/syslog_1x.log spec/fixtures/test_file_format.log spec/fixtures/test_language_combined.log spec/fixtures/test_order.log spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/lib/helpers.rb spec/lib/macros.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/lib/testing_format.rb spec/spec_helper.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/haproxy_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/file_format/w3c_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb tasks/github-gem.rake tasks/request_log_analyzer.rake)
+  s.files      = %w(.gitignore .infinity_test .travis.yml DESIGN.rdoc Gemfile LICENSE README.rdoc Rakefile bin/request-log-analyzer lib/cli/command_line_arguments.rb lib/cli/database_console.rb lib/cli/database_console_init.rb lib/cli/progressbar.rb lib/cli/tools.rb lib/ordered_hash.rb lib/request_log_analyzer.rb lib/request_log_analyzer/aggregator.rb lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/aggregator/echo.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/controller.rb lib/request_log_analyzer/database.rb lib/request_log_analyzer/database/base.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/database/request.rb lib/request_log_analyzer/database/source.rb lib/request_log_analyzer/database/warning.rb lib/request_log_analyzer/file_format.rb lib/request_log_analyzer/file_format/amazon_s3.rb lib/request_log_analyzer/file_format/apache.rb lib/request_log_analyzer/file_format/delayed_job.rb lib/request_log_analyzer/file_format/delayed_job2.rb lib/request_log_analyzer/file_format/delayed_job21.rb lib/request_log_analyzer/file_format/haproxy.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/mysql.rb lib/request_log_analyzer/file_format/oink.rb lib/request_log_analyzer/file_format/postgresql.rb lib/request_log_analyzer/file_format/rack.rb lib/request_log_analyzer/file_format/rails.rb lib/request_log_analyzer/file_format/rails3.rb lib/request_log_analyzer/file_format/rails_development.rb lib/request_log_analyzer/file_format/w3c.rb lib/request_log_analyzer/filter.rb lib/request_log_analyzer/filter/anonymize.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_processor.rb lib/request_log_analyzer/mailer.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/request.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/tracker/frequency.rb lib/request_log_analyzer/tracker/hourly_spread.rb lib/request_log_analyzer/tracker/numeric_value.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/tracker/traffic.rb request-log-analyzer.gemspec spec/database.yml spec/fixtures/apache_combined.log spec/fixtures/apache_common.log spec/fixtures/decompression.log spec/fixtures/decompression.log.bz2 spec/fixtures/decompression.log.gz spec/fixtures/decompression.log.zip spec/fixtures/decompression.tar.gz 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/mysql_slow_query.log spec/fixtures/oink_22.log spec/fixtures/oink_22_failure.log spec/fixtures/postgresql.log spec/fixtures/rails.db spec/fixtures/rails_1x.log spec/fixtures/rails_22.log spec/fixtures/rails_22_cached.log spec/fixtures/rails_unordered.log spec/fixtures/sinatra.log spec/fixtures/syslog_1x.log spec/fixtures/test_file_format.log spec/fixtures/test_language_combined.log spec/fixtures/test_order.log spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/lib/helpers.rb spec/lib/macros.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/lib/testing_format.rb spec/spec_helper.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/haproxy_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/file_format/w3c_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb tasks/github-gem.rake tasks/request_log_analyzer.rake)
   s.test_files = %w(spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/haproxy_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/file_format/w3c_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb)
 end

data/spec/unit/database/base_class_spec.rb

@@ -17,8 +17,6 @@ describe RequestLogAnalyzer::Database::Base do
       @orm_class.stub!(:serialize)
       @orm_class.stub!(:line_definition=)
 
-      Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@orm_class)
-
       RequestLogAnalyzer::Database::Request.stub!(:has_many)
       RequestLogAnalyzer::Database::Source.stub!(:has_many)
 
@@ -27,43 +25,42 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should create a new subclass using the Base class as parent" do
-      Class.should_receive(:new).with(RequestLogAnalyzer::Database::Base).and_return(@orm_class)
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should store the LineDefinition" do
       @orm_class.should_receive(:line_definition=).with(@line_definition)
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should set the table name for the subclass" do
       @orm_class.should_receive("table_name=").with('test_lines')
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should set the :belongs_to relationship with the Request class" do
       @orm_class.should_receive(:belongs_to).with(:request, {:class_name=>"RequestLogAnalyzer::Database::Request"})
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should set a :has_many relationship in the request class" do
       RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:test_lines)
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should set a :has_many relationship in the source class" do
       RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:test_lines)
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should set the :belongs_to relationship with the Source class" do
       @orm_class.should_receive(:belongs_to).with(:source, {:class_name=>"RequestLogAnalyzer::Database::Source"})
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
     it "should serialize a complex field" do
       @orm_class.should_receive(:serialize).with(:evaluated, Hash)
-      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
+      RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition, @orm_class)
     end
 
   end
@@ -82,37 +79,31 @@ describe RequestLogAnalyzer::Database::Base do
       @klass.stub!(:column_names).and_return(['id', 'request_id', 'source_id', 'lineno', 'duration'])
       @klass.stub!("table_name=")
       @klass.stub!(:belongs_to)
-      Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@klass)
-    end
-
-    it "should create a new subclass using the Base class as parent" do
-      Class.should_receive(:new).with(RequestLogAnalyzer::Database::Base).and_return(@klass)
-      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 
     it "should set the table name" do
       @klass.should_receive("table_name=").with('completed_lines')
-      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines', @klass)
     end
 
     it "should create the :belongs_to relation to the request class" do
       @klass.should_receive(:belongs_to).with(:request, {:class_name=>"RequestLogAnalyzer::Database::Request"})
-      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines', @klass)
     end
 
     it "should create the :has_many relation in the request class" do
       RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:completed_lines)
-      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines', @klass)
     end
 
     it "should create the :belongs_to relation to the source class" do
       @klass.should_receive(:belongs_to).with(:source, {:class_name=>"RequestLogAnalyzer::Database::Source"})
-      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines', @klass)
     end
 
     it "should create the :has_many relation in the request class" do
       RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:completed_lines)
-      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
+      RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines', @klass)
     end
 
   end

metadata

@@ -1,80 +1,83 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: request-log-analyzer
-version: !ruby/object:Gem::Version
-  version: 1.12.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 12
+  - 5
+  version: 1.12.5
 platform: ruby
-authors:
+authors: 
 - Willem van Bergen
 - Bart ten Brinke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-20 00:00:00 -04:00
+default_executable: request-log-analyzer
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70130940523300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *70130940523300
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70130940522420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 8
+        version: "2.8"
   type: :development
-  prerelease: false
-  version_requirements: *70130940522420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70130940521320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *70130940521320
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70130940520020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   prerelease: false
-  version_requirements: *70130940520020
-description: ! "    Request log analyzer's purpose is to find out how your web application
-  is being used, how it performs and to\n    focus your optimization efforts. This
-  tool will parse all requests in the application's log file and aggregate the \n
-  \   information. Once it is finished parsing the log file(s), it will show the requests
-  that take op most server time \n    using various metrics. It can also insert all
-  parsed request information into a database so you can roll your own\n    analysis.
-  It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3
-  access logs and MySQL \n    slow query logs out of the box, but file formats of
-  other applications can easily be supported by supplying an \n    easy to write log
-  file format definition.\n"
-email:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: "    Request log analyzer's purpose is to find out how your web application is being used, how it performs and to\n    focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the \n    information. Once it is finished parsing the log file(s), it will show the requests that take op most server time \n    using various metrics. It can also insert all parsed request information into a database so you can roll your own\n    analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL \n    slow query logs out of the box, but file formats of other applications can easily be supported by supplying an \n    easy to write log file format definition.\n"
+email: 
 - willem@railsdoctors.com
 - bart@railsdoctors.com
-executables:
+executables: 
 - request-log-analyzer
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - .gitignore
 - .infinity_test
 - .travis.yml
@@ -89,6 +92,7 @@ files:
 - lib/cli/database_console_init.rb
 - lib/cli/progressbar.rb
 - lib/cli/tools.rb
+- lib/ordered_hash.rb
 - lib/request_log_analyzer.rb
 - lib/request_log_analyzer/aggregator.rb
 - lib/request_log_analyzer/aggregator/database_inserter.rb
@@ -217,40 +221,42 @@ files:
 - spec/unit/tracker/traffic_tracker_spec.rb
 - tasks/github-gem.rake
 - tasks/request_log_analyzer.rake
+has_rdoc: true
 homepage: http://railsdoctors.com
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - request-log-analyzer
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
-- To use the database inserter, ActiveRecord and an appropriate database adapter are
-  required.
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+requirements: 
+- To use the database inserter, ActiveRecord and an appropriate database adapter are required.
 rubyforge_project: r-l-a
-rubygems_version: 1.8.16
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
-  and other web application servers
-test_files:
+summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers
+test_files: 
 - spec/integration/command_line_usage_spec.rb
 - spec/integration/mailer_spec.rb
 - spec/integration/munin_plugins_rails_spec.rb