mongo_mapper 0.13.0.beta2 → 0.15.0

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
@@ -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/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

@@ -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'
@@ -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
@@ -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_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

data/spec/functional/associations/one_embedded_proxy_spec.rb

@@ -38,7 +38,7 @@ describe "OneEmbeddedProxy" 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
@@ -72,10 +72,10 @@ describe "OneEmbeddedProxy" do
     @post_class.one :author, :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 initialize id for nested embedded document created from hash" do

data/spec/functional/associations/one_proxy_spec.rb

@@ -11,7 +11,7 @@ describe "OneProxy" do
 
   it "should default to nil" do
     @post_class.one :author, :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
@@ -25,7 +25,7 @@ describe "OneProxy" 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'
@@ -42,7 +42,7 @@ describe "OneProxy" 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
@@ -58,7 +58,7 @@ describe "OneProxy" 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'
@@ -79,7 +79,7 @@ describe "OneProxy" 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'
@@ -207,10 +207,10 @@ describe "OneProxy" do
     @post_class.one :author, :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
@@ -232,7 +232,7 @@ describe "OneProxy" 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
@@ -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

@@ -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,7 +33,7 @@ describe "Caching" do
     before do
       @object_id = BSON::ObjectId.new
       @doc = @klass.new
-      @doc.stub(:persisted).and_return(true)
+      @doc.stub(:persisted?).and_return(true)
       @doc.stub(:id).and_return(@object_id)
     end
 
@@ -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