bullet 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3527225d3f424d77fe6d66b89d79051ef971dd
-  data.tar.gz: 253640c4c6ef128c0f6959b31fae2bb202d9fc3e
+  metadata.gz: 1ecb17e9a4a015f9ff8895fc39a7ed2bd3a5e600
+  data.tar.gz: a624e5f8bc8d40f8bf49eab595725ce2de0076c4
 SHA512:
-  metadata.gz: 253164c19bb419669f1623eb724e33573a807c5a1998f78fefbdbaf5e5c69903dd3d296a17b4a1e99628b8ed1a83b635b612b46fb62ed735950e317bf6d1b93e
-  data.tar.gz: 419bb1cabd21aff3faf417718b7d48f01b55cab86d8c2fd974fd52e471074dd3062d2bc4c2a4530ffd250e35e716b6592c61187556ec184f1999937d680e4cfe
+  metadata.gz: e05204d7d248ac6888897a4235b716c4c74dbf793083f1aec5a693d88d1250ab6c12854967e93096c667e7a73b9bf54cc10799fd8428c7a67d7bc1672db288a4
+  data.tar.gz: 4bfdcde512f2583b6285663722c526972d7263aaeffc62173f651feaca77384c9a98678518286789fe79b3923393e7bf8e76bb33b7438df4c4033ff0c08206a8

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0
 gemfile:
   - Gemfile
   - Gemfile.rails-4-beta
-  - Gemfile.rails-3.1.5
-  - Gemfile.rails-3.0.13
-  - Gemfile.rails-2.3.14
+  - Gemfile.rails-3.2.12
+  - Gemfile.rails-3.1.11
+  - Gemfile.rails-3.0.20
 env: DB=sqlite
 services: mongodb
 before_install:

data/lib/bullet/active_record3x.rb

@@ -23,8 +23,8 @@ module Bullet
         # include query for one to many associations.
         # keep this eager loadings.
         alias_method :origin_initialize, :initialize
-        def initialize(records, associations, preload_options = {})
-          origin_initialize(records, associations, preload_options)
+        def initialize(records, associations, preload_scope = nil)
+          origin_initialize(records, associations, preload_scope)
           records = [records].flatten.compact.uniq
           return if records.empty?
           records.each do |record|
@@ -39,7 +39,7 @@ module Bullet
         alias_method :origin_find_with_associations, :find_with_associations
         def find_with_associations
           records = origin_find_with_associations
-          associations = (@eager_load_values + @includes_values).uniq
+          associations = (eager_load_values + includes_values).uniq
           records.each do |record|
             Bullet::Detector::Association.add_object_associations(record, associations)
             Bullet::Detector::NPlusOneQuery.call_association(record, associations)

data/lib/bullet/active_record4.rb

@@ -0,0 +1,94 @@
+module Bullet
+  module ActiveRecord
+    def self.enable
+      require 'active_record'
+      ::ActiveRecord::Relation.class_eval do
+        alias_method :origin_to_a, :to_a
+        # if select a collection of objects, then these objects have possible to cause N+1 query.
+        # if select only one object, then the only one object has impossible to cause N+1 query.
+        def to_a
+          records = origin_to_a
+          if records.size > 1
+            Bullet::Detector::Association.add_possible_objects(records)
+            Bullet::Detector::Counter.add_possible_objects(records)
+          elsif records.size == 1
+            Bullet::Detector::Association.add_impossible_object(records.first)
+            Bullet::Detector::Counter.add_impossible_object(records.first)
+          end
+          records
+        end
+      end
+
+      ::ActiveRecord::Associations::Preloader.class_eval do
+        # include query for one to many associations.
+        # keep this eager loadings.
+        alias_method :origin_initialize, :initialize
+        def initialize(records, associations, preload_scope = nil)
+          origin_initialize(records, associations, preload_scope)
+          records = [records].flatten.compact.uniq
+          return if records.empty?
+          records.each do |record|
+            Bullet::Detector::Association.add_object_associations(record, associations)
+          end
+          Bullet::Detector::Association.add_eager_loadings(records, associations)
+        end
+      end
+
+      ::ActiveRecord::FinderMethods.class_eval do
+        # add includes in scope
+        alias_method :origin_find_with_associations, :find_with_associations
+        def find_with_associations
+          records = origin_find_with_associations
+          associations = (eager_load_values + includes_values).uniq
+          records.each do |record|
+            Bullet::Detector::Association.add_object_associations(record, associations)
+            Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+          end
+          Bullet::Detector::Association.add_eager_loadings(records, associations)
+          records
+        end
+      end
+
+      ::ActiveRecord::Associations::JoinDependency.class_eval do
+        alias_method :origin_construct_association, :construct_association
+        # call join associations
+        def construct_association(record, join, row)
+          associations = join.reflection.name
+          Bullet::Detector::Association.add_object_associations(record, associations)
+          Bullet::Detector::NPlusOneQuery.call_association(record, associations)
+          origin_construct_association(record, join, row)
+        end
+      end
+
+      ::ActiveRecord::Associations::CollectionAssociation.class_eval do
+        # call one to many associations
+        alias_method :origin_load_target, :load_target
+        def load_target
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          origin_load_target
+        end
+      end
+
+      ::ActiveRecord::Associations::SingularAssociation.class_eval do
+        # call has_one and belongs_to associations
+        alias_method :origin_reader, :reader
+        def reader(force_reload = false)
+          result = origin_reader(force_reload)
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          Bullet::Detector::Association.add_possible_objects(result)
+          result
+        end
+      end
+
+      ::ActiveRecord::Associations::HasManyAssociation.class_eval do
+        alias_method :origin_has_cached_counter?, :has_cached_counter?
+
+        def has_cached_counter?(reflection = reflection)
+          result = origin_has_cached_counter?(reflection)
+          Bullet::Detector::Counter.add_counter_cache(owner, reflection.name) unless result
+          result
+        end
+      end
+    end
+  end
+end

data/lib/bullet/dependency.rb

@@ -24,8 +24,10 @@ module Bullet
                                      'active_record2'
                                    elsif active_record30?
                                      'active_record3'
-                                   elsif active_record31? || active_record32? || active_record4?
+                                   elsif active_record31? || active_record32?
                                      'active_record3x'
+                                   elsif active_record4?
+                                     'active_record4'
                                    end
                                  end
     end

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "4.3.1"
+  VERSION = "4.4.0"
 end

data/spec/integration/association_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if active_record3?
+if active_record3? || active_record4?
   describe Bullet::Detector::Association, 'has_many' do
     before(:each) do
       Bullet.clear
@@ -66,7 +66,7 @@ if active_record3?
       it "should detect preload category => posts, but no post => comments" do
         Category.includes(:posts).each do |category|
           category.posts.each do |post|
-            post.comments.collect(&:name)
+            post.comments.map(&:name)
           end
         end
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
@@ -176,7 +176,7 @@ if active_record3?
       end
 
       it "should detect preload with post => commnets" do
-        Post.first.comments.collect(&:name)
+        Post.first.comments.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
@@ -199,7 +199,7 @@ if active_record3?
 
     context "scope for_category_name" do
       it "should detect preload with post => category" do
-        Post.in_category_name('first').all.each do |post|
+        Post.in_category_name('first').each do |post|
           post.category.name
         end
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
@@ -278,7 +278,7 @@ if active_record3?
       end
 
       it "should not detect preload with comment => post" do
-        Comment.all.collect(&:name)
+        Comment.all.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
@@ -415,7 +415,7 @@ if active_record3?
       end
 
       it "should detect no unused preload associations" do
-        Student.all.collect(&:name)
+        Student.all.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
@@ -456,7 +456,7 @@ if active_record3?
       end
 
       it "should not detect preload associations" do
-        Firm.all.collect(&:name)
+        Firm.all.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
@@ -464,7 +464,7 @@ if active_record3?
       end
 
       it "should detect unused preload associations" do
-        Firm.includes(:clients).collect(&:name)
+        Firm.includes(:clients).map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Firm, :clients)
 
@@ -495,7 +495,7 @@ if active_record3?
       end
 
       it "should detect preload association" do
-        Company.find(:all, :include => :address).each do |company|
+        Company.includes(:address).each do |company|
           company.address.name
         end
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
@@ -505,7 +505,7 @@ if active_record3?
       end
 
       it "should not detect preload association" do
-        Company.all.collect(&:name)
+        Company.all.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 
@@ -513,7 +513,7 @@ if active_record3?
       end
 
       it "should detect unused preload association" do
-        Company.find(:all, :include => :address).collect(&:name)
+        Company.includes(:address).map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Company, :address)
 
@@ -564,7 +564,7 @@ if active_record3?
       end
 
       it "should detect preload associations" do
-        Page.find(:all, :include => :author).each do |page|
+        Page.includes(:author).each do |page|
           page.author.name
         end
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
@@ -574,7 +574,7 @@ if active_record3?
       end
 
       it "should detect unused preload associations" do
-        Page.find(:all, :include => :author).collect(&:name)
+        Page.includes(:author).map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should be_unused_preload_associations_for(Page, :author)
 
@@ -582,7 +582,7 @@ if active_record3?
       end
 
       it "should not detect preload associations" do
-        Page.all.collect(&:name)
+        Page.all.map(&:name)
         Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
         Bullet::Detector::Association.should_not be_has_unused_preload_associations
 

data/spec/integration/counter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if active_record3?
+if active_record3? || active_record4?
   describe Bullet::Detector::Counter do
     before(:each) do
       Bullet.start_request

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
@@ -54,6 +54,7 @@ files:
 - lib/bullet/active_record2.rb
 - lib/bullet/active_record3.rb
 - lib/bullet/active_record3x.rb
+- lib/bullet/active_record4.rb
 - lib/bullet/dependency.rb
 - lib/bullet/detector.rb
 - lib/bullet/detector/association.rb
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A rails plugin to kill N+1 queries and unused eager loading.