request-log-analyzer 1.3.5 → 1.3.6

data/spec/database.yml

@@ -1,3 +1,9 @@
+# This file determines what databases are used to test the database
+# functionality of request-log-analyzer. By default, only an SQLite3
+# memory database is enabled.
+#
+# The syntax of this file is exactly the same as Rails's database.yml.
+
 sqlite3:
   adapter: "sqlite3"
   database: ":memory:"

data/spec/unit/aggregator/database_inserter_spec.rb

@@ -66,7 +66,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
       it "should insert a record in the request table" do
         lambda { 
           @database_inserter.aggregate(@incomplete_request)
-        }.should change(@database_inserter.database.request_class, :count).from(0).to(1)
+        }.should change(RequestLogAnalyzer::Database::Request, :count).from(0).to(1)
       end
       
       it "should insert a record in the first_lines table" do
@@ -77,7 +77,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
 
       it "should insert records in all relevant line tables" do
         @database_inserter.aggregate(@completed_request)
-        request = @database_inserter.database.request_class.first
+        request = RequestLogAnalyzer::Database::Request.first
         request.should have(2).test_lines
         request.should have(1).first_lines
         request.should have(1).eval_lines
@@ -85,7 +85,7 @@ describe RequestLogAnalyzer::Aggregator::DatabaseInserter do
       end
 
       it "should log a warning in the warnings table" do
-        @database_inserter.database.warning_class.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
+        RequestLogAnalyzer::Database::Warning.should_receive(:create!).with(hash_including(:warning_type => 'test_warning'))
         @database_inserter.warning(:test_warning, "Testing the warning system", 12)
       end
     end

data/spec/unit/database/base_class_spec.rb

@@ -15,16 +15,13 @@ describe RequestLogAnalyzer::Database::Base do
       @orm_class.stub!(:belongs_to)
       @orm_class.stub!(:serialize)
       @orm_class.stub!(:line_definition=)
+      
       Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@orm_class)
       
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)      
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)
       
       @database = mock_database
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
       RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
     end
 
@@ -49,12 +46,12 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set a :has_many relationship in the request class" do
-      @request_class.should_receive(:has_many).with(:test_lines)
+      RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:test_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
     it "should set a :has_many relationship in the source class" do
-      @source_class.should_receive(:has_many).with(:test_lines)
+      RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:test_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
@@ -73,14 +70,10 @@ describe RequestLogAnalyzer::Database::Base do
   describe '.subclass_from_table' do
     before(:each) do
       
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)      
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)      
       
       @database = mock_database
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
       @database.connection.stub!(:table_exists?).and_return(true)
       RequestLogAnalyzer::Database::Base.stub!(:database).and_return(@database)
       
@@ -107,7 +100,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
     
     it "should create the :has_many relation in the request class" do
-      @request_class.should_receive(:has_many).with(:completed_lines)
+      RequestLogAnalyzer::Database::Request.should_receive(:has_many).with(:completed_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 
@@ -117,7 +110,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
     
     it "should create the :has_many relation in the request class" do
-      @source_class.should_receive(:has_many).with(:completed_lines)
+      RequestLogAnalyzer::Database::Source.should_receive(:has_many).with(:completed_lines)
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 

data/spec/unit/database/database_spec.rb

@@ -15,11 +15,11 @@ describe RequestLogAnalyzer::Database do
       # FileFormat-agnostic classes
       default_orm_class_names.each do |const|
         it "should create the default #{const} constant" do
-          Object.const_defined?(const).should be_true
+          RequestLogAnalyzer::Database.const_defined?(const).should be_true
         end
 
         it "should create the default #{const} class inheriting from ActiveRecord::Base and RequestLogAnalyzer::Database::Base" do
-          Object.const_get(const).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
+          RequestLogAnalyzer::Database.const_get(const).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
         end
       end
     
@@ -38,8 +38,8 @@ describe RequestLogAnalyzer::Database do
         end
         
         it "should create a :has_many relation from the Request and Source class to the #{const} class" do
-          @database.request_class.send(:reflections).should include(const.underscore.pluralize.to_sym)
-          @database.source_class.send(:reflections).should include(const.underscore.pluralize.to_sym)
+          RequestLogAnalyzer::Database::Request.send(:reflections).should include(const.underscore.pluralize.to_sym)
+          RequestLogAnalyzer::Database::Source.send(:reflections).should include(const.underscore.pluralize.to_sym)
         end
       end
     end
@@ -60,6 +60,7 @@ describe RequestLogAnalyzer::Database do
     after(:each) { @database.remove_orm_classes! }
 
     default_orm_class_names.each do |klass|
+      
       it "should create a table for the default #{klass} class" do
         @database.connection.should_receive(:create_table).with(klass.underscore.pluralize.to_sym)
         @database.send :create_database_schema!
@@ -67,7 +68,7 @@ describe RequestLogAnalyzer::Database do
 
       it "should create a #{klass} class inheriting from ActiveRecord and the base class of the ORM module" do
         @database.send :create_database_schema!
-        @database.send("#{klass.underscore}_class".to_sym).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
+        RequestLogAnalyzer::Database.const_get(klass).ancestors.should include(ActiveRecord::Base, RequestLogAnalyzer::Database::Base)
       end
     end
 
@@ -92,15 +93,9 @@ describe RequestLogAnalyzer::Database do
       @connection = mock_connection
       @database.stub!(:connection).and_return(@connection)
       
-      # Mock the request ORM class
-      @request_class = mock('Request ActiveRecord::Base class')
-      @request_class.stub!(:has_many)
-    
-      @source_class = mock('Source ActiveRecord::Base class')
-      @source_class.stub!(:has_many)
-    
-      @database.stub!(:request_class).and_return(@request_class)
-      @database.stub!(:source_class).and_return(@source_class)
+      # Mock the has_many method of the defaukt ORM classes
+      RequestLogAnalyzer::Database::Request.stub!(:has_many)
+      RequestLogAnalyzer::Database::Source.stub!(:has_many)
       
       @mock_class = Class.new(RequestLogAnalyzer::Database::Base)
       

data/spec/unit/tracker/tracker_api_spec.rb

@@ -1,49 +1,124 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe RequestLogAnalyzer::Tracker::Base, "API test" do
+describe RequestLogAnalyzer::Tracker::Base do
 
-  before(:each) do
-    @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new
+  describe 'API' do
     
-    @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source)
-    @summarizer.trackers << @tracker
-  end
-    
-  it "should receive :prepare when the summarizer is preparing" do
-    @tracker.should_receive(:prepare).once    
-    @summarizer.prepare
-  end
-  
-  it "should receieve :finalize when the summarizer is finalizing" do
-    @tracker.should_receive(:finalize).once    
-    @summarizer.finalize    
+    before(:each) do
+      @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new
+
+      @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source)
+      @summarizer.trackers << @tracker
+    end
+        
+    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
+      @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'))
+    end
+
+    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'))
+    end
+
+    it "should receive :report when the summary report is being built" do
+      @tracker.should_receive(:report).with(anything).once   
+      @summarizer.report(mock_output) 
+    end
+
+    it "should receieve :finalize when the summarizer is finalizing" do
+      @tracker.should_receive(:finalize).once
+      @summarizer.finalize
+    end
   end
   
-  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
+  describe '#should_update?' do
+    before(:each) do
+      @tracker_class = Class.new(RequestLogAnalyzer::Tracker::Base)
+    end
     
-    @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
-    @tracker.should_receive(:should_update?).twice.and_return(false)
-    @tracker.should_not_receive(:update)
+    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
+    end
     
-    @summarizer.aggregate(testing_format.request(:field => 'value1'))
-    @summarizer.aggregate(testing_format.request(:field => 'value2'))    
-  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
+    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
+    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
+    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
+    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
+    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
+    end
+
+    it "should return the value of the block if one is given to the :if option" do
+      tracker = @tracker_class.new(:if => lambda { false } )
+      tracker.should_update?(request(:field => 'anything')).should be_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 { false } )
+      tracker.should_update?(request(:field => 'anything')).should be_true
+    end
+
+    it "should return false if any of the checks fail" do
+      tracker = @tracker_class.new(:if => :field, :unless => lambda { false }, :line_type => :not_present )
+      tracker.should_update?(request(:line_type => :present, :field => 'anything')).should be_false
+    end
+
+    it "should return true if all of the checks succeed" do
+      tracker = @tracker_class.new(:if => :field, :unless => lambda { false }, :line_type => :present )
+      tracker.should_update?(request(:line_type => :present, :field => 'anything')).should be_true
+    end
+
   
-  it "should receive :report when the summary report is being built" do
-    @tracker.should_receive(:report).with(anything).once   
-    @summarizer.report(mock_output) 
   end
   
-  it "should receive :to_yaml object when finalizing" do
-    @summarizer.options[:dump] = temp_output_file(:dump)
-    @tracker.should_receive(:to_yaml_object).once
-    @summarizer.to_yaml
+  describe '#to_yaml_object' do
+    
+    before(:each) do
+      @tracker    = Class.new(RequestLogAnalyzer::Tracker::Base).new
+
+      @summarizer = RequestLogAnalyzer::Aggregator::Summarizer.new(mock_source)
+      @summarizer.trackers << @tracker
+    end
+        
+    it "should receive :to_yaml object when finalizing" do
+      @summarizer.options[:dump] = temp_output_file(:dump)
+      @tracker.should_receive(:to_yaml_object).once
+      @summarizer.to_yaml
+    end
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +02:00
+date: 2009-09-20 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,10 +45,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - spec/unit/filter/anonymize_filter_spec.rb
+- spec/fixtures/rails_22_cached.log
 - lib/request_log_analyzer/line_definition.rb
 - lib/request_log_analyzer/output/html.rb
 - lib/request_log_analyzer/controller.rb
-- spec/fixtures/rails_22_cached.log
 - spec/lib/macros.rb
 - lib/request_log_analyzer/file_format/rails_development.rb
 - spec/fixtures/apache_combined.log
@@ -86,6 +86,7 @@ files:
 - lib/cli/progressbar.rb
 - lib/request_log_analyzer/mailer.rb
 - README.rdoc
+- lib/request_log_analyzer/database/warning.rb
 - spec/fixtures/merb.log
 - lib/request_log_analyzer/tracker/hourly_spread.rb
 - .gitignore
@@ -104,6 +105,7 @@ files:
 - lib/request_log_analyzer/aggregator/database_inserter.rb
 - lib/request_log_analyzer/aggregator/summarizer.rb
 - lib/request_log_analyzer/file_format/rack.rb
+- lib/request_log_analyzer/database/source.rb
 - lib/request_log_analyzer/file_format/rails.rb
 - spec/fixtures/decompression.tar.gz
 - spec/unit/tracker/traffic_tracker_spec.rb
@@ -127,10 +129,10 @@ files:
 - spec/unit/controller/controller_spec.rb
 - spec/lib/mocks.rb
 - spec/lib/helpers.rb
+- spec/fixtures/rails_1x.log
 - lib/cli/database_console_init.rb
 - lib/request_log_analyzer/output.rb
 - lib/request_log_analyzer/file_format/apache.rb
-- spec/fixtures/rails_1x.log
 - spec/fixtures/decompression.log.zip
 - spec/unit/source/request_spec.rb
 - spec/unit/source/log_parser_spec.rb
@@ -143,6 +145,7 @@ files:
 - spec/unit/aggregator/summarizer_spec.rb
 - spec/fixtures/syslog_1x.log
 - spec/fixtures/rails_22.log
+- lib/request_log_analyzer/database/request.rb
 - spec/fixtures/multiple_files_2.log
 - LICENSE
 - lib/request_log_analyzer/source/database_loader.rb