bullet 4.14.2 → 4.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb724ff2fab91cffc833fdf09ec6c9661b805c50
-  data.tar.gz: 65a2701588d1af6703608ce5c1e0b8505cf1c330
+  metadata.gz: dbe02316f8b3e0b61718c940420f189423c3f5f0
+  data.tar.gz: 93db165a6618fb9c470081013e4b2f5fe002c602
 SHA512:
-  metadata.gz: e1e047c94101b65ee2360bd04f1432f7cb7965f50b9c613469dcec12603e4f9f4cdd5d973a86e0a68a5bb186d3a49d0cfef92b829b3c1169b9c8f48894ae810c
-  data.tar.gz: 0ee846a9c3963c6097dc7c98c157df6a78fc553efea2e668336ec20c64b109022dfe9e87e755a6b0807598fbd0de5fdca8c0e8d6bea2f11a439ec8d033fe3cab
+  metadata.gz: 6c9ec0b4e3c23e6de5f59f74cb9378f5db7c32a448a42d4304b2399c3762308bab649dffc7f86bd04aaf175946391df9658994a1a190fb2a64fb8ec5bd21dbb3
+  data.tar.gz: 47451dec206f2d05aaa11466d8f6c063bbb9e3e9c03929d7dc8867b11e77be6871ee6a58f1f2b52435db3bb6854e913228dc9b310bf7dd78f5b968de5f042932

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 4.14.3
+
+* Fix false positive on create
+
 ## 4.14.2
 
 * Hotfix nil object when add_impossible_object

data/README.md

@@ -430,4 +430,4 @@ Meanwhile, there's a line appended to `log/bullet.log`
   Post => [:comments]
 ```
 
-Copyright (c) 2009 - 2014 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright (c) 2009 - 2015 Richard Huang (flyerhzm@gmail.com), released under the MIT license

data/lib/bullet/active_record4.rb

@@ -104,8 +104,10 @@ module Bullet
         alias_method :origin_reader, :reader
         def reader(force_reload = false)
           result = origin_reader(force_reload)
-          Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
-          Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          unless @inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+            Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+          end
           result
         end
       end

data/lib/bullet/active_record41.rb

@@ -106,8 +106,8 @@ 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
+          if @owner.class.name !~ /^HABTM_/ && !@inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
             Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
           end
           result

data/lib/bullet/active_record42.rb

@@ -117,8 +117,8 @@ 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
+          if @owner.class.name !~ /^HABTM_/ && !@inversed
+            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
             Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
           end
           if ::ActiveRecord::Reflection::HasOneReflection === @reflection && result

data/lib/bullet/version.rb

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

data/spec/integration/active_record4/association_spec.rb

@@ -219,6 +219,20 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should not detect unused preload with category => posts" do
+        category = Category.first
+        category.draft_post.destroy!
+        post = category.draft_post
+        post.update_attributes!(link: true)
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_completely_preloading_associations
+
+        Support::SqliteSeed.setup_db
+        Support::SqliteSeed.seed_db
+      end
     end
 
     context "category => posts => writer" do
@@ -313,7 +327,7 @@ if !mongoid? && active_record4?
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
 
-      it "should detect unused preload with comments => post" do
+      it "should detect unused preload with comment => post" do
         Comment.includes(:post).map(&:name)
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).to be_unused_preload_associations_for(Comment, :post)

data/spec/models/category.rb

@@ -3,4 +3,8 @@ class Category < ActiveRecord::Base
   has_many :entries
 
   has_many :users
+
+  def draft_post
+    posts.draft.first_or_create
+  end
 end

data/spec/models/comment.rb

@@ -1,4 +1,6 @@
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
   belongs_to :author, class_name: "BaseUser"
+
+  validates :post, presence: true
 end

data/spec/models/post.rb

@@ -3,6 +3,13 @@ class Post < ActiveRecord::Base
   belongs_to :writer
   has_many :comments, inverse_of: :post
 
+  validates :category, presence: true
+
   scope :preload_comments, -> { includes(:comments) }
   scope :in_category_name, ->(name) { where(['categories.name = ?', name]).includes(:category) }
+  scope :draft, -> { where(active: false) }
+
+  def link=(*)
+    comments.new
+  end
 end

data/spec/spec_helper.rb

@@ -56,11 +56,11 @@ if active_record?
       Support::SqliteSeed.seed_db
     end
 
-    config.before(:each) do
+    config.before(:example) do
       Bullet.start_request
     end
 
-    config.after(:each) do
+    config.after(:example) do
       Bullet.end_request
     end
   end

data/spec/support/sqlite_seed.rb

@@ -14,7 +14,7 @@ module Support
       category2 = Category.create(:name => 'second')
 
       post1 = category1.posts.create(:name => 'first', :writer => writer1)
-      post1a = category1.posts.create(:name => 'like first', :writer => writer2)
+      post1a = category1.posts.create(:name => 'like first', :writer => writer2, active: false)
       post2 = category2.posts.create(:name => 'second', :writer => writer2)
 
       comment1 = post1.comments.create(:name => 'first', :author => writer1)
@@ -194,6 +194,7 @@ module Support
           t.column :name, :string
           t.column :category_id, :integer
           t.column :writer_id, :integer
+          t.column :active, :boolean, :default => true
         end
 
         create_table :relationships do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.14.2
+  version: 4.14.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport