bullet 4.14.3 → 5.0.0

data/spec/integration/counter_cache_spec.rb

@@ -29,6 +29,22 @@ if !mongoid? && active_record?
       expect(Bullet.collected_counter_cache_notifications).to be_empty
     end
 
+    if active_record5?
+      it "should not need counter cache for has_many through" do
+        Client.all.each do |client|
+          client.firms.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).to be_empty
+      end
+    else
+      it "should need counter cache for has_many through" do
+        Client.all.each do |client|
+          client.firms.size
+        end
+        expect(Bullet.collected_counter_cache_notifications).not_to be_empty
+      end
+    end
+
     it "should not need counter cache with part of cities" do
       Country.all.each do |country|
         country.cities.where(:name => 'first').size
@@ -50,7 +66,7 @@ if !mongoid? && active_record?
 
     context "whitelist" do
       before { Bullet.add_whitelist :type => :counter_cache, :class_name => "Country", :association => :cities }
-      after { Bullet.reset_whitelist }
+      after { Bullet.clear_whitelist }
 
       it "should not detect counter cache" do
         Country.all.each do |country|

data/spec/spec_helper.rb

@@ -58,6 +58,7 @@ if active_record?
 
     config.before(:example) do
       Bullet.start_request
+      Bullet.enable = true
     end
 
     config.after(:example) do

data/spec/support/mongo_seed.rb

@@ -52,6 +52,19 @@ module Support
             }
           )
         end
+      elsif Mongoid::VERSION =~ /\A5/
+        Mongoid.configure do |config|
+          config.load_configuration(
+              clients: {
+                  default: {
+                      database: "bullet",
+                      hosts: [ "localhost:27017" ]
+                  }
+              }
+          )
+        end
+        # Increase the level from DEBUG in order to avoid excessive logging to the screen
+        Mongo::Logger.logger.level = Logger::WARN
       end
     end
 

data/test.sh

@@ -6,6 +6,7 @@ BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle && BUNDLE_GEMFILE=Gemfile.rails-4.0 bund
 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-5.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle exec rspec spec
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle && BUNDLE_GEMFILE=Gemfile.mongoid-4.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

data/update.sh

@@ -4,6 +4,7 @@ BUNDLE_GEMFILE=Gemfile.rails-4.0 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-3.2 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-3.1 bundle update
 BUNDLE_GEMFILE=Gemfile.rails-3.0 bundle update
+BUNDLE_GEMFILE=Gemfile.mongoid-5.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-4.0 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-3.1 bundle update
 BUNDLE_GEMFILE=Gemfile.mongoid-3.0 bundle update

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.14.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: uniform_notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 description: help to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -59,12 +59,14 @@ files:
 - Gemfile.mongoid-3.0
 - Gemfile.mongoid-3.1
 - Gemfile.mongoid-4.0
+- Gemfile.mongoid-5.0
 - Gemfile.rails-3.0
 - Gemfile.rails-3.1
 - Gemfile.rails-3.2
 - Gemfile.rails-4.0
 - Gemfile.rails-4.1
 - Gemfile.rails-4.2
+- Gemfile.rails-5.0
 - Guardfile
 - Hacking.md
 - MIT-LICENSE
@@ -77,6 +79,7 @@ files:
 - lib/bullet/active_record4.rb
 - lib/bullet/active_record41.rb
 - lib/bullet/active_record42.rb
+- lib/bullet/active_record5.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -89,6 +92,7 @@ files:
 - lib/bullet/mongoid2x.rb
 - lib/bullet/mongoid3x.rb
 - lib/bullet/mongoid4x.rb
+- lib/bullet/mongoid5x.rb
 - lib/bullet/notification.rb
 - lib/bullet/notification/base.rb
 - lib/bullet/notification/counter_cache.rb
@@ -122,6 +126,7 @@ files:
 - spec/bullet_spec.rb
 - spec/integration/active_record3/association_spec.rb
 - spec/integration/active_record4/association_spec.rb
+- spec/integration/active_record5/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb
@@ -184,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading.
@@ -208,6 +213,7 @@ test_files:
 - spec/bullet_spec.rb
 - spec/integration/active_record3/association_spec.rb
 - spec/integration/active_record4/association_spec.rb
+- spec/integration/active_record5/association_spec.rb
 - spec/integration/counter_cache_spec.rb
 - spec/integration/mongoid/association_spec.rb
 - spec/models/address.rb