mongo_mapper 0.13.0 → 0.15.1

data/spec/functional/accessible_spec.rb

@@ -39,12 +39,12 @@ describe "Accessible" do
 
     it "should assign inaccessible attribute through accessor" do
       @doc.admin = true
-      @doc.admin.should be_true
+      @doc.admin.should be_truthy
     end
 
     it "should ignore inaccessible attribute on #initialize" do
       doc = @doc_class.new(:name => 'John', :admin => true)
-      doc.admin.should be_false
+      doc.admin.should be_falsey
       doc.name.should == 'John'
     end
 
@@ -54,7 +54,7 @@ describe "Accessible" do
       doc.save!
 
       doc = @doc_class.first(:name => 'John')
-      doc.admin.should be_true
+      doc.admin.should be_truthy
       doc.name.should == 'John'
     end
 
@@ -64,37 +64,43 @@ describe "Accessible" do
       doc.save!
 
       doc.reload
-      doc.admin.should be_true
+      doc.admin.should be_truthy
       doc.name.should == 'John'
     end
 
     it "should not ignore inaccessible attribute on #update_attribute" do
       @doc.update_attribute('admin', true)
-      @doc.admin.should be_true
+      @doc.admin.should be_truthy
     end
 
     it "should ignore inaccessible attribute on #update_attributes" do
       @doc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @doc.name.should == 'Ren Hoek'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should ignore inaccessible attribute on #update_attributes!" do
       @doc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
       @doc.name.should == 'Stimpson J. Cat'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should ignore inaccessible attribute on #attributes=" do
       @doc.attributes = {:name => 'Ren Hoek', :admin => true}
       @doc.name.should == 'Ren Hoek'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
+    end
+
+    it "should ignore inaccessible attribute on #assign_attributes" do
+      @doc.assign_attributes({:name => 'Ren Hoek', :admin => true})
+      @doc.name.should == 'Ren Hoek'
+      @doc.admin.should be_falsey
     end
 
     it "should be indifferent to whether the accessible keys are strings or symbols" do
       @doc.update_attributes!("name" => 'Stimpson J. Cat', "admin" => true)
       @doc.name.should == 'Stimpson J. Cat'
-      @doc.admin.should be_false
+      @doc.admin.should be_falsey
     end
 
     it "should accept nil as constructor's argument without raising exception" do
@@ -119,7 +125,7 @@ describe "Accessible" do
         key :name, String
         key :site_id, ObjectId
       end
-      GrandParent.collection.remove
+      GrandParent.collection.drop
 
       class ::Child < ::GrandParent
         attr_accessible :position
@@ -180,19 +186,19 @@ describe "Accessible" do
 
     it "should assign inaccessible attribute through accessor" do
       @edoc.admin = true
-      @edoc.admin.should be_true
+      @edoc.admin.should be_truthy
     end
 
     it "should ignore inaccessible attribute on #update_attributes" do
       @edoc.update_attributes(:name => 'Ren Hoek', :admin => true)
       @edoc.name.should == 'Ren Hoek'
-      @edoc.admin.should be_false
+      @edoc.admin.should be_falsey
     end
 
     it "should ignore inaccessible attribute on #update_attributes!" do
       @edoc.update_attributes!(:name => 'Stimpson J. Cat', :admin => true)
       @edoc.name.should == 'Stimpson J. Cat'
-      @edoc.admin.should be_false
+      @edoc.admin.should be_falsey
     end
   end
 end

data/spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb

@@ -3,32 +3,32 @@ require 'spec_helper'
 
 describe "BelongsToPolymorphicProxy" do
   before do
-    Status.collection.remove
-    Project.collection.remove
+    Status.collection.drop
+    Project.collection.drop
   end
 
   it "should default to nil" do
     status = Status.new
-    status.target.nil?.should be_true
+    status.target.nil?.should be_truthy
     status.target.inspect.should == "nil"
   end
 
   it "should have boolean presence method" do
     status = Status.new
-    status.target?.should be_false
+    status.target?.should be_falsey
 
     status.target = Project.new(:name => 'mongomapper')
-    status.target?.should be_true
+    status.target?.should be_truthy
   end
 
   it "should be able to replace the association" do
     status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
-    status.save.should be_true
+    status.save.should be_truthy
 
     status = status.reload
-    status.target.nil?.should be_false
+    status.target.nil?.should be_falsey
     status.target_id.should == project._id
     status.target_type.should == "Project"
     status.target.name.should == "mongomapper"
@@ -38,13 +38,13 @@ describe "BelongsToPolymorphicProxy" do
     status = Status.new(:name => 'Foo!')
     project = Project.new(:name => "mongomapper")
     status.target = project
-    status.save.should be_true
+    status.save.should be_truthy
 
     status = status.reload
     status.target = nil
-    status.target_type.nil?.should be_true
-    status.target_id.nil?.should be_true
-    status.target.nil?.should be_true
+    status.target_type.nil?.should be_truthy
+    status.target_id.nil?.should be_truthy
+    status.target.nil?.should be_truthy
   end
 
   context "association id set but document not found" do
@@ -52,13 +52,13 @@ describe "BelongsToPolymorphicProxy" do
       @status = Status.new(:name => 'Foo!')
       project = Project.new(:name => "mongomapper")
       @status.target = project
-      @status.save.should be_true
+      @status.save.should be_truthy
       project.destroy
       @status.reload
     end
 
     it "should return nil instead of raising error" do
-      @status.target.nil?.should be_true
+      @status.target.nil?.should be_truthy
     end
   end
 end

data/spec/functional/associations/belongs_to_proxy_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 describe "BelongsToProxy" do
   before do
     @post_class = Doc()
@@ -11,7 +10,7 @@ describe "BelongsToProxy" do
   end
 
   it "should default to nil" do
-    @comment_class.new.post.nil?.should be_true
+    @comment_class.new.post.nil?.should be_truthy
   end
 
   it "should return nil instead of a proxy" do
@@ -20,10 +19,10 @@ describe "BelongsToProxy" do
 
   it "should have boolean presence method" do
     comment = @comment_class.new(:name => 'Foo!')
-    comment.post?.should be_false
+    comment.post?.should be_falsey
 
     comment.post = @post_class.new(:name => 'mongomapper')
-    comment.post?.should be_true
+    comment.post?.should be_truthy
   end
 
   it "should allow overriding association methods" do
@@ -34,25 +33,25 @@ describe "BelongsToProxy" do
     end
 
     instance = @comment_class.new
-    instance.post?.should be_false
+    instance.post?.should be_falsey
     instance.post = @post_class.new
-    instance.post?.should be_true
+    instance.post?.should be_truthy
   end
 
   it "should be able to replace the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
-    comment.save.should be_true
+    comment.save.should be_truthy
 
     comment = comment.reload
     comment.post.should == post
-    comment.post.nil?.should be_false
+    comment.post.nil?.should be_falsey
   end
 
   it "should not reload the association when replacing" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
-    comment.post.proxy_target.object_id.should == post.object_id
+    comment.post.object_id.should == post.object_id
   end
 
   it "should properly assign the associated object when assigning the association with create" do
@@ -71,12 +70,12 @@ describe "BelongsToProxy" do
     post2 = @post_class.create(:name => 'post2')
 
     comment = @comment_class.new(:name => 'Foo!', :post => post1)
-    comment.save.should be_true
+    comment.save.should be_truthy
 
 
     comment = comment.reload
     comment.post.should == post1
-    comment.post.nil?.should be_false
+    comment.post.nil?.should be_falsey
 
     original_post = comment.post
     original_post.name.should == 'post1'
@@ -89,23 +88,23 @@ describe "BelongsToProxy" do
   it "should unset the association" do
     post = @post_class.new(:name => 'mongomapper')
     comment = @comment_class.new(:name => 'Foo!', :post => post)
-    comment.save.should be_true
+    comment.save.should be_truthy
 
     comment = comment.reload
     comment.post = nil
-    comment.post.nil?.should be_true
+    comment.post.nil?.should be_truthy
   end
 
   it "should return nil if id set but document not found" do
     id = BSON::ObjectId.new
-    @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_true
+    @comment_class.new(:name => 'Foo', :post_id => id).post.nil?.should be_truthy
   end
 
   it "should define foreign key if it doesn't exist" do
     @category_class = Doc()
     @post_class.belongs_to :category, :class => @category_class
 
-    @post_class.key?(:category_id).should be_true
+    @post_class.key?(:category_id).should be_truthy
   end
 
   it "should not define foreign key if it already exists" do
@@ -122,13 +121,13 @@ describe "BelongsToProxy" 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
@@ -212,7 +211,7 @@ describe "BelongsToProxy" do
       end
 
       it "should raise exception if invalid" do
-        expect { comment.create_post! }.to raise_error(MongoMapper::DocumentNotValid)
+        lambda { comment.create_post! }.should raise_error(MongoMapper::DocumentNotValid)
       end
 
       it "should work if valid" do
@@ -228,7 +227,7 @@ describe "BelongsToProxy" do
 
   context 'autosave' do
     it 'should not be true by default' do
-      @comment_class.associations[:post].options[:autosave].should_not be_true
+      @comment_class.associations[:post].options[:autosave].should_not be_truthy
     end
 
     it 'should save parent changes when true' do
@@ -253,4 +252,21 @@ describe "BelongsToProxy" do
       post.reload.title.should == 'Hello, world!'
     end
   end
-end
+
+  context "regression with reassignment" do
+    it "should not infinite regress (shouldn't raise SystemStackError) when assigned to twice (when the proxy isn't around)" do
+      post = @post_class.create!
+      comment = @comment_class.create!(post: post)
+
+      comment = @comment_class.find(comment.id)
+
+      post = comment.post
+
+      comment.post = post
+
+      lambda do
+        comment.post = post
+      end.should_not raise_error
+    end
+  end
+end

data/spec/functional/associations/in_array_proxy_spec.rb

@@ -14,8 +14,8 @@ describe "InArrayProxy" do
         key :list_ids, Array
         many :lists, :in => :list_ids
       end
-      User.collection.remove
-      List.collection.remove
+      User.collection.drop
+      List.collection.drop
     end
 
     after do
@@ -50,7 +50,7 @@ describe "InArrayProxy" do
       user = User.new(:name => 'John')
       list = List.new(:name => 'Foo')
       user.lists = [list]
-      user.save.should be_true
+      user.save.should be_truthy
 
       user.reload
       user.list_ids.should == [list.id]
@@ -112,9 +112,9 @@ describe "InArrayProxy" do
       end
 
       it "should raise exception if invalid" do
-        expect {
+        lambda {
           @user.lists.create!
-        }.to raise_error(MongoMapper::DocumentNotValid)
+        }.should raise_error(MongoMapper::DocumentNotValid)
       end
 
       it "should reset cache" do
@@ -195,9 +195,9 @@ describe "InArrayProxy" do
         end
 
         it "should raise error when using ! and not found" do
-          expect {
+          lambda {
             @user.lists.find!(@list3.id)
-          }.to raise_error(MongoMapper::DocumentNotFound)
+          }.should raise_error(MongoMapper::DocumentNotFound)
         end
       end
 
@@ -249,9 +249,9 @@ describe "InArrayProxy" do
         end
 
         it "should raise error when using ! and not found" do
-          expect {
+          lambda {
             @user.lists.find_by_name!('Foo 3')
-          }.to raise_error(MongoMapper::DocumentNotFound)
+          }.should raise_error(MongoMapper::DocumentNotFound)
         end
 
         context "find_or_create_by" do
@@ -346,4 +346,139 @@ describe "InArrayProxy" do
       end
     end
   end
-end
+
+  describe "ordering" do
+    before do
+      @user_class = Doc("User") do
+        key :list_ids, Array
+      end
+
+      @list_class = Doc("List") do
+        key :name, String, :required => true
+      end
+    end
+
+    def create_list_items
+      @user = @user_class.create!
+      @list1 = @list_class.create!(:name => "one")
+      @list2 = @list_class.create!(:name => "two")
+      @list3 = @list_class.create!(:name => "three")
+
+      @user.lists << [@list3, @list2, @list1]
+      @user.save!
+
+      @user.reload
+    end
+
+    shared_examples_for "ordering is on" do
+      it "should have the items ordered according to order of the ids" do
+        @user.lists.should == [@list3, @list2, @list1]
+      end
+
+      it "should have the right item for #first" do
+        @user.lists.first.should == @list3
+      end
+
+      it "should have the right item for #last" do
+        @user.lists.last.should == @list1
+      end
+
+      it "does not work for pagination (but probably should)" do
+        @user.lists.paginate(:per_page => 100).should == [@list1, @list2, @list3]
+      end
+
+      it "should work with find" do
+        @user.lists.find(@list2.id, @list1.id).should == [@list2, @list1]
+        @user.lists.find(@list1.id, @list2.id).should == [@list2, @list1]
+        @user.lists.find(@list1.id).should == @list1
+      end
+
+      it "should work with find!" do
+        @user.lists.find!(@list2.id, @list1.id).should == [@list2, @list1]
+        @user.lists.find!(@list1.id, @list2.id).should == [@list2, @list1]
+      end
+
+      it "should only load one object with first (and no params given)" do
+        @list_class.should_receive(:allocate).once.and_return @list3
+        @user.lists.first
+      end
+
+      it "should only load one object with first (and params given)" do
+        @list_class.should_receive(:allocate).once.and_return @list3
+        @user.lists.first(:name => /^t/)
+      end
+
+      it "should only load one object with last (and no params given)" do
+        @list_class.should_receive(:allocate).once.and_return @list1
+        @user.lists.last
+      end
+
+      it "should only load one object with last (and params given)" do
+        @list_class.should_receive(:allocate).once.and_return @list3
+        @user.lists.last(:name => /^t/)
+      end
+
+      it "should return nil if first with a query matches no objects" do
+        @user.lists.first(:name => "non-existent").should be_nil
+      end
+
+      it "should return nil if last with a query matches no objects" do
+        @user.lists.last(:name => "non-existent").should be_nil
+      end
+
+      it "should work with extra query params to first and last" do
+        @user.lists.first(:name => /^t/).should == @list3
+        @user.lists.first(:name => /^o/).should == @list1
+
+        @user.lists.last(:name => /^t/).should == @list2
+        @user.lists.last(:name => /^o/).should == @list1
+      end
+    end
+
+    shared_examples_for "ordering is off" do
+      it "should include all items" do
+        @user.lists.length == 3
+        @user.lists.should include(@list1)
+        @user.lists.should include(@list2)
+        @user.lists.should include(@list3)
+      end
+
+      it "should return the items in the natural order" do
+        @user.lists.should == [@list1, @list2, @list3]
+      end
+
+      it "should work with find" do
+        @user.lists.find(@list2.id, @list1.id).should == [@list1, @list2]
+        @user.lists.find(@list1.id, @list2.id).should == [@list1, @list2]
+        @user.lists.find(@list1.id).should == @list1
+      end
+    end
+
+    describe "without a param" do
+      before do
+        @user_class.many :lists, :in => :list_ids, :class => @list_class
+        create_list_items
+      end
+
+      it_behaves_like "ordering is off"
+    end
+
+    describe "with ordering off" do
+      before do
+        @user_class.many :lists, :in => :list_ids, :class => @list_class, :ordered => false
+        create_list_items
+      end
+
+      it_behaves_like "ordering is off"
+    end
+
+    describe "with ordering on" do
+      before do
+        @user_class.many :lists, :in => :list_ids, :class => @list_class, :ordered => true
+        create_list_items
+      end
+
+      it_behaves_like "ordering is on"
+    end
+  end
+end