bullet 4.4.0 → 4.5.0

data/spec/integration/rails2/{counter_spec.rb → counter_cache_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if active_record2?
-  describe Bullet::Detector::Counter do
+  describe Bullet::Detector::CounterCache do
     before(:each) do
       Bullet.start_request
     end
@@ -35,5 +35,17 @@ if active_record2?
       end
       Bullet.collected_counter_cache_notifications.should be_empty
     end
+
+    context "disable" do
+      before { Bullet.counter_cache_enable = false }
+      after { Bullet.counter_cache_enable = true }
+
+      it "should not detect counter cache" do
+        Country.all.each do |country|
+          country.cities.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).to be_empty
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
@@ -36,6 +36,7 @@ files:
 - .rvmrc
 - .rvmrc.example
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.rails-2.3.17
 - Gemfile.rails-3.0.20
@@ -43,9 +44,9 @@ files:
 - Gemfile.rails-3.2.12
 - Gemfile.rails-4-beta
 - Guardfile
-- Hacking.textile
+- Hacking.md
 - MIT-LICENSE
-- README.textile
+- README.md
 - README_for_rails2.textile
 - Rakefile
 - bullet.gemspec
@@ -59,9 +60,9 @@ files:
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
 - lib/bullet/detector/base.rb
-- lib/bullet/detector/counter.rb
+- lib/bullet/detector/counter_cache.rb
 - lib/bullet/detector/n_plus_one_query.rb
-- lib/bullet/detector/unused_eager_association.rb
+- lib/bullet/detector/unused_eager_loading.rb
 - lib/bullet/ext/object.rb
 - lib/bullet/ext/string.rb
 - lib/bullet/mongoid2x.rb
@@ -82,9 +83,9 @@ files:
 - rails/init.rb
 - spec/bullet/detector/association_spec.rb
 - spec/bullet/detector/base_spec.rb
-- spec/bullet/detector/counter_spec.rb
+- spec/bullet/detector/counter_cache_spec.rb
 - spec/bullet/detector/n_plus_one_query_spec.rb
-- spec/bullet/detector/unused_eager_association_spec.rb
+- spec/bullet/detector/unused_eager_loading_spec.rb
 - spec/bullet/ext/object_spec.rb
 - spec/bullet/ext/string_spec.rb
 - spec/bullet/notification/base_spec.rb
@@ -97,10 +98,10 @@ files:
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
 - spec/integration/association_spec.rb
-- spec/integration/counter_spec.rb
+- spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/integration/rails2/association_spec.rb
-- spec/integration/rails2/counter_spec.rb
+- spec/integration/rails2/counter_cache_spec.rb
 - spec/models/address.rb
 - spec/models/author.rb
 - spec/models/base_user.rb
@@ -165,9 +166,9 @@ summary: A rails plugin to kill N+1 queries and unused eager loading.
 test_files:
 - spec/bullet/detector/association_spec.rb
 - spec/bullet/detector/base_spec.rb
-- spec/bullet/detector/counter_spec.rb
+- spec/bullet/detector/counter_cache_spec.rb
 - spec/bullet/detector/n_plus_one_query_spec.rb
-- spec/bullet/detector/unused_eager_association_spec.rb
+- spec/bullet/detector/unused_eager_loading_spec.rb
 - spec/bullet/ext/object_spec.rb
 - spec/bullet/ext/string_spec.rb
 - spec/bullet/notification/base_spec.rb
@@ -180,10 +181,10 @@ test_files:
 - spec/bullet/registry/base_spec.rb
 - spec/bullet/registry/object_spec.rb
 - spec/integration/association_spec.rb
-- spec/integration/counter_spec.rb
+- spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/integration/rails2/association_spec.rb
-- spec/integration/rails2/counter_spec.rb
+- spec/integration/rails2/counter_cache_spec.rb
 - spec/models/address.rb
 - spec/models/author.rb
 - spec/models/base_user.rb

data/spec/bullet/detector/counter_spec.rb

@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-module Bullet
-  module Detector
-    describe Counter do
-      before :all do
-        @post1 = Post.first
-        @post2 = Post.last
-      end
-      before(:each) { Counter.clear }
-
-      context ".clear" do
-        it "should clear all class variables" do
-          Counter.class_variable_get(:@@possible_objects).should be_nil
-          Counter.class_variable_get(:@@impossible_objects).should be_nil
-        end
-      end
-
-      context ".add_counter_cache" do
-        it "should create notification if conditions met" do
-          Counter.should_receive(:conditions_met?).with(@post1.bullet_ar_key, [:comments]).and_return(true)
-          Counter.should_receive(:create_notification).with("Post", [:comments])
-          Counter.add_counter_cache(@post1, [:comments])
-        end
-
-        it "should not create notification if conditions not met" do
-          Counter.should_receive(:conditions_met?).with(@post1.bullet_ar_key, [:comments]).and_return(false)
-          Counter.should_receive(:create_notification).never
-          Counter.add_counter_cache(@post1, [:comments])
-        end
-      end
-
-      context ".add_possible_objects" do
-        it "should add possible objects" do
-          Counter.add_possible_objects([@post1, @post2])
-          Counter.send(:possible_objects).should be_include(@post1.bullet_ar_key)
-          Counter.send(:possible_objects).should be_include(@post2.bullet_ar_key)
-        end
-
-        it "should add impossible object" do
-          Counter.add_impossible_object(@post1)
-          Counter.send(:impossible_objects).should be_include(@post1.bullet_ar_key)
-        end
-      end
-
-      context ".conditions_met?" do
-        it "should be true when object is possible, not impossible" do
-          Counter.add_possible_objects(@post1)
-          Counter.send(:conditions_met?, @post1.bullet_ar_key, :associations).should be_true
-        end
-
-        it "should be false when object is not possible" do
-          Counter.send(:conditions_met?, @post1.bullet_ar_key, :associations).should be_false
-        end
-
-        it "should be true when object is possible, and impossible" do
-          Counter.add_possible_objects(@post1)
-          Counter.add_impossible_object(@post1)
-          Counter.send(:conditions_met?, @post1.bullet_ar_key, :associations).should be_false
-        end
-      end
-    end
-  end
-end

data/spec/bullet/detector/unused_eager_association_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-module Bullet
-  module Detector
-    describe UnusedEagerAssociation do
-      before(:all) { @post = Post.first }
-      before(:each) { UnusedEagerAssociation.clear }
-
-      context ".call_associations" do
-        it "should get empty array if eager_loadgins" do
-          UnusedEagerAssociation.send(:call_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
-        end
-
-        it "should get call associations if object and association are both in eager_loadings and call_object_associations" do
-          UnusedEagerAssociation.add_eager_loadings([@post], :association)
-          UnusedEagerAssociation.add_call_object_associations(@post, :association)
-          UnusedEagerAssociation.send(:call_associations, @post.bullet_ar_key, Set.new([:association])).should == [:association]
-        end
-
-        it "should not get call associations if not exist in call_object_associations" do
-          UnusedEagerAssociation.add_eager_loadings([@post], :association)
-          UnusedEagerAssociation.send(:call_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
-        end
-      end
-
-      context ".diff_object_associations" do
-        it "should return associations not exist in call_association" do
-          UnusedEagerAssociation.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association])).should == [:association]
-        end
-
-        it "should return empty if associations exist in call_association" do
-          UnusedEagerAssociation.add_eager_loadings([@post], :association)
-          UnusedEagerAssociation.add_call_object_associations(@post, :association)
-          UnusedEagerAssociation.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
-        end
-      end
-
-      context ".check_unused_preload_associations" do
-        it "should set @@checked to true" do
-          UnusedEagerAssociation.check_unused_preload_associations
-          UnusedEagerAssociation.class_variable_get(:@@checked).should be_true
-        end
-
-        it "should create notification if object_association_diff is not empty" do
-          UnusedEagerAssociation.add_object_associations(@post, :association)
-          UnusedEagerAssociation.should_receive(:create_notification).with("Post", [:association])
-          UnusedEagerAssociation.check_unused_preload_associations
-        end
-
-        it "should not create notification if object_association_diff is empty" do
-          UnusedEagerAssociation.clear
-          UnusedEagerAssociation.add_object_associations(@post, :association)
-          UnusedEagerAssociation.add_eager_loadings([@post], :association)
-          UnusedEagerAssociation.add_call_object_associations(@post, :association)
-          UnusedEagerAssociation.send(:diff_object_associations, @post.bullet_ar_key, Set.new([:association])).should be_empty
-          UnusedEagerAssociation.should_not_receive(:create_notification).with("Post", [:association])
-          UnusedEagerAssociation.check_unused_preload_associations
-        end
-      end
-    end
-  end
-end