bullet_instructure 4.0.3 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62eede05f800964904846c200e404f63f24a9da0
-  data.tar.gz: f2268ef8dac7c086cabe7dd6676494602a24ea00
+  metadata.gz: 98a4fd498802478eaf995e91645dcd5fa4722103
+  data.tar.gz: 2c74f0ebd2ab028a4e0f9ae3a1a1eac4e45ff849
 SHA512:
-  metadata.gz: 9ecb2db6d652bff96daf3c96f8e57df76cc5a33cfeededdcb2cdfe474ab987976bebc4a1745faf0aece898246e390a4df7953ac0e32b89a42ba9b6a41692daef
-  data.tar.gz: 786eed0ed7b673257f3afbf0fe3c31d63149dc63c345449ebbf0249712b111c554747431a293bb8a3a8fdf3b85af2ffc7d31e0d15114211820814bb0754e626e
+  metadata.gz: f0b57d0a603bab53bdbe33f40afa8d8e30694200827f5cbebbc05cfed147e180823200278852171e5a6b7fcfe6b61e24d63cf7221dc93548501c790c462b3d4b
+  data.tar.gz: fcf37e95d84a32a773cbb7dd2685819f95990ed29767825c162d48527154a349119b085a66551c1321f43ff6d7a199e6ededb2072b92bb75f4999699924a269a

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.5

data/lib/bullet/active_record41.rb

@@ -8,30 +8,29 @@ module Bullet
         # 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.first.class.name !~ /^HABTM_/
-            if records.size > 1
-              Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
-              Bullet::Detector::CounterCache.add_possible_objects(records)
-            elsif records.size == 1
-              Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
-              Bullet::Detector::CounterCache.add_impossible_object(records.first)
-            end
+          if records.size > 1
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
+            Bullet::Detector::CounterCache.add_possible_objects(records)
+          elsif records.size == 1
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
+            Bullet::Detector::CounterCache.add_impossible_object(records.first)
           end
           records
         end
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
-        alias_method :origin_preloaders_on, :preloaders_on
-
-        def preloaders_on(association, records, scope)
-          if records.first.class.name !~ /^HABTM_/
-            records.each do |record|
-              Bullet::Detector::Association.add_object_associations(record, association)
-            end
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
+        # include query for one to many associations.
+        # keep this eager loadings.
+        alias_method :origin_initialize, :initialize
+        def initialize
+          origin_initialize
+          records = [@records].flatten.compact.uniq
+          return if records.empty?
+          records.each do |record|
+            Bullet::Detector::Association.add_object_associations(record, associations)
           end
-          origin_preloaders_on(association, records, scope)
+          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
         end
       end
 
@@ -39,43 +38,29 @@ module Bullet
         # 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)
+          if block_given?
+            origin_find_with_associations { |r| yield r }
+          else
+            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::UnusedEagerLoading.add_eager_loadings(records, associations)
+            records
           end
-          Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, associations)
-          records
         end
       end
 
       ::ActiveRecord::Associations::JoinDependency.class_eval do
-        alias_method :origin_instantiate, :instantiate
         alias_method :origin_construct_model, :construct_model
-
-        def instantiate(result_set, aliases)
-          @bullet_eager_loadings = {}
-          records = origin_instantiate(result_set, aliases)
-
-          @bullet_eager_loadings.each do |klazz, eager_loadings_hash|
-            objects = eager_loadings_hash.keys
-            Bullet::Detector::UnusedEagerLoading.add_eager_loadings(objects, eager_loadings_hash[objects.first].to_a)
-          end
-          records
-        end
-
         # call join associations
-        def construct_model(record, node, row, model_cache, id, aliases)
-          result = origin_construct_model(record, node, row, model_cache, id, aliases)
-
-          associations = node.reflection.name
+        def construct_model(record, join, row)
+          associations = join.reflection.name
           Bullet::Detector::Association.add_object_associations(record, associations)
           Bullet::Detector::NPlusOneQuery.call_association(record, associations)
-          @bullet_eager_loadings[record.class] ||= {}
-          @bullet_eager_loadings[record.class][record] ||= Set.new
-          @bullet_eager_loadings[record.class][record] << associations
-
-          result
+          origin_construct_model(record, join, row)
         end
       end
 
@@ -83,14 +68,8 @@ module Bullet
         # call one to many associations
         alias_method :origin_load_target, :load_target
         def load_target
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-          origin_load_target
-        end
-
-        alias_method :origin_empty?, :empty?
-        def empty?
           Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-          origin_empty?
+          origin_load_target
         end
       end
 
@@ -99,18 +78,26 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
-          if @owner.class.name !~ /^HABTM_/
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-            Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
-          end
+          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
           result
         end
       end
 
+      ::ActiveRecord::Associations::Association.class_eval do
+        alias_method :origin_set_inverse_instance, :set_inverse_instance
+        def set_inverse_instance(record)
+          if record && invertible_for?(record)
+            Bullet::Detector::NPlusOneQuery.add_impossible_object(record)
+          end
+          origin_set_inverse_instance(record)
+        end
+      end
+
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_has_cached_counter?, :has_cached_counter?
 
-        def has_cached_counter?(reflection = reflection())
+        def has_cached_counter?(reflection = reflection)
           result = origin_has_cached_counter?(reflection)
           Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name) unless result
           result

data/lib/bullet/version.rb

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

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: bullet_instructure
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.5
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 description: help to kill N+1 queries and unused eager loading, pretty formatter for
@@ -46,10 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.mongoid
@@ -172,17 +172,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.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: help to kill N+1 queries and unused eager loading, pretty formatter for Instructure.
@@ -244,3 +244,4 @@ test_files:
 - spec/support/mongo_seed.rb
 - spec/support/rack_double.rb
 - spec/support/sqlite_seed.rb
+has_rdoc: