mongo_mapper 0.14.0 → 0.15.1

data/spec/functional/associations/many_documents_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper.rb'
 
 describe "ManyDocumentsProxy" do
   before do
-    Project.collection.remove
-    Status.collection.remove
+    Project.collection.drop
+    Status.collection.drop
 
     @pet_class = Doc do
       key :name, String
@@ -171,9 +171,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should call destroy the existing documents" do
-          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[0].should_receive(:destroy).once
+          @broker.properties[1].should_receive(:destroy).once
+          @broker.properties[2].should_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
-          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[0].should_receive(:destroy).never
+          @broker.properties[1].should_receive(:destroy).once
+          @broker.properties[2].should_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
-          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[0].should_receive(:delete).once
+          @broker.properties[1].should_receive(:delete).once
+          @broker.properties[2].should_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
-          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[0].should_receive(:delete).never
+          @broker.properties[1].should_receive(:delete).once
+          @broker.properties[2].should_receive(:delete).never
           @broker.properties = [@property3, @property1]
         end
       end
@@ -430,9 +430,9 @@ describe "ManyDocumentsProxy" do
 
     it "should raise exception if not valid" do
       project = Project.create
-      expect {
+      lambda {
         project.statuses.create!(:name => nil)
-      }.to raise_error(MongoMapper::DocumentNotValid)
+      }.should raise_error(MongoMapper::DocumentNotValid)
     end
 
     it "should reset cache" do
@@ -754,9 +754,9 @@ describe "ManyDocumentsProxy" do
       end
 
       it "should not work for ids not in association" do
-        expect {
+        lambda {
           @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
@@ -810,13 +810,13 @@ describe "ManyDocumentsProxy" do
       class ::Property
         include MongoMapper::Document
       end
-      Property.collection.remove
+      Property.collection.drop
 
       class ::Thing
         include MongoMapper::Document
         key :name, String
       end
-      Thing.collection.remove
+      Thing.collection.drop
     end
 
     after do
@@ -997,7 +997,7 @@ describe "ManyDocumentsProxy" do
 
       lambda do
         @job_title_2.trainings.find_by_slug!('bar')
-      end.should raise_error
+      end.should raise_error(RuntimeError)
     end
 
     it "should scope with an extra where clause on the proxy (regression #2)" do
@@ -1018,7 +1018,7 @@ describe "ManyDocumentsProxy" do
 
       lambda do
         @job_title_2.trainings.find_by_slug!('bar')
-      end.should raise_error
+      end.should raise_error(RuntimeError)
     end
   end
 end

data/spec/functional/associations/many_embedded_polymorphic_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "ManyEmbeddedPolymorphicProxy" do
   before do
-    Catalog.collection.remove
-    TrModels::Fleet.collection.remove
+    Catalog.collection.drop
+    TrModels::Fleet.collection.drop
   end
 
   it "should default reader to empty array" do

data/spec/functional/associations/many_polymorphic_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "ManyPolymorphicProxy" do
   before do
-    Room.collection.remove
-    Message.collection.remove
+    Room.collection.drop
+    Message.collection.drop
   end
 
   it "should default reader to empty array" do
@@ -247,9 +247,9 @@ describe "ManyPolymorphicProxy" do
       end
 
       it "should not work for ids not in association" do
-        expect {
+        lambda {
           @lounge.messages.find!(@lm1._id, @lm2._id, @hm2._id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 

data/spec/functional/associations/one_as_proxy_spec.rb

@@ -132,7 +132,7 @@ describe "OneAsProxy" do
         end
 
         it "should call delete on the existing document" do
-          expect_any_instance_of(@author_class).to receive(:delete).once
+          @author_class.any_instance.should_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
-          expect_any_instance_of(@author_class).to receive(:delete).never
+          @author_class.any_instance.should_receive(:delete).never
           @post.author = @author
         end
       end
@@ -157,7 +157,7 @@ describe "OneAsProxy" do
         end
 
         it "should call destroy the existing document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).once
+          @author_class.any_instance.should_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
-          expect_any_instance_of(@author_class).to receive(:destroy).never
+          @author_class.any_instance.should_receive(:destroy).never
           @post.author = @author
         end
       end
@@ -302,7 +302,7 @@ describe "OneAsProxy" do
       end
 
       it "should should call destroy on the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:destroy).once
+        @author_class.any_instance.should_receive(:destroy).once
         @post.destroy
       end
 
@@ -324,7 +324,7 @@ describe "OneAsProxy" do
       end
 
       it "should should call delete the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:delete).once
+        @author_class.any_instance.should_receive(:delete).once
         @post.destroy
       end
 
@@ -445,7 +445,7 @@ describe "OneAsProxy" do
     end
 
     it "should raise exception if invalid" do
-      expect { @post.create_author! }.to raise_error(MongoMapper::DocumentNotValid)
+      lambda { @post.create_author! }.should raise_error(MongoMapper::DocumentNotValid)
     end
 
     it "should work if valid" do
@@ -486,4 +486,4 @@ describe "OneAsProxy" do
       article.articleable_id.should == @paper.id
     end
   end
-end
+end

data/spec/functional/associations/one_proxy_spec.rb

@@ -97,7 +97,7 @@ describe "OneProxy" do
         end
 
         it "should call delete on the existing document" do
-          expect_any_instance_of(@author_class).to receive(:delete).once
+          @author_class.any_instance.should_receive(:delete).once
           @post.author = @author_class.new
         end
 
@@ -107,7 +107,7 @@ describe "OneProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          expect_any_instance_of(@author_class).to receive(:delete).never
+          @author_class.any_instance.should_receive(:delete).never
           @post.author = @author
         end
       end
@@ -122,7 +122,7 @@ describe "OneProxy" do
         end
 
         it "should call destroy the existing document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).once
+          @author_class.any_instance.should_receive(:destroy).once
           @post.author = @author_class.new
         end
 
@@ -132,7 +132,7 @@ describe "OneProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).never
+          @author_class.any_instance.should_receive(:destroy).never
           @post.author = @author
         end
       end
@@ -246,7 +246,7 @@ describe "OneProxy" do
       end
 
       it "should should call destroy on the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:destroy).once
+        @author_class.any_instance.should_receive(:destroy).once
         @post.destroy
       end
 
@@ -268,7 +268,7 @@ describe "OneProxy" do
       end
 
       it "should should call delete the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:delete).once
+        @author_class.any_instance.should_receive(:delete).once
         @post.destroy
       end
 
@@ -366,9 +366,9 @@ describe "OneProxy" do
       end
 
       it "should raise exception if invalid" do
-        expect {
+        lambda {
           post.create_author!
-        }.to raise_error(MongoMapper::DocumentNotValid)
+        }.should raise_error(MongoMapper::DocumentNotValid)
       end
 
       it "should work if valid" do

data/spec/functional/associations_spec.rb

@@ -9,7 +9,7 @@ module AssociationsSpec
 
         many :posts, :class_name => 'AssociationsSpec::AwesomePost', :foreign_key => :creator_id
       end
-      AwesomeUser.collection.remove
+      AwesomeUser.collection.drop
 
       class AwesomeTag
         include MongoMapper::EmbeddedDocument
@@ -29,8 +29,8 @@ module AssociationsSpec
         many :tags, :class_name => 'AssociationsSpec::AwesomeTag', :foreign_key => :post_id
       end
 
-      AwesomeUser.collection.remove
-      AwesomePost.collection.remove
+      AwesomeUser.collection.drop
+      AwesomePost.collection.drop
 
       user = AwesomeUser.create
       tag1 = AwesomeTag.new(:name => 'awesome')

data/spec/functional/binary_spec.rb

@@ -10,7 +10,7 @@ describe "Binary" do
     doc.save
 
     doc = doc.reload
-    doc.contents.to_s.should == BSON::Binary.new('010101').to_s
+    doc.contents.data.should == BSON::Binary.new('010101').data
   end
 
   context "Saving a document with a blank binary value" do
@@ -21,7 +21,7 @@ describe "Binary" do
     end
 
     it "not fail" do
-      expect { @document.new(:file => nil).save }.to_not raise_error
+      lambda { @document.new(:file => nil).save }.should_not raise_error
     end
   end
 end

data/spec/functional/caching_spec.rb

@@ -6,16 +6,16 @@ describe "Caching" do
       extend MongoMapper::Plugins
       plugin MongoMapper::Plugins::Caching
     end
-    allow(@klass).to receive(:name).and_return('Post')
-    allow_any_instance_of(@klass).to receive(:persisted?).and_return(true)
-    allow_any_instance_of(@klass).to receive(:[]).and_return(nil)
-    allow_any_instance_of(@klass).to receive(:[]=).and_return(nil)
+    @klass.stub(:name).and_return('Post')
+    @klass.any_instance.stub(:persisted?).and_return(true)
+    @klass.any_instance.stub(:[]).and_return(nil)
+    @klass.any_instance.stub(:[]=).and_return(nil)
   end
 
   context "new" do
     before do
       @doc = @klass.new
-      allow(@doc).to receive(:persisted?).and_return(false)
+      @doc.stub(:persisted?).and_return(false)
     end
 
     it "should be class/new" do
@@ -23,11 +23,9 @@ describe "Caching" do
     end
 
     it "should work with suffix" do
-      @doc.cache_key(:foo).
-        should == 'Post/new/foo'
+      @doc.cache_key(:foo).should == 'Post/new/foo'
 
-      @doc.cache_key(:foo, :bar).
-        should == 'Post/new/foo/bar'
+      @doc.cache_key(:foo, :bar).should == 'Post/new/foo/bar'
     end
   end
 
@@ -35,14 +33,14 @@ describe "Caching" do
     before do
       @object_id = BSON::ObjectId.new
       @doc = @klass.new
-      allow(@doc).to receive(:persisted).and_return(true)
-      allow(@doc).to receive(:id).and_return(@object_id)
+      @doc.stub(:persisted?).and_return(true)
+      @doc.stub(:id).and_return(@object_id)
     end
 
     context "with updated_at" do
       before do
         time = Time.utc(2010, 6, 20, 8, 10, 7)
-        allow(@doc).to receive(:[]).with(:updated_at).and_return(time)
+        @doc.stub(:[]).with(:updated_at).and_return(time)
       end
 
       it "should be class/id-timestamp" do
@@ -50,11 +48,9 @@ describe "Caching" do
       end
 
       it "should work with suffix" do
-        @doc.cache_key(:foo).
-          should == "Post/#{@object_id}-20100620081007/foo"
+        @doc.cache_key(:foo).should == "Post/#{@object_id}-20100620081007/foo"
 
-        @doc.cache_key(:foo, :bar).
-          should == "Post/#{@object_id}-20100620081007/foo/bar"
+        @doc.cache_key(:foo, :bar).should == "Post/#{@object_id}-20100620081007/foo/bar"
       end
     end
 
@@ -64,12 +60,9 @@ describe "Caching" do
       end
 
       it "should work with suffix" do
-        @doc.cache_key(:foo).
-          should == "Post/#{@object_id}/foo"
-
-        @doc.cache_key(:foo, :bar, :baz).
-          should == "Post/#{@object_id}/foo/bar/baz"
+        @doc.cache_key(:foo).should == "Post/#{@object_id}/foo"
+        @doc.cache_key(:foo, :bar, :baz).should == "Post/#{@object_id}/foo/bar/baz"
       end
     end
   end
-end
+end

data/spec/functional/callbacks_spec.rb

@@ -148,11 +148,11 @@ describe "Callbacks" do
       @root_class.define_callbacks :after_publish
       @root_class.after_save { |d| d.run_callbacks(:after_publish) }
 
-      expect {
+      lambda {
         child = @child_class.new(:name => 'Child')
         root  = @root_class.create(:name => 'Parent', :children => [child])
         child.history.should_not include(:after_publish)
-      }.to_not raise_error
+      }.should_not raise_error
     end
   end
 

data/spec/functional/counter_cache_spec.rb

@@ -171,42 +171,42 @@ describe MongoMapper::Plugins::CounterCache do
     end
 
     it "should update the counter cache on save" do
-      expect {
+      lambda {
         @comment.save!
         @article.reload
-      }.to change(@article, :commentable_count).by(1)
+      }.should change(@article, :commentable_count).by(1)
     end
 
     it "should increment with a second object" do
       @comment.save!
 
-      expect {
+      lambda {
         second_comment = CounterCacheFixtureModels::Comment.new
         second_comment.commentable = @article
         second_comment.save!
         @article.reload
-      }.to change(@article, :commentable_count).by(1)
+      }.should change(@article, :commentable_count).by(1)
     end
 
     it "should decrement the counter cache on destroy" do
       @comment.save!
 
-      expect {
+      lambda {
         @comment.destroy
         @article.reload
-      }.to change(@article, :commentable_count).by(-1)
+      }.should change(@article, :commentable_count).by(-1)
     end
 
     it "should increment with a different type of object" do
       @comment.save!
 
-      expect {
+      lambda {
         second_comment = CounterCacheFixtureModels::Comment.new
         second_comment.commentable = @article
         second_comment.save!
 
         @article.reload
-      }.to change(@article, :commentable_count).by(1)
+      }.should change(@article, :commentable_count).by(1)
     end
 
     describe "without a counter cache field" do
@@ -226,9 +226,9 @@ describe MongoMapper::Plugins::CounterCache do
       it "should raise at save (runtime) if there is no counter cache field" do
         @comment.commentable = @obj
 
-        expect {
+        lambda {
           @comment.save!
-        }.to raise_error(MongoMapper::Plugins::CounterCache::InvalidCounterCacheError)
+        }.should raise_error(MongoMapper::Plugins::CounterCache::InvalidCounterCacheError)
       end
     end
   end

data/spec/functional/dirty_spec.rb

@@ -9,6 +9,13 @@ describe "Dirty" do
   end
 
   context "marking changes" do
+    it "should have the changed? methods" do
+      obj = @document.new
+      obj.should respond_to(:changed?)
+      obj.should respond_to(:phrase_changed?)
+      obj.should respond_to(:paragraph_changed?)
+    end
+
     it "should not happen if there are none" do
       doc = @document.new
       doc.phrase_changed?.should be_falsey
@@ -48,8 +55,8 @@ describe "Dirty" do
 
     it "should not happen when loading from database" do
       doc = @document.create(:phrase => 'Foo')
-      expect_any_instance_of(@document).to receive(:attribute_will_change!).never
-      expect_any_instance_of(@document).to receive(:attribute_changed?).never
+      @document.any_instance.should_receive(:attribute_will_change!).never
+      @document.any_instance.should_receive(:attribute_changed?).never
       doc = @document.find(doc.id)
       doc.changed?.should be_falsey
     end
@@ -220,19 +227,25 @@ describe "Dirty" do
       doc.a = "d"
       doc.a_change.should == ["b","d"]
     end
-    it "should reset changes when set back to the original value" do
-      doc = @document.create(:a=>"b")
-      doc.a = "c"
-      doc.a = "b"
-      doc.changed?.should be_falsey
-    end
+
+    # TODO: ? Is this consistent with how ActiveRecord now works with changes?
+    # it "should reset changes when set back to the original value" do
+    #   doc = @document.create(:a=>"b")
+    #   doc.a = "c"
+    #   doc.a = "b"
+    #   doc.changed?.should be_falsey
+    # end
   end
 
   context "reset_attribute!" do
     it "should reset the attribute back to the previous value" do
       doc = @document.create(:a=>"b")
       doc.a = "c"
-      doc.reset_a!
+      if doc.respond_to?(:restore_a!)
+        doc.restore_a!
+      else
+        doc.reset_a!
+      end
       doc.changed?.should be_falsey
       doc.a.should == "b"
     end
@@ -241,7 +254,11 @@ describe "Dirty" do
       doc.a = "c"
       doc.a = "d"
       doc.a = "e"
-      doc.reset_a!
+      if doc.respond_to?(:restore_a!)
+        doc.restore_a!
+      else
+        doc.reset_a!
+      end
       doc.changed?.should be_falsey
       doc.a.should == "b"
     end

data/spec/functional/document_spec.rb

@@ -240,8 +240,8 @@ describe "Document" do
     end
 
     it "should reset many associations" do
-      expect(@instance.foos).to receive(:reset).at_least(1).times
-      expect(@instance.bars).to receive(:reset).at_least(1).times
+      @instance.foos.should_receive(:reset).at_least(1).times
+      @instance.bars.should_receive(:reset).at_least(1).times
       @instance.reload
     end
 
@@ -257,9 +257,6 @@ describe "Document" do
       @instance.bar.should_not be_nil
     end
 
-    it "should reset nil one association" do
-    end
-
     it "should reinstantiate embedded associations" do
       @instance.reload
       @instance.bars.first.name.should == '1'
@@ -271,7 +268,7 @@ describe "Document" do
 
     it "should raise DocumentNotFound if not found" do
       @instance.destroy
-      expect { @instance.reload }.to raise_error(MongoMapper::DocumentNotFound)
+      lambda { @instance.reload }.should raise_error(MongoMapper::DocumentNotFound)
     end
 
     it "should clear keys that were removed from the database" do
@@ -283,7 +280,7 @@ describe "Document" do
   context "database has keys not defined in model" do
     before do
       @id = BSON::ObjectId.new
-      @document.collection.insert({
+      @document.collection.insert_one({
         :_id            => @id,
         :first_name     => 'John',
         :last_name      => 'Nunemaker',
@@ -304,7 +301,7 @@ describe "Document" do
   end
 
   it "should not walk ObjectSpace when creating a model" do
-    expect(ObjectSpace).to receive(:each_object).never
+    ObjectSpace.should_receive(:each_object).never
     Doc()
   end
 end

data/spec/functional/dumpable_spec.rb

@@ -7,7 +7,7 @@ describe "Documents with the Dumpable plugin" do
   let(:store)  { ActiveSupport::Cache::MemoryStore.new(:size => 1.megabyte) }
 
   it "should be able to be marshalled" do
-    expect { Marshal.dump(answer) }.to_not raise_error
+    lambda { Marshal.dump(answer) }.should_not raise_error
   end
 
   it "should be able to be unmarshalled" do

data/spec/functional/embedded_document_spec.rb

@@ -227,7 +227,7 @@ describe "EmbeddedDocument" do
     person.pets << pet
     pet.should be_new
 
-    expect(person).to receive(:save!)
+    person.should_receive(:save!)
     pet.save!
   end
 
@@ -272,8 +272,8 @@ describe "EmbeddedDocument" do
     pet = person.pets.first
 
     attributes = {:name => 'koda'}
-    expect(pet).to receive(:attributes=).with(attributes)
-    expect(pet).to receive(:save!)
+    pet.should_receive(:attributes=).with(attributes)
+    pet.should_receive(:save!)
     pet.update_attributes!(attributes)
   end
 
@@ -288,8 +288,8 @@ describe "EmbeddedDocument" do
   end
 
   it "should not fail if the source document contains nils in the embedded document list" do
-    @klass.collection.insert(:pets => [nil, {:name => "Sasha"}])
-    expect { @klass.all.first.pets }.to_not raise_error
+    @klass.collection.insert_one(:pets => [nil, {:name => "Sasha"}])
+    lambda { @klass.all.first.pets }.should_not raise_error
     @klass.all.first.pets.tap do |pets|
       pets.length.should == 1
       pets[0].name.should == "Sasha"