bullet 4.1.4 → 4.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.4)
+    bullet (4.1.5)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/Gemfile.rails-2.3.14.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.4)
+    bullet (4.1.5)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/Gemfile.rails-3.0.13.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.4)
+    bullet (4.1.5)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/Gemfile.rails-3.1.5.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bullet (4.1.4)
+    bullet (4.1.5)
       uniform_notifier (~> 1.0.0)
 
 GEM

data/lib/bullet/mongoid24.rb

@@ -45,7 +45,9 @@ module Bullet
         alias_method :origin_set_relation, :set_relation
 
         def set_relation(name, relation)
-          Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          if relation && relation.metadata.macro !~ /embed/
+            Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          end
           origin_set_relation(name, relation)
         end
       end

data/lib/bullet/mongoid3.rb

@@ -44,7 +44,9 @@ module Bullet
         alias_method :origin_set_relation, :set_relation
 
         def set_relation(name, relation)
-          Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          if relation && relation.metadata.macro !~ /embed/
+            Bullet::Detector::NPlusOneQuery.call_association(self, name)
+          end
           origin_set_relation(name, relation)
         end
       end

data/lib/bullet/version.rb

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

data/spec/integration/mongoid/association_spec.rb

@@ -11,6 +11,20 @@ if mongoid?
       Mongoid::IdentityMap.clear
     end
 
+    context 'embeds_many' do
+      context "posts => users" do
+        it "should detect nothing" do
+          Mongoid::Post.all.each do |post|
+            post.users.map(&:name)
+          end
+          Bullet::Detector::UnusedEagerAssociation.check_unused_preload_associations
+          Bullet::Detector::Association.should_not be_has_unused_preload_associations
+
+          Bullet::Detector::Association.should be_completely_preloading_associations
+        end
+      end
+    end
+
     context 'has_many' do
       context "posts => comments" do
         it "should detect non preload posts => comments" do

data/spec/models/mongoid/post.rb

@@ -4,5 +4,7 @@ class Mongoid::Post
   has_many :comments, :class_name => "Mongoid::Comment"
   belongs_to :category, :class_name => "Mongoid::Category"
 
+  embeds_many :users, :class_name => "Mongoid::User"
+
   scope :preload_comments, lambda { includes(:comments) }
 end

data/spec/models/mongoid/user.rb

@@ -0,0 +1,3 @@
+class Mongoid::User
+  include Mongoid::Document
+end

data/spec/support/mongo_seed.rb

@@ -8,6 +8,10 @@ module Support
       post1a = category1.posts.create(:name => 'like first')
       post2 = category2.posts.create(:name => 'second')
 
+      post1.users << Mongoid::User.create(:name => 'first')
+      post1.users << Mongoid::User.create(:name => 'another')
+      post2.users << Mongoid::User.create(:name => 'second')
+
       comment1 = post1.comments.create(:name => 'first')
       comment2 = post1.comments.create(:name => 'first2')
       comment3 = post1.comments.create(:name => 'first3')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uniform_notifier
-  requirement: &70278160365200 !ruby/object:Gem::Requirement
+  requirement: &70299719166880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70278160365200
+  version_requirements: *70299719166880
 description: A rails plugin to kill N+1 queries and unused eager loading.
 email:
 - flyerhzm@gmail.com
@@ -119,6 +119,7 @@ files:
 - spec/models/mongoid/company.rb
 - spec/models/mongoid/entry.rb
 - spec/models/mongoid/post.rb
+- spec/models/mongoid/user.rb
 - spec/models/newspaper.rb
 - spec/models/page.rb
 - spec/models/person.rb
@@ -151,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 107640970782381372
+      hash: 938107111431995273
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,6 +206,7 @@ test_files:
 - spec/models/mongoid/company.rb
 - spec/models/mongoid/entry.rb
 - spec/models/mongoid/post.rb
+- spec/models/mongoid/user.rb
 - spec/models/newspaper.rb
 - spec/models/page.rb
 - spec/models/person.rb