mongo_mapper 0.13.1 → 0.14.0.rc1

data/spec/functional/associations/many_documents_proxy_spec.rb

@@ -105,7 +105,7 @@ describe "ManyDocumentsProxy" do
     owner.pets[1].name.should == 'Sasha'
     owner.pets[1].species.should == 'Siberian Husky'
 
-    owner.save.should be_true
+    owner.save.should be_truthy
     owner.reload
 
     owner.name.should == 'Mr. Pet Lover'
@@ -128,7 +128,7 @@ describe "ManyDocumentsProxy" do
       it "should work" do
         project = Project.new
         project.statuses = [Status.new(:name => "ready")]
-        project.save.should be_true
+        project.save.should be_truthy
 
         project.reload
         project.statuses.size.should == 1
@@ -140,7 +140,7 @@ describe "ManyDocumentsProxy" do
       it "should convert to objects of the class and work" do
         project = Project.new
         project.statuses = [{ 'name' => 'ready' }]
-        project.save.should be_true
+        project.save.should be_truthy
 
         project.reload
         project.statuses.size.should == 1
@@ -171,9 +171,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should call destroy the existing documents" do
-          @broker.properties[0].should_receive(:destroy).once
-          @broker.properties[1].should_receive(:destroy).once
-          @broker.properties[2].should_receive(:destroy).once
+          expect(@broker.properties[0]).to receive(:destroy).once
+          expect(@broker.properties[1]).to receive(:destroy).once
+          expect(@broker.properties[2]).to receive(:destroy).once
           @broker.properties = [@property_class.new]
         end
 
@@ -184,9 +184,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should skip over documents that are the same" do
-          @broker.properties[0].should_receive(:destroy).never
-          @broker.properties[1].should_receive(:destroy).once
-          @broker.properties[2].should_receive(:destroy).never
+          expect(@broker.properties[0]).to receive(:destroy).never
+          expect(@broker.properties[1]).to receive(:destroy).once
+          expect(@broker.properties[2]).to receive(:destroy).never
           @broker.properties = [@property3, @property1]
         end
       end
@@ -205,9 +205,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should call delete the existing documents" do
-          @broker.properties[0].should_receive(:delete).once
-          @broker.properties[1].should_receive(:delete).once
-          @broker.properties[2].should_receive(:delete).once
+          expect(@broker.properties[0]).to receive(:delete).once
+          expect(@broker.properties[1]).to receive(:delete).once
+          expect(@broker.properties[2]).to receive(:delete).once
           @broker.properties = [@property_class.new]
         end
 
@@ -218,9 +218,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should skip over documents that are the same" do
-          @broker.properties[0].should_receive(:delete).never
-          @broker.properties[1].should_receive(:delete).once
-          @broker.properties[2].should_receive(:delete).never
+          expect(@broker.properties[0]).to receive(:delete).never
+          expect(@broker.properties[1]).to receive(:delete).once
+          expect(@broker.properties[2]).to receive(:delete).never
           @broker.properties = [@property3, @property1]
         end
       end
@@ -491,19 +491,19 @@ describe "ManyDocumentsProxy" do
   context "empty?" do
     it "should be true with no associated docs" do
       project = Project.create
-      project.statuses.empty?.should be_true
+      project.statuses.empty?.should be_truthy
     end
 
     it "should be false if a document is built" do
       project = Project.create
       project.statuses.build(:name => 'Foo!')
-      project.statuses.empty?.should be_false
+      project.statuses.empty?.should be_falsey
     end
 
     it "should be false if a document is created" do
       project = Project.create
       project.statuses.create(:name => 'Foo!')
-      project.statuses.empty?.should be_false
+      project.statuses.empty?.should be_falsey
     end
   end
 
@@ -950,4 +950,75 @@ describe "ManyDocumentsProxy" do
       @paper.articles.should include(article)
     end
   end
+
+  describe "regression with association proxy scoping" do
+    before do
+      @job_title_class = Doc do
+        set_collection_name "job_titles"
+      end
+
+      @training_class = Doc do
+        set_collection_name "trainings"
+        key :slug, String
+        key :is_active, Boolean, default: true
+
+        def self.find_by_slug!(the_slug)
+          if res = first(:slug => the_slug)
+            res
+          else
+            raise "MissingSlugError"
+          end
+        end
+
+        validates_presence_of :job_title_id
+        validates_presence_of :slug
+        validates_uniqueness_of :slug, :scope => :job_title_id
+      end
+
+      @job_title_class.has_many :trainings, :class => @training_class, :foreign_key => :job_title_id
+      @training_class.belongs_to :job_title, :class => @job_title_class
+    end
+
+    it "should scope queries that return a single method on has many association with the right parent id" do
+      @job_title_1 = @job_title_class.create!
+      @job_title_2 = @job_title_class.create!
+
+      @training_1 = @training_class.create!(:slug => 'foo', :job_title_id => @job_title_1.id)
+      @training_2 = @training_class.create!(:slug => 'foo', :job_title_id => @job_title_2.id)
+
+      @job_title_1.reload
+      @job_title_2.reload
+
+      @job_title_1.trainings.count.should == 1
+      @job_title_2.trainings.count.should == 1
+
+      @job_title_1.trainings.find_by_slug!('foo').should == @training_1
+      @job_title_2.trainings.find_by_slug!('foo').should == @training_2
+
+      lambda do
+        @job_title_2.trainings.find_by_slug!('bar')
+      end.should raise_error
+    end
+
+    it "should scope with an extra where clause on the proxy (regression #2)" do
+      @job_title_1 = @job_title_class.create!
+      @job_title_2 = @job_title_class.create!
+
+      @training_1 = @training_class.create!(:slug => 'foo', :job_title_id => @job_title_1.id)
+      @training_2 = @training_class.create!(:slug => 'foo', :job_title_id => @job_title_2.id)
+
+      @job_title_1.reload
+      @job_title_2.reload
+
+      @job_title_1.trainings.count.should == 1
+      @job_title_2.trainings.count.should == 1
+
+      @job_title_1.trainings.where(:is_active => true).find_by_slug!('foo').should == @training_1
+      @job_title_2.trainings.where(:is_active => true).find_by_slug!('foo').should == @training_2
+
+      lambda do
+        @job_title_2.trainings.find_by_slug!('bar')
+      end.should raise_error
+    end
+  end
 end

data/spec/functional/associations/many_embedded_polymorphic_proxy_spec.rb

@@ -21,7 +21,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
   it "should be able to replace the association" do
     catalog = Catalog.new
     catalog.medias = [Video.new('file' => 'video.mpg', 'length' => 3600)]
-    catalog.save.should be_true
+    catalog.save.should be_truthy
 
     catalog = catalog.reload
     catalog.medias.size.should == 1
@@ -40,7 +40,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
       catalog.medias[1].serial_number.should == '1B'
       catalog.medias[1].class.should == Robot
 
-      catalog.save.should be_true
+      catalog.save.should be_truthy
       catalog.reload
 
       catalog.medias.size.should == 2
@@ -60,7 +60,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
       catalog.medias[1].serial_number.should == '1B'
       catalog.medias[1].class.should == Robot
 
-      catalog.save.should be_true
+      catalog.save.should be_truthy
       catalog.reload
 
       catalog.medias.size.should == 2
@@ -81,7 +81,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
       catalog.medias[1].serial_number.should == '1B'
       catalog.medias[1].class.should == Robot
 
-      catalog.save.should be_true
+      catalog.save.should be_truthy
       catalog.reload
 
       catalog.medias.size.should == 2
@@ -105,7 +105,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
         Image.new('file' => 'image.png', 'width' => 800, 'height' => 600)
       ]
       catalog.medias.count.should == 3
-      catalog.save.should be_true
+      catalog.save.should be_truthy
       catalog.reload
       catalog.medias.count.should == 3
     end
@@ -118,7 +118,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
       Music.new('file' => 'music.mp3', 'bitrate' => '128kbps'),
       Image.new('file' => 'image.png', 'width' => 800, 'height' => 600)
     ]
-    catalog.save.should be_true
+    catalog.save.should be_truthy
 
     catalog = catalog.reload
     catalog.medias.size.should == 3
@@ -146,7 +146,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
       fleet.transports.size.should == 3
       fleet.transports[0].class.should == TrModels::Ambulance
       fleet.transports[0].license_plate.should == 'GGG123'
-      fleet.transports[0].icu.should be_true
+      fleet.transports[0].icu.should be_truthy
       fleet.transports[1].class.should == TrModels::Car
       fleet.transports[1].license_plate.should == 'ABC123'
       fleet.transports[1].model.should == 'VW Golf'
@@ -155,12 +155,12 @@ describe "ManyEmbeddedPolymorphicProxy" do
       fleet.transports[2].license_plate.should == 'DEF123'
       fleet.transports[2].model.should == 'Honda Accord'
       fleet.transports[2].year.should == 2008
-      fleet.save.should be_true
+      fleet.save.should be_truthy
 
       fleet = fleet.reload
       fleet.transports.size.should == 3
       fleet.transports[0].license_plate.should == 'GGG123'
-      fleet.transports[0].icu.should be_true
+      fleet.transports[0].icu.should be_truthy
       fleet.transports[1].license_plate.should == 'ABC123'
       fleet.transports[1].model.should == 'VW Golf'
       fleet.transports[1].year.should == 2001
@@ -184,7 +184,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
     it "should be able to replace the association" do
       fleet = TrModels::Fleet.new
       fleet.transports = [TrModels::Car.new('license_plate' => 'DCU2013', 'model' => 'Honda Civic')]
-      fleet.save.should be_true
+      fleet.save.should be_truthy
 
       fleet = fleet.reload
       fleet.transports.size.should == 1
@@ -198,7 +198,7 @@ describe "ManyEmbeddedPolymorphicProxy" do
         TrModels::Bus.new('license_plate' => 'XYZ9090', 'max_passengers' => 51),
         TrModels::Ambulance.new('license_plate' => 'HDD3030', 'icu' => true)
       ]
-      fleet.save.should be_true
+      fleet.save.should be_truthy
 
       fleet = fleet.reload
       fleet.transports.size.should == 3

data/spec/functional/associations/many_embedded_proxy_spec.rb

@@ -89,7 +89,7 @@ describe "ManyEmbeddedProxy" do
     owner.pets[1].name.should == 'Sasha'
     owner.pets[1].species.should == 'Siberian Husky'
 
-    owner.save.should be_true
+    owner.save.should be_truthy
     owner.reload
 
     owner.name.should == 'Mr. Pet Lover'

data/spec/functional/associations/one_as_proxy_spec.rb

@@ -9,7 +9,7 @@ describe "OneAsProxy" do
 
   it "should default to nil" do
     @post_class.one :author, :as => :authorable, :class => @author_class
-    @post_class.new.author.nil?.should be_true
+    @post_class.new.author.nil?.should be_truthy
   end
 
   it "should return nil instead of a proxy" do
@@ -29,7 +29,7 @@ describe "OneAsProxy" do
     post = @post_class.new('author' => { 'name' => 'Frank' })
     post.author.name.should == 'Frank'
 
-    post.save.should be_true
+    post.save.should be_truthy
     post.reload
 
     post.author.name.should == 'Frank'
@@ -59,7 +59,7 @@ describe "OneAsProxy" do
         @post.reload
 
         @post.author.should == @author
-        @post.author.nil?.should be_false
+        @post.author.nil?.should be_falsey
 
         new_author = @author_class.new(:name => 'Emily')
         @post.author = new_author
@@ -71,7 +71,7 @@ describe "OneAsProxy" do
         @post.reload
 
         @post.author.should == @author
-        @post.author.nil?.should be_false
+        @post.author.nil?.should be_falsey
 
         original_author = @post.author
         original_author.name.should == 'Frank'
@@ -104,7 +104,7 @@ describe "OneAsProxy" do
         @post.reload
 
         @post.author.name.should == 'Frank'
-        @post.author.nil?.should be_false
+        @post.author.nil?.should be_falsey
 
         @post.author = {'name' => 'Emily'}
         @post.author.name.should == 'Emily'
@@ -132,7 +132,7 @@ describe "OneAsProxy" do
         end
 
         it "should call delete on the existing document" do
-          @author_class.any_instance.should_receive(:delete).once
+          expect_any_instance_of(@author_class).to receive(:delete).once
           @post.author = @author_class.new
         end
 
@@ -142,7 +142,7 @@ describe "OneAsProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          @author_class.any_instance.should_receive(:delete).never
+          expect_any_instance_of(@author_class).to receive(:delete).never
           @post.author = @author
         end
       end
@@ -157,7 +157,7 @@ describe "OneAsProxy" do
         end
 
         it "should call destroy the existing document" do
-          @author_class.any_instance.should_receive(:destroy).once
+          expect_any_instance_of(@author_class).to receive(:destroy).once
           @post.author = @author_class.new
         end
 
@@ -167,7 +167,7 @@ describe "OneAsProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          @author_class.any_instance.should_receive(:destroy).never
+          expect_any_instance_of(@author_class).to receive(:destroy).never
           @post.author = @author
         end
       end
@@ -263,10 +263,10 @@ describe "OneAsProxy" do
     @post_class.one :author, :as => :authorable, :class => @author_class
 
     post = @post_class.new
-    post.author?.should be_false
+    post.author?.should be_falsey
 
     post.author = @author_class.new(:name => 'Frank')
-    post.author?.should be_true
+    post.author?.should be_truthy
   end
 
   it "should work with criteria" do
@@ -288,7 +288,7 @@ describe "OneAsProxy" do
     post.update_attributes!(:author => author)
     post.reload
     post.author = nil
-    post.author.nil?.should be_true
+    post.author.nil?.should be_truthy
   end
 
   context "destroying parent with :dependent" do
@@ -302,7 +302,7 @@ describe "OneAsProxy" do
       end
 
       it "should should call destroy on the associated documents" do
-        @author_class.any_instance.should_receive(:destroy).once
+        expect_any_instance_of(@author_class).to receive(:destroy).once
         @post.destroy
       end
 
@@ -324,7 +324,7 @@ describe "OneAsProxy" do
       end
 
       it "should should call delete the associated documents" do
-        @author_class.any_instance.should_receive(:delete).once
+        expect_any_instance_of(@author_class).to receive(:delete).once
         @post.destroy
       end
 

data/spec/functional/associations/one_embedded_polymorphic_proxy_spec.rb

@@ -35,7 +35,7 @@ describe "OneEmbeddedPolymorhpicProxy" do
     post.author.name.should == 'Frank'
     post.author.class.should == Human
 
-    post.save.should be_true
+    post.save.should be_truthy
     post.reload
 
     post.author.name.should == 'Frank'
@@ -56,7 +56,7 @@ describe "OneEmbeddedPolymorhpicProxy" do
         @post.reload
 
         @post.author.should == @human
-        @post.author.nil?.should be_false
+        @post.author.nil?.should be_falsey
         @post.author.class.should == Human
 
         new_human = Human.new(:name => 'Emily')
@@ -70,7 +70,7 @@ describe "OneEmbeddedPolymorhpicProxy" do
         @post.reload
 
         @post.author.should == @human
-        @post.author.nil?.should be_false
+        @post.author.nil?.should be_falsey
 
         original_author = @post.author
         original_author.name.should == 'Frank'
@@ -99,7 +99,7 @@ describe "OneEmbeddedPolymorhpicProxy" do
         @post.reload
 
         @post.author.serial_number.should == '1B'
-        @post.author.nil?.should be_false
+        @post.author.nil?.should be_falsey
 
         @post.author = {'serial_number' => '2C'}
         @post.author.serial_number.should == '2C'
@@ -142,13 +142,13 @@ describe "OneEmbeddedPolymorhpicProxy" do
 
     post.author.class.should == TrModels::Ambulance
     post.author.license_plate.should == 'GGG123'
-    post.author.icu.should be_true
-    post.save.should be_true
+    post.author.icu.should be_truthy
+    post.save.should be_truthy
 
     post = post.reload
     post.author.class.should == TrModels::Ambulance
     post.author.license_plate.should == 'GGG123'
-    post.author.icu.should be_true
+    post.author.icu.should be_truthy
   end
 
   it "should not have problem loading root document if embedded one is nil" do
@@ -179,10 +179,10 @@ describe "OneEmbeddedPolymorhpicProxy" do
     @post_class.one :author, :polymorphic => true, :class => Robot
 
     post = @post_class.new
-    post.author?.should be_false
+    post.author?.should be_falsey
 
     post.author = Human.new(:name => 'Frank')
-    post.author?.should be_true
+    post.author?.should be_truthy
   end
 
   it "should initialize id for nested embedded document created from hash" do