request-log-analyzer 1.5.4 → 1.6.0

data/spec/unit/file_format/postgresql_format_spec.rb

@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::Postgresql do
+
+  it "should be a valid file format" do
+    RequestLogAnalyzer::FileFormat.load(:Postgresql).should be_valid
+  end
+
+  describe '#parse_line' do
+    before(:each) do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:Postgresql)
+    end
+
+    it "should parse a :query line correctly" do
+      line = '2004-05-07 11:58:36 LOG:  query: SELECT plugin_id, plugin_name FROM plugins'
+      @file_format.should parse_line(line).as(:query).and_capture(:timestamp => 20040507115836, :query_fragment => 'SELECT plugin_id, plugin_name FROM plugins')
+    end
+    
+    it "should parse a :query_fragment line correctly" do
+      line = '    groups.type_id,users.user_name,users.realname,'
+      @file_format.should parse_line(line).as(:query_fragment).and_capture(:query_fragment => "groups.type_id,users.user_name,users.realname,")
+    end
+
+    it "should parse a :duration line correctly" do
+      line = '2004-05-07 11:58:36 LOG:  duration: 0.002612 sec'
+      @file_format.should parse_line(line).as(:duration).and_capture(:query_time => 0.002612)
+    end    
+  end
+
+  describe '#parse_io' do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:postgresql))
+    end
+
+    it "should parse a multiline query entry correctly" do
+      fixture = <<EOS
+2004-05-07 11:58:22 LOG:  query: SELECT groups.group_name,groups.unix_group_name,
+		groups.type_id,users.user_name,users.realname,
+		news_bytes.forum_id,news_bytes.summary,news_bytes.post_date,news_bytes.details 
+		FROM users,news_bytes,groups 
+		WHERE news_bytes.group_id='98' AND news_bytes.is_approved <> '4' 
+		AND users.user_id=news_bytes.submitted_by 
+		AND news_bytes.group_id=groups.group_id 
+		ORDER BY post_date DESC LIMIT 10 OFFSET 0
+2004-05-07 11:58:22 LOG:  duration: 0.002680 sec
+EOS
+      @log_parser.parse_io(StringIO.new(fixture)) do |request|
+        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Postgresql::Request)
+        request[:query].should == "SELECT groups.group_name,groups.unix_group_name, groups.type_id,users.user_name,users.realname, news_bytes.forum_id,news_bytes.summary,news_bytes.post_date,news_bytes.details FROM users,news_bytes,groups WHERE news_bytes.group_id=:string AND news_bytes.is_approved <> :string AND users.user_id=news_bytes.submitted_by AND news_bytes.group_id=groups.group_id ORDER BY post_date DESC LIMIT :int OFFSET :int"
+      end
+    end
+
+    it "should parse a dualline query entry correctly" do
+      fixture = <<EOS
+      2004-05-07 11:58:36 LOG:  query: SELECT type, count FROM project_sums_agg WHERE group_id=59
+      2004-05-07 11:58:36 LOG:  duration: 0.001197 sec
+EOS
+      @log_parser.parse_io(StringIO.new(fixture)) do |request|
+        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Postgresql::Request)
+        request[:query].should == "SELECT type, count FROM project_sums_agg WHERE group_id=:int"
+      end
+    end
+  end
+end
+

data/spec/unit/file_format/rails_format_spec.rb

@@ -80,11 +80,17 @@ describe RequestLogAnalyzer::FileFormat::Rails do
           @rails.should parse_line(line).as(:failure).and_capture(:error => 'NoMethodError', :message => "undefined method `update_domain_account' for nil:NilClass")
         end
 
-        it "should parse a :cache_hit line correctly" do
-          line = prefix + 'Filter chain halted as [#<ActionController::Caching::Actions::ActionCacheFilter:0x2a999ad620 @check=nil, @options={:store_options=>{}, :layout=>nil, :cache_path=>#<Proc:0x0000002a999b8890@/app/controllers/cached_controller.rb:8>}>] rendered_or_redirected.'
+        it "should parse a :cache_hit line correctly with an filter instance reference" do
+          line = prefix + 'Filter chain halted as [#<ActionController::Filters::AroundFilter:0x2a999ad120 @identifier=nil, @kind=:filter, @options={:only=>#<Set: {"cached"}>, :if=>:not_logged_in?, :unless=>nil}, @method=#<ActionController::Caching::Actions::ActionCacheFilter:0x2a999ad620 @check=nil, @options={:store_options=>{}, :layout=>nil, :cache_path=>#<Proc:0x0000002a999b8890@/app/controllers/cached_controller.rb:8>}>>] did_not_yield.'
           @rails.should parse_line(line).as(:cache_hit)
         end
 
+        it "should parse a :cache_hit line correctly with an proc instance reference" do
+          line = prefix + 'Filter chain halted as [#<ActionController::Filters::AroundFilter:0x2a9a923e38 @method=#<Proc:0x0000002a9818b3f8@/usr/local/lib/ruby/gems/1.8/gems/actionpack-2.3.5/lib/action_controller/caching/actions.rb:64>, @kind=:filter, @identifier=nil, @options={:unless=>nil, :if=>nil, :only=>#<Set: {"show"}>}>] did_not_yield.'          
+          @rails.should parse_line(line).as(:cache_hit)
+        end
+
+
         it "should parse a :parameters line correctly" do
           line = prefix + '  Parameters: {"action"=>"cached", "controller"=>"cached"}'
           @rails.should parse_line(line).as(:parameters).and_capture(:params => {:action => 'cached', :controller => 'cached'})

data/tasks/github-gem.rake

@@ -124,7 +124,7 @@ module GithubGem
         desc "Perform all checks that would occur before a release"
         task(:release_checks => checks)
 
-        release_tasks = [:release_checks, :set_version, :build, :github_release]
+        release_tasks = [:release_checks, :set_version, :build, :github_release, :gemcutter_release]
         release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
 
         desc "Release a new verison of the gem"
@@ -132,6 +132,7 @@ module GithubGem
 
         task(:check_rubyforge)   { check_rubyforge_task }
         task(:rubyforge_release) { rubyforge_release_task }
+        task(:gemcutter_release) { gemcutter_release_task }
         task(:github_release => [:commit_modified_files, :tag_version]) { github_release_task }
         task(:tag_version) { tag_version_task }
         task(:commit_modified_files) { commit_modified_files_task }
@@ -228,6 +229,10 @@ module GithubGem
     def rubyforge_release_task
       sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
+    
+    def gemcutter_release_task
+      sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+    end
 
     # Gem release task.
     # All work is done by the task's dependencies, so just display a release completed message.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +01:00
+date: 2010-01-08 00:00:00 +01:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,10 +74,10 @@ files:
 - lib/request_log_analyzer/filter.rb
 - spec/integration/scout_spec.rb
 - spec/fixtures/test_file_format.log
+- spec/unit/filter/timespan_filter_spec.rb
 - lib/request_log_analyzer/tracker/traffic.rb
 - spec/unit/file_format/merb_format_spec.rb
 - spec/unit/file_format/format_autodetection_spec.rb
-- spec/unit/filter/timespan_filter_spec.rb
 - spec/unit/file_format/file_format_api_spec.rb
 - lib/request_log_analyzer/filter/field.rb
 - lib/request_log_analyzer/file_format/merb.rb
@@ -87,6 +87,7 @@ files:
 - spec/integration/mailer_spec.rb
 - lib/request_log_analyzer/line_definition.rb
 - spec/unit/tracker/frequency_tracker_spec.rb
+- spec/fixtures/postgresql.log
 - spec/fixtures/multiple_files_2.log
 - spec/lib/mocks.rb
 - spec/unit/file_format/apache_format_spec.rb
@@ -107,10 +108,10 @@ files:
 - lib/request_log_analyzer/file_format/rack.rb
 - lib/request_log_analyzer/tracker/numeric_value.rb
 - spec/fixtures/test_language_combined.log
+- spec/unit/request_spec.rb
 - lib/cli/command_line_arguments.rb
 - lib/request_log_analyzer.rb
 - spec/database.yml
-- spec/unit/request_spec.rb
 - lib/request_log_analyzer/database/base.rb
 - spec/unit/aggregator/database_inserter_spec.rb
 - lib/request_log_analyzer/database/request.rb
@@ -123,6 +124,7 @@ files:
 - spec/unit/tracker/duration_tracker_spec.rb
 - spec/fixtures/rails_22_cached.log
 - lib/request_log_analyzer/aggregator/summarizer.rb
+- spec/unit/file_format/postgresql_format_spec.rb
 - spec/unit/file_format/common_regular_expressions_spec.rb
 - spec/fixtures/rails_1x.log
 - lib/request_log_analyzer/file_format/delayed_job.rb
@@ -132,13 +134,14 @@ files:
 - spec/unit/file_format/mysql_format_spec.rb
 - request-log-analyzer.gemspec
 - spec/fixtures/apache_common.log
+- spec/unit/mailer_spec.rb
 - lib/request_log_analyzer/file_format/rails.rb
 - Rakefile
-- spec/unit/mailer_spec.rb
 - lib/request_log_analyzer/tracker/hourly_spread.rb
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/unit/tracker/traffic_tracker_spec.rb
 - spec/unit/tracker/numeric_value_tracker_spec.rb
+- lib/request_log_analyzer/file_format/postgresql.rb
 - lib/request_log_analyzer/tracker/timespan.rb
 - spec/unit/controller/log_processor_spec.rb
 - spec/fixtures/sinatra.log
@@ -209,9 +212,9 @@ test_files:
 - spec/unit/filter/filter_spec.rb
 - spec/unit/database/connection_spec.rb
 - spec/integration/scout_spec.rb
+- spec/unit/filter/timespan_filter_spec.rb
 - spec/unit/file_format/merb_format_spec.rb
 - spec/unit/file_format/format_autodetection_spec.rb
-- spec/unit/filter/timespan_filter_spec.rb
 - spec/unit/file_format/file_format_api_spec.rb
 - spec/integration/mailer_spec.rb
 - spec/unit/tracker/frequency_tracker_spec.rb
@@ -225,6 +228,7 @@ test_files:
 - spec/unit/aggregator/database_inserter_spec.rb
 - spec/unit/filter/anonymize_filter_spec.rb
 - spec/unit/tracker/duration_tracker_spec.rb
+- spec/unit/file_format/postgresql_format_spec.rb
 - spec/unit/file_format/common_regular_expressions_spec.rb
 - spec/unit/file_format/line_definition_spec.rb
 - spec/unit/file_format/mysql_format_spec.rb