request-log-analyzer 1.12.11 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 872bac28415815b211937a1a6901ef46e2b6d043
-  data.tar.gz: c134699462b2dbaa10ba1583aca6d48c9e040445
+  metadata.gz: 0d13886d7138b18ba797c914464ef06cf638b14d
+  data.tar.gz: 1e9b4a62e67715bcf782a8c5f30fa1740ce93578
 SHA512:
-  metadata.gz: 6aefe44b90bfb84264d34eeaff521356677165a9c342916e4f0b8cf9b7dc9f7970f937bc9ea9bdd276ea10e7288e15c5f6f64c6977f21804eab819019bc9976c
-  data.tar.gz: 8edf7fbdcb32c2153e06c2bffec201377169fa818db5acd4184557d28583127d25941ff39c137a3b05500409dda5e35061e846af6f3bb09502118a9374014de2
+  metadata.gz: 910de9082b59c474b65fb4a618280e99e143194fbc2e0689fdca1eebdbc4beece89572924a8bf148a8ecf9d6f455a4fc745ad6fa1f8a43447b4a09cb7f78838e
+  data.tar.gz: bfa3b1e2e4cef2e005348faf503541aafbf0ce1e0e522a5b6ff192c369dfb032553cba3f0ced93808fb69c044b43fa3723d0d6491b41d31527034babf1b70116

data/.gitignore

@@ -12,3 +12,4 @@ requests.db
 Gemfile.lock
 /.bundle/
 *.rbc
+_site/

data/.travis.yml

@@ -4,17 +4,14 @@ before_script:
   - psql -c 'create database rla_test;' -U postgres
 script: bundle exec rake
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - ruby-head
-  - ree
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
   - rbx
 gemfile:
-  - Gemfile.activerecord2
   - Gemfile.activerecord3
   - Gemfile.activerecord4
 matrix:
@@ -22,15 +19,6 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx
-  exclude:
-    - gemfile: Gemfile.activerecord4
-      rvm: 1.8.7
-    - gemfile: Gemfile.activerecord4
-      rvm: ree
-    - gemfile: Gemfile.activerecord4
-      rvm: jruby-18mode
-    - gemfile: Gemfile.activerecord4
-      rvm: rbx-18mode
 notifications:
   email:
     - info@railsdoctors.com

data/README.rdoc

@@ -7,7 +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]
+* Runs on all MRI 1.9+ compatible 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.
 
@@ -30,8 +30,6 @@ For more details, other file formats, and available command line options, see th
   $ time ./bin/request-log-analyzer 40MBRailsFile.log
 
   ruby-1.9.2-p180   15.19s user 0.95s system 99% cpu 16.143 total
-  ree-1.8.7-2011.03 22.81s user 1.28s system 92% cpu 25.938 total
-  ruby-1.8.7-p334   25.21s user 1.02s system 99% cpu 26.238 total
   jruby-1.5.3       32.64s user 4.84s system 99% cpu 37.629 total
   rbx-2.0.0pre      39.62s user 2.24s system 104% cpu 40.098 total
   macruby           75.00s user 20.10s system 110% cpu 1:26.13 total

data/lib/request_log_analyzer/aggregator/database_inserter.rb

@@ -39,7 +39,7 @@ module RequestLogAnalyzer::Aggregator
         
         # Fix encoding patch for 1.9.2
         attributes.each do |k,v|
-          attributes[k] = v.force_encoding("UTF-8") if v.is_a?(String) && "".respond_to?("force_encoding")
+          attributes[k] = v.force_encoding("UTF-8") if v.is_a?(String)
         end
 
         @request_object.send("#{line[:line_type]}_lines").build(attributes)

data/lib/request_log_analyzer/file_format.rb

@@ -248,7 +248,7 @@ module RequestLogAnalyzer::FileFormat
       return self.new(line_definer.line_definitions, report_definer.trackers)
     end
 
-    def initialize(line_definitions = OrderedHash.new, report_trackers = [])
+    def initialize(line_definitions = {}, report_trackers = [])
       @line_definitions, @report_trackers = line_definitions, report_trackers
     end
 

data/lib/request_log_analyzer/line_definition.rb

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

data/lib/request_log_analyzer/version.rb

@@ -1,3 +1,3 @@
 module RequestLogAnalyzer
-  VERSION = "1.12.11"
+  VERSION = "1.13.0"
 end

data/lib/request_log_analyzer.rb

@@ -1,5 +1,4 @@
 require 'date'
-require 'other/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/request-log-analyzer.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = ['README.rdoc']
 
   gem.requirements << "To use the database inserter, ActiveRecord and an appropriate database adapter are required."
+  gem.required_ruby_version = '>= 1.9.3'
+
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec', '~> 2.14')
   gem.add_development_dependency('activerecord')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request-log-analyzer
 version: !ruby/object:Gem::Version
-  version: 1.12.11
+  version: 1.13.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,7 +118,6 @@ files:
 - .travis.yml
 - DESIGN.rdoc
 - Gemfile
-- Gemfile.activerecord2
 - Gemfile.activerecord3
 - Gemfile.activerecord4
 - LICENSE
@@ -130,7 +129,6 @@ files:
 - lib/cli/database_console_init.rb
 - lib/cli/progressbar.rb
 - lib/cli/tools.rb
-- lib/other/ordered_hash.rb
 - lib/request_log_analyzer.rb
 - lib/request_log_analyzer/aggregator.rb
 - lib/request_log_analyzer/aggregator/database_inserter.rb
@@ -283,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -293,7 +291,7 @@ requirements:
 - To use the database inserter, ActiveRecord and an appropriate database adapter are
   required.
 rubyforge_project: r-l-a
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
@@ -380,3 +378,4 @@ test_files:
 - spec/unit/tracker/timespan_tracker_spec.rb
 - spec/unit/tracker/tracker_api_spec.rb
 - spec/unit/tracker/traffic_tracker_spec.rb
+has_rdoc: 

data/Gemfile.activerecord2

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 2.1'
-gem 'activerecord-mysql2-adapter', :platforms => [:ruby]
-
-platform :rbx do
-  gem 'rubysl'
-end

data/lib/other/ordered_hash.rb

@@ -1,167 +0,0 @@
-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