request-log-analyzer 1.13.1 → 1.13.3

data/spec/unit/tracker/timespan_tracker_spec.rb

@@ -7,36 +7,36 @@ describe RequestLogAnalyzer::Tracker::Timespan do
     @tracker.prepare
   end
 
-  it "should set the first request timestamp correctly" do
-    @tracker.update(request(:timestamp => 20090102000000))
-    @tracker.update(request(:timestamp => 20090101000000))
-    @tracker.update(request(:timestamp => 20090103000000))
+  it 'should set the first request timestamp correctly' do
+    @tracker.update(request(timestamp: 20_090_102_000_000))
+    @tracker.update(request(timestamp: 20_090_101_000_000))
+    @tracker.update(request(timestamp: 20_090_103_000_000))
 
     @tracker.first_timestamp.should == DateTime.parse('Januari 1, 2009 00:00:00')
   end
 
-  it "should set the last request timestamp correctly" do
-    @tracker.update(request(:timestamp => 20090102000000))
-    @tracker.update(request(:timestamp => 20090101000000))
-    @tracker.update(request(:timestamp => 20090103000000))
+  it 'should set the last request timestamp correctly' do
+    @tracker.update(request(timestamp: 20_090_102_000_000))
+    @tracker.update(request(timestamp: 20_090_101_000_000))
+    @tracker.update(request(timestamp: 20_090_103_000_000))
 
     @tracker.last_timestamp.should == DateTime.parse('Januari 3, 2009 00:00:00')
   end
 
-  it "should return the correct timespan in days when multiple requests are given" do
-    @tracker.update(request(:timestamp => 20090102000000))
-    @tracker.update(request(:timestamp => 20090101000000))
-    @tracker.update(request(:timestamp => 20090103000000))
+  it 'should return the correct timespan in days when multiple requests are given' do
+    @tracker.update(request(timestamp: 20_090_102_000_000))
+    @tracker.update(request(timestamp: 20_090_101_000_000))
+    @tracker.update(request(timestamp: 20_090_103_000_000))
 
     @tracker.timespan.should == 2
   end
 
-  it "should return a timespan of 0 days when only one timestamp is set" do
-    @tracker.update(request(:timestamp => 20090103000000))
+  it 'should return a timespan of 0 days when only one timestamp is set' do
+    @tracker.update(request(timestamp: 20_090_103_000_000))
     @tracker.timespan.should == 0
   end
 
-  it "should raise an error when no timestamp is set" do
+  it 'should raise an error when no timestamp is set' do
     lambda { @tracker.timespan }.should raise_error
   end
 end
@@ -47,27 +47,27 @@ describe RequestLogAnalyzer::Tracker::Timespan, 'reporting' do
     @tracker = RequestLogAnalyzer::Tracker::Timespan.new
     @tracker.prepare
   end
-  
-  it "should have a title" do
-    @tracker.title.should_not eql("")
+
+  it 'should have a title' do
+    @tracker.title.should_not eql('')
   end
 
-  it "should generate a report without errors when no request was tracked" do
+  it 'should generate a report without errors when no request was tracked' do
     lambda { @tracker.report(mock_output) }.should_not raise_error
   end
 
-  it "should generate a report without errors when multiple requests were tracked" do
-    @tracker.update(request(:category => 'a', :timestamp => 20090102000000))
-    @tracker.update(request(:category => 'a', :timestamp => 20090101000000))
-    @tracker.update(request(:category => 'a', :timestamp => 20090103000000))
+  it 'should generate a report without errors when multiple requests were tracked' do
+    @tracker.update(request(category: 'a', timestamp: 20_090_102_000_000))
+    @tracker.update(request(category: 'a', timestamp: 20_090_101_000_000))
+    @tracker.update(request(category: 'a', timestamp: 20_090_103_000_000))
     lambda { @tracker.report(mock_output) }.should_not raise_error
   end
-  
-  it "should generate a YAML output" do
-    @tracker.update(request(:category => 'a', :timestamp => 20090102000000))
-    @tracker.update(request(:category => 'a', :timestamp => 20090101000000))
-    @tracker.update(request(:category => 'a', :timestamp => 20090103000000))
-    @tracker.to_yaml_object.should == { :first => DateTime.parse('20090101000000'), :last => DateTime.parse('20090103000000')}
+
+  it 'should generate a YAML output' do
+    @tracker.update(request(category: 'a', timestamp: 20_090_102_000_000))
+    @tracker.update(request(category: 'a', timestamp: 20_090_101_000_000))
+    @tracker.update(request(category: 'a', timestamp: 20_090_103_000_000))
+    @tracker.to_yaml_object.should == { first: DateTime.parse('20090101000000'), last: DateTime.parse('20090103000000') }
   end
-  
-end
+
+end

data/spec/unit/tracker/tracker_api_spec.rb

@@ -11,34 +11,34 @@ describe RequestLogAnalyzer::Tracker::Base do
       @summarizer.trackers << @tracker
     end
 
-    it "should receive :prepare when the summarizer is preparing" do
+    it 'should receive :prepare when the summarizer is preparing' do
       @tracker.should_receive(:prepare).once
       @summarizer.prepare
     end
 
-    it "should receive :update for every request for which should_update? returns true" do
+    it 'should receive :update for every request for which should_update? returns true' do
       @tracker.should_receive(:should_update?).twice.and_return(true)
       @tracker.should_receive(:update).twice
 
-      @summarizer.aggregate(testing_format.request(:field => 'value1'))
-      @summarizer.aggregate(testing_format.request(:field => 'value2'))
+      @summarizer.aggregate(testing_format.request(field: 'value1'))
+      @summarizer.aggregate(testing_format.request(field: 'value2'))
     end
 
-    it "should not :update for every request for which should_update? returns false" do
+    it 'should not :update for every request for which should_update? returns false' do
       @tracker.should_receive(:should_update?).twice.and_return(false)
       @tracker.should_not_receive(:update)
 
-      @summarizer.aggregate(testing_format.request(:field => 'value1'))
-      @summarizer.aggregate(testing_format.request(:field => 'value2'))
+      @summarizer.aggregate(testing_format.request(field: 'value1'))
+      @summarizer.aggregate(testing_format.request(field: 'value2'))
     end
 
-    it "should receive :report when the summary report is being built" do
+    it 'should receive :report when the summary report is being built' do
       m = mock_output
       m.should_receive(:report_tracker).with(@tracker)
       @summarizer.report(m)
     end
 
-    it "should receieve :finalize when the summarizer is finalizing" do
+    it 'should receieve :finalize when the summarizer is finalizing' do
       @tracker.should_receive(:finalize).once
       @summarizer.finalize
     end
@@ -49,62 +49,61 @@ describe RequestLogAnalyzer::Tracker::Base do
       @tracker_class = Class.new(RequestLogAnalyzer::Tracker::Base)
     end
 
-    it "should return true by default, when no checks are installed" do
+    it 'should return true by default, when no checks are installed' do
       tracker = @tracker_class.new
-      tracker.should_update?(testing_format.request).should be_true
+      tracker.should_update?(testing_format.request).should == true
     end
 
-    it "should return false if the line type is not in the request" do
-      tracker = @tracker_class.new(:line_type => :not_there)
-      tracker.should_update?(request(:line_type => :different)).should be_false
+    it 'should return false if the line type is not in the request' do
+      tracker = @tracker_class.new(line_type: :not_there)
+      tracker.should_update?(request(line_type: :different)).should == false
     end
 
-    it "should return true if the line type is in the request" do
-      tracker = @tracker_class.new(:line_type => :there)
-      tracker.should_update?(request(:line_type => :there)).should be_true
+    it 'should return true if the line type is in the request' do
+      tracker = @tracker_class.new(line_type: :there)
+      tracker.should_update?(request(line_type: :there)).should == true
     end
 
-    it "should return true if a field name is given to :if and it is in the request" do
-      tracker = @tracker_class.new(:if => :field)
-      tracker.should_update?(request(:field => 'anything')).should be_true
+    it 'should return true if a field name is given to :if and it is in the request' do
+      tracker = @tracker_class.new(if: :field)
+      tracker.should_update?(request(field: 'anything')).should == true
     end
 
-    it "should return false if a field name is given to :if and it is not the request" do
-      tracker = @tracker_class.new(:if => :field)
-      tracker.should_update?(request(:other_field => 'anything')).should be_false
+    it 'should return false if a field name is given to :if and it is not the request' do
+      tracker = @tracker_class.new(if: :field)
+      tracker.should_update?(request(other_field: 'anything')).should == false
     end
 
-    it "should return false if a field name is given to :unless and it is in the request" do
-      tracker = @tracker_class.new(:unless => :field)
-      tracker.should_update?(request(:field => 'anything')).should be_false
+    it 'should return false if a field name is given to :unless and it is in the request' do
+      tracker = @tracker_class.new(unless: :field)
+      tracker.should_update?(request(field: 'anything')).should == false
     end
 
-    it "should return true if a field name is given to :unless and it is not the request" do
-      tracker = @tracker_class.new(:unless => :field)
-      tracker.should_update?(request(:other_field => 'anything')).should be_true
+    it 'should return true if a field name is given to :unless and it is not the request' do
+      tracker = @tracker_class.new(unless: :field)
+      tracker.should_update?(request(other_field: 'anything')).should == true
     end
 
-    it "should return the value of the block if one is given to the :if option" do
-      tracker = @tracker_class.new(:if => lambda { |r| false } )
-      tracker.should_update?(request(:field => 'anything')).should be_false
+    it 'should return the value of the block if one is given to the :if option' do
+      tracker = @tracker_class.new(if: lambda { |_r| false })
+      tracker.should_update?(request(field: 'anything')).should == false
     end
 
-    it "should return the inverse value of the block if one is given to the :if option" do
-      tracker = @tracker_class.new(:unless => lambda { |r| false } )
-      tracker.should_update?(request(:field => 'anything')).should be_true
+    it 'should return the inverse value of the block if one is given to the :if option' do
+      tracker = @tracker_class.new(unless: lambda { |_r| false })
+      tracker.should_update?(request(field: 'anything')).should == true
     end
 
-    it "should return false if any of the checks fail" do
-      tracker = @tracker_class.new(:if => :field, :unless => lambda { |r| false }, :line_type => :not_present )
-      tracker.should_update?(request(:line_type => :present, :field => 'anything')).should be_false
+    it 'should return false if any of the checks fail' do
+      tracker = @tracker_class.new(if: :field, unless: lambda { |_r| false }, line_type: :not_present)
+      tracker.should_update?(request(line_type: :present, field: 'anything')).should == false
     end
 
-    it "should return true if all of the checks succeed" do
-      tracker = @tracker_class.new(:if => :field, :unless => lambda { |r| false }, :line_type => :present )
-      tracker.should_update?(request(:line_type => :present, :field => 'anything')).should be_true
+    it 'should return true if all of the checks succeed' do
+      tracker = @tracker_class.new(if: :field, unless: lambda { |_r| false }, line_type: :present)
+      tracker.should_update?(request(line_type: :present, field: 'anything')).should == true
     end
 
-
   end
 
   describe '#to_yaml_object' do
@@ -116,10 +115,10 @@ describe RequestLogAnalyzer::Tracker::Base do
       @summarizer.trackers << @tracker
     end
 
-    it "should receive :to_yaml object when finalizing" do
+    it 'should receive :to_yaml object when finalizing' do
       @summarizer.options[:yaml] = temp_output_file(:yaml)
       @tracker.should_receive(:to_yaml_object).once
       @summarizer.to_yaml
     end
   end
-end
+end

data/spec/unit/tracker/traffic_tracker_spec.rb

@@ -4,23 +4,23 @@ describe RequestLogAnalyzer::Tracker::Traffic do
 
   describe '#report' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::Traffic.new(:category => :category, :traffic => :traffic)
+      @tracker = RequestLogAnalyzer::Tracker::Traffic.new(category: :category, traffic: :traffic)
       @tracker.prepare
     end
 
-    it "should generate a report without errors when one category is present" do
-      @tracker.update(request(:category => 'a', :traffic => 2))
+    it 'should generate a report without errors when one category is present' do
+      @tracker.update(request(category: 'a', traffic: 2))
       @tracker.report(mock_output)
       lambda { @tracker.report(mock_output) }.should_not raise_error
     end
 
-    it "should generate a report without errors when no category is present" do
+    it 'should generate a report without errors when no category is present' do
       lambda { @tracker.report(mock_output) }.should_not raise_error
     end
 
-    it "should generate a report without errors when multiple categories are present" do
-      @tracker.update(request(:category => 'a', :traffic => 2))
-      @tracker.update(request(:category => 'b', :traffic => 2))
+    it 'should generate a report without errors when multiple categories are present' do
+      @tracker.update(request(category: 'a', traffic: 2))
+      @tracker.update(request(category: 'b', traffic: 2))
       lambda { @tracker.report(mock_output) }.should_not raise_error
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request-log-analyzer
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.3
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,113 +9,112 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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"
+description: |2
+      Request log analyzer's purpose is to find out how your web application is being used, how it performs and to
+      focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the
+      information. Once it is finished parsing the log file(s), it will show the requests that take op most server time
+      using various metrics. It can also insert all parsed request information into a database so you can roll your own
+      analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL
+      slow query logs out of the box, but file formats of other applications can easily be supported by supplying an
+      easy to write log file format definition.
 email:
 - willem@railsdoctors.com
 - bart@railsdoctors.com
 executables:
+- console
 - request-log-analyzer
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - DESIGN.rdoc
 - Gemfile
 - Gemfile.activerecord3
@@ -123,6 +122,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- bin/console
 - bin/request-log-analyzer
 - lib/cli/command_line_arguments.rb
 - lib/cli/database_console.rb
@@ -134,6 +134,7 @@ files:
 - 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/class_level_inheritable_attributes.rb
 - lib/request_log_analyzer/controller.rb
 - lib/request_log_analyzer/database.rb
 - lib/request_log_analyzer/database/base.rb
@@ -241,6 +242,7 @@ files:
 - 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/inheritance_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
@@ -271,29 +273,29 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - request-log-analyzer
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - To use the database inserter, ActiveRecord and an appropriate database adapter are
   required.
 rubyforge_project: r-l-a
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
@@ -358,6 +360,7 @@ test_files:
 - 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/inheritance_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