bullet 4.7.1 → 4.8.0

data/spec/integration/counter_cache_spec.rb

@@ -14,26 +14,26 @@ if active_record3? || active_record4?
       Country.all.each do |country|
         country.cities.size
       end
-      Bullet.collected_counter_cache_notifications.should_not be_empty
+      expect(Bullet.collected_counter_cache_notifications).not_to be_empty
     end
 
     it "should not need counter cache if already define counter_cache" do
       Person.all.each do |person|
         person.pets.size
       end
-      Bullet.collected_counter_cache_notifications.should be_empty
+      expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
     it "should not need counter cache with only one object" do
       Country.first.cities.size
-      Bullet.collected_counter_cache_notifications.should be_empty
+      expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
     it "should not need counter cache with part of cities" do
       Country.all.each do |country|
         country.cities.where(:name => 'first').size
       end
-      Bullet.collected_counter_cache_notifications.should be_empty
+      expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
     context "disable" do

data/spec/integration/mongoid/association_spec.rb

@@ -18,9 +18,9 @@ if mongoid?
             post.users.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
     end
@@ -32,9 +32,9 @@ if mongoid?
             post.comments.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Post, :comments)
+          expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Post, :comments)
         end
 
         it "should detect preload post => comments" do
@@ -42,25 +42,25 @@ if mongoid?
             post.comments.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect unused preload post => comments" do
           Mongoid::Post.includes(:comments).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Post, :comments)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Post, :comments)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should not detect unused preload post => comments" do
           Mongoid::Post.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
 
@@ -71,10 +71,10 @@ if mongoid?
             category.entries.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
-          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
+          expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
+          expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
         it "should detect preload with category => posts, but not with category => entries" do
@@ -83,10 +83,10 @@ if mongoid?
             category.entries.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should_not be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
-          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
+          expect(Bullet::Detector::Association).not_to be_detecting_unpreloaded_association_for(Mongoid::Category, :posts)
+          expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Category, :entries)
         end
 
         it "should detect preload with category => [posts, entries]" do
@@ -95,18 +95,18 @@ if mongoid?
             category.entries.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect unused preload with category => [posts, entries]" do
           Mongoid::Category.includes(:posts, :entries).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :posts)
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :entries)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Category, :posts)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Category, :entries)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect unused preload with category => entries, but not with category => posts" do
@@ -114,10 +114,10 @@ if mongoid?
             category.posts.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_unused_preload_associations_for(Mongoid::Category, :posts)
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Category, :entries)
+          expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Mongoid::Category, :posts)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Category, :entries)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
 
@@ -127,17 +127,17 @@ if mongoid?
             post.comments.first.name
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_unused_preload_associations_for(Mongoid::Post, :comments)
+          expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Mongoid::Post, :comments)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect preload with post => commnets" do
           Mongoid::Post.first.comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
 
@@ -147,17 +147,17 @@ if mongoid?
             post.comments.map(&:name)
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect unused preload with scope" do
           Mongoid::Post.preload_comments.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Post, :comments)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Post, :comments)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
     end
@@ -169,17 +169,17 @@ if mongoid?
             comment.post.name
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Comment, :post)
+          expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Comment, :post)
         end
 
         it "should detect preload with one comment => post" do
           Mongoid::Comment.first.post.name
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect preload with comment => post" do
@@ -187,25 +187,25 @@ if mongoid?
             comment.post.name
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should not detect preload with comment => post" do
           Mongoid::Comment.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect unused preload with comments => post" do
           Mongoid::Comment.includes(:post).map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Comment, :post)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Comment, :post)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
     end
@@ -219,9 +219,9 @@ if mongoid?
               company.address.name
             end
             Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-            Bullet::Detector::Association.should_not be_has_unused_preload_associations
+            expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-            Bullet::Detector::Association.should be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
+            expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Mongoid::Company, :address)
           end
         end
 
@@ -230,26 +230,26 @@ if mongoid?
             company.address.name
           end
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should not detect preload association" do
           Mongoid::Company.all.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+          expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
 
         it "should detect unused preload association" do
           criteria = Mongoid::Company.includes(:address)
           criteria.map(&:name)
           Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-          Bullet::Detector::Association.should be_unused_preload_associations_for(Mongoid::Company, :address)
+          expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Mongoid::Company, :address)
 
-          Bullet::Detector::Association.should be_completely_preloading_associations
+          expect(Bullet::Detector::Association).to be_completely_preloading_associations
         end
       end
     end
@@ -259,9 +259,9 @@ if mongoid?
         Mongoid::Post.all
         Mongoid::Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
-        Bullet::Detector::Association.should_not be_has_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
 
-        Bullet::Detector::Association.should be_completely_preloading_associations
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'rails'
 begin
   require 'active_record'
 rescue LoadError

data/test.sh

@@ -1,13 +1,14 @@
 #bundle update rails && bundle exec rspec spec
 #BUNDLE_GEMFILE=Gemfile.mongoid bundle update mongoid && BUNDLE_GEMFILE=Gemfile.mongoid bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-4.0.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0.1 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.2.15 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2.15 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.1.12 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1.12 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.rails-3.0.20 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.0.20 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-3.1.5 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.1.5 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-3.0.23 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.0.23 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.8.1 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.8.1 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.7.1 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.7.1 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.6.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.6.0 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.5.2 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.5.2 bundle exec rspec spec
-BUNDLE_GEMFILE=Gemfile.mongoid-2.4.12 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.4.12 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.8 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.7 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.6 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.5 bundle exec rspec spec
+BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-2.4 bundle exec rspec spec

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.8.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 description: help to kill N+1 queries and unused eager loading.
@@ -45,38 +45,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Gemfile.mongoid
-- Gemfile.mongoid-2.4.12
-- Gemfile.mongoid-2.4.12.lock
-- Gemfile.mongoid-2.5.2
-- Gemfile.mongoid-2.5.2.lock
-- Gemfile.mongoid-2.6.0
-- Gemfile.mongoid-2.6.0.lock
-- Gemfile.mongoid-2.7.1
-- Gemfile.mongoid-2.7.1.lock
-- Gemfile.mongoid-2.8.1
-- Gemfile.mongoid-2.8.1.lock
-- Gemfile.mongoid-3.0.23
-- Gemfile.mongoid-3.0.23.lock
-- Gemfile.mongoid-3.1.5
-- Gemfile.mongoid-3.1.5.lock
-- Gemfile.mongoid.lock
-- Gemfile.rails-3.0.20
-- Gemfile.rails-3.0.20.lock
-- Gemfile.rails-3.1.12
-- Gemfile.rails-3.1.12.lock
-- Gemfile.rails-3.2.15
-- Gemfile.rails-3.2.15.lock
-- Gemfile.rails-4.0.1
-- Gemfile.rails-4.0.1.lock
+- Gemfile.mongoid-2.4
+- Gemfile.mongoid-2.5
+- Gemfile.mongoid-2.6
+- Gemfile.mongoid-2.7
+- Gemfile.mongoid-2.8
+- Gemfile.mongoid-3.0
+- Gemfile.mongoid-3.1
+- Gemfile.rails-3.0
+- Gemfile.rails-3.1
+- Gemfile.rails-3.2
+- Gemfile.rails-4.0
+- Gemfile.rails-4.1
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -87,6 +73,7 @@ files:
 - lib/bullet/active_record3.rb
 - lib/bullet/active_record3x.rb
 - lib/bullet/active_record4.rb
+- lib/bullet/active_record41.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -180,17 +167,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.