mongo_mapper 0.13.0.beta2 → 0.15.0

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,37 @@ 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 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 +119,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 +180,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,19 +33,19 @@ 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
@@ -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,4 @@ describe "BelongsToProxy" do
       post.reload.title.should == 'Hello, world!'
     end
   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,4 @@ describe "InArrayProxy" do
       end
     end
   end
-end
+end

data/spec/functional/associations/many_documents_as_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "ManyDocumentsAsProxy" do
   before do
-    Post.collection.remove
-    PostComment.collection.remove
+    Post.collection.drop
+    PostComment.collection.drop
   end
 
   it "should default reader to empty array" do
@@ -155,9 +155,9 @@ describe "ManyDocumentsAsProxy" do
       end
 
       it "should not work for id not in association" do
-        expect {
+        lambda {
           @post.comments.find!(@comment5._id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
@@ -168,9 +168,9 @@ describe "ManyDocumentsAsProxy" do
       end
 
       it "should not work for ids not in association" do
-        expect {
+        lambda {
           @post.comments.find!(@comment1._id, @comment2._id, @comment4._id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 

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
@@ -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
@@ -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
@@ -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
 
@@ -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
@@ -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(RuntimeError)
+    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(RuntimeError)
+    end
+  end
 end