request-log-analyzer 1.9.3 → 1.9.4

data/lib/request_log_analyzer.rb

@@ -13,7 +13,7 @@ module RequestLogAnalyzer
 
   # The current version of request-log-analyzer.
   # Do not change the value by hand; it will be updated automatically by the gem release script.
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 
 
   autoload :Controller,     'request_log_analyzer/controller'

data/lib/request_log_analyzer/file_format/rails.rb

@@ -82,8 +82,8 @@ module RequestLogAnalyzer::FileFormat
 
     # Rails > 2.1 completed line example
     # 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.+)\]/
-
+    RAILS_22_COMPLETED = /Completed in (\d+)ms \((?:View: (\d+))?,?(?:.?DB: (\d+))?\)? \| (\d{3}).+\[(http.+)\]/
+                        
     # A hash of definitions for all common lines in Rails logs.
     LINE_DEFINITIONS = {
       :processing => RequestLogAnalyzer::LineDefinition.new(:processing, :header => true,

data/lib/request_log_analyzer/file_format/rails3.rb

@@ -36,8 +36,8 @@ module RequestLogAnalyzer::FileFormat
     line_definition :completed do |line|
       line.footer = true
       line.teaser = /Completed /
-      line.regexp = /Completed (\d+)? .*in (\d+)ms(?:[^(]*\(Views: ((?:\d|\.)+)ms .* ActiveRecord: ((?:\d|\.)+)ms\))?/
-
+      line.regexp = /Completed (\d+)? .*in (\d+(?:\.\d+)?)ms(?:[^\(]*\(Views: (\d+(?:\.\d+)?)ms .* ActiveRecord: (\d+(?:\.\d+)?)ms\))?/
+      
       line.capture(:status).as(:integer)
       line.capture(:duration).as(:duration, :unit => :msec)
       line.capture(:view).as(:duration, :unit => :msec)

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.9.3"
-  s.date    = "2010-10-04"
+  s.version = "1.9.4"
+  s.date    = "2010-10-14"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.requirements << "To use the database inserter, ActiveRecord and an appropriate database adapter are required."
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', '~> 2.0')
 
   s.add_development_dependency('activerecord')
   s.add_development_dependency('sqlite3-ruby')

data/spec/lib/helpers.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Helpers
+module RequestLogAnalyzer::RSpec::Helpers
 
   # Create or return a new TestingFormat
   def testing_format

data/spec/lib/macros.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Macros
+module RequestLogAnalyzer::RSpec::Macros
 
   def test_databases
     require 'yaml'

data/spec/lib/matchers.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Matchers
+module RequestLogAnalyzer::RSpec::Matchers
 
   class HasLineDefinition
 

data/spec/lib/mocks.rb

@@ -1,4 +1,4 @@
-module RequestLogAnalyzer::Spec::Mocks
+module RequestLogAnalyzer::RSpec::Mocks
 
   def mock_source
     source = mock('RequestLogAnalyzer::Source::Base')

data/spec/spec_helper.rb

@@ -1,11 +1,10 @@
-$:.reject! { |e| e.include? 'TextMate' }
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'spec/autorun'
+require 'rspec'
 require 'request_log_analyzer'
 
-module RequestLogAnalyzer::Spec
+module RequestLogAnalyzer::RSpec
 end
 
 # Include all files in the spec_helper directory
@@ -15,10 +14,10 @@ end
 
 Dir.mkdir("#{File.dirname(__FILE__)}/../tmp") unless File.exist?("#{File.dirname(__FILE__)}/../tmp")
 
-Spec::Runner.configure do |config|
-  config.include RequestLogAnalyzer::Spec::Matchers
-  config.include RequestLogAnalyzer::Spec::Mocks
-  config.include RequestLogAnalyzer::Spec::Helpers
+RSpec.configure do |config|
+  config.include RequestLogAnalyzer::RSpec::Matchers
+  config.include RequestLogAnalyzer::RSpec::Mocks
+  config.include RequestLogAnalyzer::RSpec::Helpers
 
-  config.extend RequestLogAnalyzer::Spec::Macros
+  config.extend RequestLogAnalyzer::RSpec::Macros
 end

data/spec/unit/file_format/rails3_format_spec.rb

@@ -32,6 +32,12 @@ describe RequestLogAnalyzer::FileFormat::Rails do
       @file_format.should parse_line(line).as(:completed).and_capture(
           :duration => 0.170, :status => 200)
     end
+    
+    it "should parse :completed lines correctly when ActiveRecord is not mentioned" do
+      line = 'Completed 200 OK in 364ms (Views: 31.4ms)'
+      @file_format.should parse_line(line).as(:completed).and_capture(:duration => 0.364, :status => 200)
+    end
+    
 
     it "should pase :failure lines correctly" do
       line = "ActionView::Template::Error (undefined local variable or method `field' for #<Class>) on line #3 of /Users/willem/Code/warehouse/app/views/queries/execute.csv.erb:"

data/spec/unit/file_format/rails_format_spec.rb

@@ -79,6 +79,11 @@ describe RequestLogAnalyzer::FileFormat::Rails do
           line = prefix + 'Completed in 597ms (View: 298 | 200 OK [http://shapado.com]'
           @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.597, :db => nil, :view => 0.298, :status => 200, :url => 'http://shapado.com')
         end
+        
+        it "should parse a Rails 2.2 style :completed line without view" do
+          line = prefix + "Completed in 148ms (DB: 0) | 302 Found [http://iwp-sod.hargray.org/login]"
+          @rails.should parse_line(line).as(:completed).and_capture(:duration => 0.148, :db => 0.0, :view => nil, :status => 302, :url => 'http://iwp-sod.hargray.org/login')
+        end
 
         it "should parse a :failure line with exception correctly" do
           line = prefix + "NoMethodError (undefined method `update_domain_account' for nil:NilClass):"

data/tasks/github-gem.rake

@@ -71,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end
@@ -271,8 +271,7 @@ module GithubGem
     # All work is done by the task's dependencies, so just display a release completed message.
     def release_task
       puts
-      puts '------------------------------------------------------------'
-      puts "Released #{gemspec.name} version #{gemspec.version}"
+      puts "Release successful."
     end
 
     private
@@ -332,6 +331,9 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
+        
+        # Also mark the Gemfile.lock file as changed because of the new version.
+        modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  hash: 53
   prerelease: false
   segments: 
   - 1
   - 9
-  - 3
-  version: 1.9.3
+  - 4
+  version: 1.9.4
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,12 +37,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,7 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,7 +66,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -243,7 +239,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -252,7 +247,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"