djsun-mongomapper 0.3.5.5 → 0.4.1.2

data/lib/mongomapper/validations.rb

@@ -1,47 +1,69 @@
-module MongoMapper
-  module Validations
-    class ValidatesUniquenessOf < Validatable::ValidationBase
-      def valid?(instance)
-        # TODO: scope
-        doc = instance.class.find(:first, :conditions => {self.attribute => instance[attribute]}, :limit => 1)
-        doc.nil? || instance.id == doc.id
-      end
-
-      def message(instance)
-        super || "has already been taken"
-      end
-    end
-    
-    class ValidatesExclusionOf < Validatable::ValidationBase
-      required_option :within
-      
-      def valid?(instance)
-        value = instance[attribute]
-        return true if allow_nil && value.nil?
-        return true if allow_blank && value.blank?
-        
-        !within.include?(instance[attribute])
-      end
-      
-      def message(instance)
-        super || "is reserved"
-      end
-    end
-
-    class ValidatesInclusionOf < Validatable::ValidationBase
-      required_option :within
-      
-      def valid?(instance)
-        value = instance[attribute]
-        return true if allow_nil && value.nil?
-        return true if allow_blank && value.blank?
-        
-        within.include?(value)
-      end
-      
-      def message(instance)
-        super || "is not in the list"
-      end
-    end
-  end
-end
+module MongoMapper
+  module Validations    
+    module Macros
+      def validates_uniqueness_of(*args)
+        add_validations(args, MongoMapper::Validations::ValidatesUniquenessOf)
+      end
+
+      def validates_exclusion_of(*args)
+        add_validations(args, MongoMapper::Validations::ValidatesExclusionOf)
+      end
+
+      def validates_inclusion_of(*args)
+        add_validations(args, MongoMapper::Validations::ValidatesInclusionOf)
+      end
+    end
+    
+    class ValidatesUniquenessOf < Validatable::ValidationBase
+      option :scope
+      
+      def valid?(instance)
+        doc = instance.class.find(:first, :conditions => {self.attribute => instance[attribute]}.merge(scope_conditions(instance)), :limit => 1)
+        doc.nil? || instance.id == doc.id
+      end
+
+      def message(instance)
+        super || "has already been taken"
+      end
+      
+      def scope_conditions(instance)
+        return {} unless scope
+        Array(scope).inject({}) do |conditions, key|
+          conditions.merge(key => instance[key])
+        end
+      end
+    end
+    
+    class ValidatesExclusionOf < Validatable::ValidationBase
+      required_option :within
+      
+      def valid?(instance)
+        value = instance[attribute]
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+        
+        !within.include?(instance[attribute])
+      end
+      
+      def message(instance)
+        super || "is reserved"
+      end
+    end
+
+    class ValidatesInclusionOf < Validatable::ValidationBase
+      required_option :within
+      
+      def valid?(instance)
+        value = instance[attribute]
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+        
+        within.include?(value)
+      end
+      
+      def message(instance)
+        super || "is not in the list"
+      end
+    end
+  end
+end

data/test/custom_matchers.rb

@@ -0,0 +1,48 @@
+module CustomMatchers
+  custom_matcher :be_nil do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected #{receiver} to be nil but it wasn't"
+    matcher.negative_failure_message = "Expected #{receiver} not to be nil but it was"
+    receiver.nil?
+  end
+  
+  custom_matcher :be_blank do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected #{receiver} to be blank but it wasn't"
+    matcher.negative_failure_message = "Expected #{receiver} not to be blank but it was"
+    receiver.blank?
+  end
+  
+  custom_matcher :be_true do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
+    matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"
+    receiver.eql?(true)
+  end
+  
+  custom_matcher :be_false do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected #{receiver} to be false but it wasn't"
+    matcher.negative_failure_message = "Expected #{receiver} not to be false but it was"
+    receiver.eql?(false)
+  end
+
+  custom_matcher :be_valid do |receiver, matcher, args|
+    matcher.positive_failure_message = "Expected to be valid but it was invalid #{receiver.errors.inspect}"
+    matcher.negative_failure_message = "Expected to be invalid but it was valid #{receiver.errors.inspect}"
+    receiver.valid?
+  end
+
+  custom_matcher :have_error_on do |receiver, matcher, args|
+    receiver.valid?
+    attribute = args[0]
+    expected_message = args[1]
+    
+    if expected_message.nil?
+      matcher.positive_failure_message = "#{receiver} had no errors on #{attribute}"
+      matcher.negative_failure_message = "#{receiver} had errors on #{attribute} #{receiver.errors.inspect}"
+      !receiver.errors.on(attribute).blank?
+    else
+      actual = receiver.errors.on(attribute)
+      matcher.positive_failure_message = %Q(Expected error on #{attribute} to be "#{expected_message}" but was "#{actual}")
+      matcher.negative_failure_message = %Q(Expected error on #{attribute} not to be "#{expected_message}" but was "#{actual}")
+      actual == expected_message
+    end
+  end
+end

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -1,57 +1,54 @@
-require 'test_helper'
-require 'models'
-
-class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
-  def setup
-    clear_all_collections
-  end
-  
-  should "default to nil" do
-    status = Status.new
-    status.target.should be_nil
-    status.target.inspect.should == "nil"
-  end
-
-  should "be able to replace the association" do
-    status = Status.new
-    project = Project.new(:name => "mongomapper")
-    status.target = project
-    status.save.should be_true
-
-    from_db = Status.find(status.id)
-    from_db.target.should_not be_nil
-    from_db.target.inspect.should_not be_empty
-    from_db.target_id.should == project.id
-    from_db.target_type.should == "Project"
-    from_db.target.name.should == "mongomapper"
-  end
-
-  should "unset the association" do
-    status = Status.new
-    project = Project.new(:name => "mongomapper")
-    status.target = project
-    status.save.should be_true
-
-    from_db = Status.find(status.id)
-    from_db.target = nil
-    from_db.target_type.should be_nil
-    from_db.target_id.should be_nil
-    from_db.target.should be_nil
-    from_db.target.inspect.should == "nil"
-  end
-  
-  context "association id set but document not found" do
-    setup do
-      @status = Status.new
-      project = Project.new(:name => "mongomapper")
-      @status.target = project
-      @status.save.should be_true
-      project.destroy
-    end
-
-    should "return nil instead of raising error" do
-      @status.target.should be_nil
-      @status.target.inspect.should == "nil"
-    end
-  end
+require 'test_helper'
+require 'models'
+
+class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
+  def setup
+    clear_all_collections
+  end
+  
+  should "default to nil" do
+    status = Status.new
+    status.target.nil?.should == true
+    status.target.inspect.should == "nil"
+  end
+
+  should "be able to replace the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.target = project
+    status.save.should be_true
+
+    from_db = Status.find(status.id)
+    from_db.target.nil?.should == false
+    from_db.target_id.should == project.id
+    from_db.target_type.should == "Project"
+    from_db.target.name.should == "mongomapper"
+  end
+
+  should "unset the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.target = project
+    status.save.should be_true
+
+    from_db = Status.find(status.id)
+    from_db.target = nil
+    from_db.target_type.nil?.should == true
+    from_db.target_id.nil?.should == true
+    from_db.target.nil?.should == true
+  end
+  
+  context "association id set but document not found" do
+    setup do
+      @status = Status.new
+      project = Project.new(:name => "mongomapper")
+      @status.target = project
+      @status.save.should be_true
+      project.destroy
+    end
+
+    should "return nil instead of raising error" do
+      @status.target.nil?.should == true
+    end
+  end
 end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -1,49 +1,48 @@
-require 'test_helper'
-require 'models'
-
-class BelongsToProxyTest < Test::Unit::TestCase
-  def setup
-    clear_all_collections
-  end
-  
-  should "default to nil" do
-    status = Status.new
-    status.project.should be_nil
-    status.project.inspect.should == "nil"
-  end
-  
-  should "be able to replace the association" do
-    status = Status.new
-    project = Project.new(:name => "mongomapper")
-    status.project = project
-    status.save.should be_true
-    
-    from_db = Status.find(status.id)
-    from_db.project.should_not be_nil
-    from_db.project.inspect.should_not be_empty
-    from_db.project.name.should == "mongomapper"
-  end
-  
-  should "unset the association" do
-    status = Status.new
-    project = Project.new(:name => "mongomapper")
-    status.project = project
-    status.save.should be_true
-    
-    from_db = Status.find(status.id)
-    from_db.project = nil
-    from_db.project.should be_nil
-    from_db.project.inspect.should == "nil"
-  end
-  
-  context "association id set but document not found" do
-    setup do
-      @status = Status.new(:name => 'Foo', :project_id => '1234')
-    end
-
-    should "return nil instead of raising error" do
-      @status.project.should be_nil
-      @status.project.inspect.should == "nil"
-    end
-  end
-end
+require 'test_helper'
+require 'models'
+
+class BelongsToProxyTest < Test::Unit::TestCase
+  def setup
+    clear_all_collections
+  end
+  
+  should "default to nil" do
+    status = Status.new
+    status.project.nil?.should == true
+    status.project.inspect.should == "nil"
+  end
+  
+  should "be able to replace the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.project = project
+    status.save.should be_true
+    
+    from_db = Status.find(status.id)
+    from_db.project.should_not be_nil
+    from_db.project.name.should == "mongomapper"
+  end
+  
+  should "unset the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.project = project
+    status.save.should be_true
+    
+    from_db = Status.find(status.id)
+    from_db.project = nil
+    from_db.project.nil?.should == true
+    from_db.project.inspect.should == "nil"
+  end
+  
+  context "association id set but document not found" do
+    setup do
+      @status = Status.new(:name => 'Foo', :project_id => '1234')
+    end
+
+    should "return nil instead of raising error" do
+      @status.project.nil?.should == true
+      @status.project.inspect.should == "nil"
+    end
+  end
+end

data/test/functional/associations/test_many_documents_as_proxy.rb

@@ -1,254 +1,209 @@
-require 'test_helper'
-require 'models'
-
-class ManyDocumentsAsProxyTest < Test::Unit::TestCase
-  def setup
-    clear_all_collections
-  end
-
-  should "default reader to empty array" do
-    Post.new.comments.should == []
-    Post.new.comments.inspect.should == "[]"
-  end
-
-  should "add type and id key to polymorphic class base" do
-    PostComment.keys.keys.should include('commentable_type')
-    PostComment.keys.keys.should include('commentable_id')
-  end
-
-  should "allow adding to association like it was an array" do
-    post = Post.new
-    post.comments << PostComment.new(:body => 'foo bar')
-    post.comments << PostComment.new(:body => 'baz')
-    post.comments.concat PostComment.new(:body => 'baz')
-
-    post.comments.size.should == 3
-  end
-
-  should "be able to replace the association" do
-    post = Post.new
-
-    lambda {
-      post.comments = [
-        PostComment.new(:body => 'foo'),
-        PostComment.new(:body => 'bar'),
-        PostComment.new(:body => 'baz')
-      ]
-    }.should change { PostComment.count }.by(3)
-
-    from_db = Post.find(post.id)
-    from_db.comments.size.should == 3
-    from_db.comments[0].body.should == 'foo'
-    from_db.comments[1].body.should == 'bar'
-    from_db.comments[2].body.should == 'baz'
-  end
-
-  context "build" do
-    should "assign foreign key" do
-      post = Post.new
-      comment = post.comments.build
-      comment.commentable_id.should == post.id
-    end
-
-    should "assign _type" do
-      post = Post.new
-      comment = post.comments.build
-      comment.commentable_type.should == "Post"
-    end
-
-    should "allow assigning attributes" do
-      post = Post.new
-      comment = post.comments.build(:body => 'foo bar')
-      comment.body.should == 'foo bar'
-    end
-  end
-
-  context "create" do
-    should "assign foreign key" do
-      post = Post.new
-      comment = post.comments.create
-      comment.commentable_id.should == post.id
-    end
-
-    should "assign _type" do
-      post = Post.new
-      comment = post.comments.create
-      comment.commentable_type.should == "Post"
-    end
-
-    should "save record" do
-      post = Post.new
-      lambda {
-        post.comments.create(:body => 'baz')
-      }.should change { PostComment.count }
-    end
-
-    should "allow passing attributes" do
-      post = Post.create
-      comment = post.comments.create(:body => 'foo bar')
-      comment.body.should == 'foo bar'
-    end
-  end
-
-  context "count" do
-    should "work scoped to association" do
-      post = Post.create
-      3.times { post.comments.create(:body => 'foo bar') }
-
-      other_post = Post.create
-      2.times { other_post.comments.create(:body => 'baz') }
-
-      post.comments.count.should == 3
-      other_post.comments.count.should == 2
-    end
-
-    should "work with conditions" do
-      post = Post.create
-      post.comments.create(:body => 'foo bar')
-      post.comments.create(:body => 'baz')
-      post.comments.create(:body => 'foo bar')
-
-      post.comments.count(:body => 'foo bar').should == 2
-    end
-  end
-
-  context "Finding scoped to association" do
-    setup do
-      @post = Post.new
-
-      @comment1 = PostComment.create(:body => 'comment1')
-      @comment2 = PostComment.create(:body => 'comment2')
-      @comment3 = PostComment.create(:body => 'comment3')
-      @post.comments = [@comment1, @comment2]
-      @post.save
-
-      @post2 = Post.create(:body => "post #2")
-      @comment4 = PostComment.create(:body => 'comment4')
-      @comment5 = PostComment.create(:body => 'comment5')
-      @comment6 = PostComment.create(:body => 'comment6')
-      @post2.comments = [@comment4, @comment5, @comment6]
-      @post2.save
-    end
-
-    context "with :all" do
-      should "work" do
-        @post.comments.find(:all).should include(@comment1)
-        @post.comments.find(:all).should include(@comment2)
-      end
-
-      should "work with conditions" do
-        comments = @post.comments.find(:all, :conditions => {:body => 'comment1'})
-        comments.should == [@comment1]
-      end
-
-      should "work with order" do
-        comments = @post.comments.find(:all, :order => 'body desc')
-        comments.should == [@comment2, @comment1]
-      end
-    end
-
-    context "with #all" do
-      should "work" do
-        @post.comments.all.should == [@comment1, @comment2]
-      end
-
-      should "work with conditions" do
-        comments = @post.comments.all(:conditions => {:body => 'comment1'})
-        comments.should == [@comment1]
-      end
-
-      should "work with order" do
-        comments = @post.comments.all(:order => '$natural desc')
-        comments.should == [@comment2, @comment1]
-      end
-    end
-
-    context "with :first" do
-      should "work" do
-        lambda {@post.comments.find(:first)}.should_not raise_error
-      end
-
-      should "work with conditions" do
-        comment = @post.comments.find(:first, :conditions => {:body => 'comment2'})
-        comment.body.should == 'comment2'
-      end
-    end
-
-    context "with #first" do
-      should "work" do
-        @post.comments.first.should == @comment1
-      end
-
-      should "work with conditions" do
-        comment = @post.comments.first(:conditions => {:body => 'comment2'}, :order => 'body desc')
-        comment.should == @comment2
-      end
-    end
-
-    context "with :last" do
-      should "work" do
-        @post.comments.find(:last, :order => 'created_at asc').should == @comment2
-      end
-
-      should "work with conditions" do
-        post = @post.comments.find(:last, :conditions => {:body => 'comment1'})
-        post.body.should == 'comment1'
-      end
-    end
-
-    context "with #last" do
-      should "work" do
-        @post.comments.last.should == @comment2
-      end
-
-      should "work with conditions" do
-        comment = @post.comments.last(:conditions => {:body => 'comment1'})
-        comment.should == @comment1
-      end
-    end
-
-    context "with one id" do
-      should "work for id in association" do
-        @post.comments.find(@comment2.id).should == @comment2
-      end
-
-      should "not work for id not in association" do
-        lambda {
-          @post.comments.find(@comment5.id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
-      end
-    end
-
-    context "with multiple ids" do
-      should "work for ids in association" do
-        posts = @post.comments.find(@comment1.id, @comment2.id)
-        posts.should == [@comment1, @comment2]
-      end
-
-      should "not work for ids not in association" do
-        lambda {
-          @post.comments.find(@comment1.id, @comment2.id, @comment4.id)
-        }.should raise_error(MongoMapper::DocumentNotFound)
-      end
-    end
-
-    context "with #paginate" do
-      setup do
-        @comments = @post2.comments.paginate(:per_page => 2, :page => 1, :order => 'created_at asc')
-      end
-
-      should "return total pages" do
-        @comments.total_pages.should == 2
-      end
-
-      should "return total entries" do
-        @comments.total_entries.should == 3
-      end
-
-      should "return the subject" do
-        @comments.should include(@comment4)
-        @comments.should include(@comment5)
-      end
-    end
-  end
+require 'test_helper'
+require 'models'
+
+class ManyDocumentsAsProxyTest < Test::Unit::TestCase
+  def setup
+    clear_all_collections
+  end
+
+  should "default reader to empty array" do
+    Post.new.comments.should == []
+  end
+
+  should "add type and id key to polymorphic class base" do
+    PostComment.keys.keys.should include('commentable_type')
+    PostComment.keys.keys.should include('commentable_id')
+  end
+
+  should "allow adding to association like it was an array" do
+    post = Post.new
+    post.comments << PostComment.new(:body => 'foo bar')
+    post.comments << PostComment.new(:body => 'baz')
+    post.comments.concat PostComment.new(:body => 'baz')
+
+    post.comments.size.should == 3
+  end
+
+  should "be able to replace the association" do
+    post = Post.new
+
+    lambda {
+      post.comments = [
+        PostComment.new(:body => 'foo'),
+        PostComment.new(:body => 'bar'),
+        PostComment.new(:body => 'baz')
+      ]
+    }.should change { PostComment.count }.by(3)
+
+    from_db = Post.find(post.id)
+    from_db.comments.size.should == 3
+    from_db.comments[0].body.should == 'foo'
+    from_db.comments[1].body.should == 'bar'
+    from_db.comments[2].body.should == 'baz'
+  end
+
+  context "build" do
+    should "assign foreign key" do
+      post = Post.new
+      comment = post.comments.build
+      comment.commentable_id.should == post.id
+    end
+
+    should "assign _type" do
+      post = Post.new
+      comment = post.comments.build
+      comment.commentable_type.should == "Post"
+    end
+
+    should "allow assigning attributes" do
+      post = Post.new
+      comment = post.comments.build(:body => 'foo bar')
+      comment.body.should == 'foo bar'
+    end
+  end
+
+  context "create" do
+    should "assign foreign key" do
+      post = Post.new
+      comment = post.comments.create
+      comment.commentable_id.should == post.id
+    end
+
+    should "assign _type" do
+      post = Post.new
+      comment = post.comments.create
+      comment.commentable_type.should == "Post"
+    end
+
+    should "save record" do
+      post = Post.new
+      lambda {
+        post.comments.create(:body => 'baz')
+      }.should change { PostComment.count }
+    end
+
+    should "allow passing attributes" do
+      post = Post.create
+      comment = post.comments.create(:body => 'foo bar')
+      comment.body.should == 'foo bar'
+    end
+  end
+
+  context "count" do
+    should "work scoped to association" do
+      post = Post.create
+      3.times { post.comments.create(:body => 'foo bar') }
+
+      other_post = Post.create
+      2.times { other_post.comments.create(:body => 'baz') }
+
+      post.comments.count.should == 3
+      other_post.comments.count.should == 2
+    end
+
+    should "work with conditions" do
+      post = Post.create
+      post.comments.create(:body => 'foo bar')
+      post.comments.create(:body => 'baz')
+      post.comments.create(:body => 'foo bar')
+
+      post.comments.count(:body => 'foo bar').should == 2
+    end
+  end
+
+  context "Finding scoped to association" do
+    setup do
+      @post = Post.new
+
+      @comment1 = PostComment.create(:body => 'comment1')
+      @comment2 = PostComment.create(:body => 'comment2')
+      @comment3 = PostComment.create(:body => 'comment3')
+      @post.comments = [@comment1, @comment2]
+      @post.save
+
+      @post2 = Post.create(:body => "post #2")
+      @comment4 = PostComment.create(:body => 'comment4')
+      @comment5 = PostComment.create(:body => 'comment5')
+      @comment6 = PostComment.create(:body => 'comment6')
+      @post2.comments = [@comment4, @comment5, @comment6]
+      @post2.save
+    end
+
+    context "with :all" do
+      should "work" do
+        @post.comments.find(:all).should include(@comment1)
+        @post.comments.find(:all).should include(@comment2)
+      end
+
+      should "work with conditions" do
+        comments = @post.comments.find(:all, :conditions => {:body => 'comment1'})
+        comments.should == [@comment1]
+      end
+
+      should "work with order" do
+        comments = @post.comments.find(:all, :order => 'body desc')
+        comments.should == [@comment2, @comment1]
+      end
+    end
+
+    context "with #all" do
+      should "work" do
+        @post.comments.all.should == [@comment1, @comment2]
+      end
+
+      should "work with conditions" do
+        comments = @post.comments.all(:conditions => {:body => 'comment1'})
+        comments.should == [@comment1]
+      end
+
+      should "work with order" do
+        comments = @post.comments.all(:order => '$natural desc')
+        comments.should == [@comment2, @comment1]
+      end
+    end
+
+    context "with one id" do
+      should "work for id in association" do
+        @post.comments.find(@comment2.id).should == @comment2
+      end
+
+      should "not work for id not in association" do
+        lambda {
+          @post.comments.find(@comment5.id)
+        }.should raise_error(MongoMapper::DocumentNotFound)
+      end
+    end
+
+    context "with multiple ids" do
+      should "work for ids in association" do
+        posts = @post.comments.find(@comment1.id, @comment2.id)
+        posts.should == [@comment1, @comment2]
+      end
+
+      should "not work for ids not in association" do
+        lambda {
+          @post.comments.find(@comment1.id, @comment2.id, @comment4.id)
+        }.should raise_error(MongoMapper::DocumentNotFound)
+      end
+    end
+
+    context "with #paginate" do
+      setup do
+        @comments = @post2.comments.paginate(:per_page => 2, :page => 1, :order => 'created_at asc')
+      end
+
+      should "return total pages" do
+        @comments.total_pages.should == 2
+      end
+
+      should "return total entries" do
+        @comments.total_entries.should == 3
+      end
+
+      should "return the subject" do
+        @comments.should include(@comment4)
+        @comments.should include(@comment5)
+      end
+    end
+  end
 end