hashrocket-mongomapper 0.3.14 → 0.3.15

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/lib/mongomapper/validations.rb

@@ -15,9 +15,14 @@ module MongoMapper
     end
     
     class ValidatesUniquenessOf < Validatable::ValidationBase
+      option :scope
+
       def valid?(instance)
-        # TODO: scope
-        doc = instance.class.find(:first, :conditions => {self.attribute => instance[attribute]}, :limit => 1)
+        conditions = {self.attribute => instance[attribute]}
+        if scope
+          conditions.merge!(scope => instance[scope])
+        end
+        doc = instance.class.find(:first, :conditions => conditions, :limit => 1)
         doc.nil? || instance.id == doc.id
       end
 

data/mongomapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-09-17}
+  s.date = %q{2009-09-22}
   s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
   s.executables = ["mmconsole"]

data/test/functional/test_validations.rb

@@ -121,6 +121,22 @@ class ValidationsTest < Test::Unit::TestCase
       doc.should_not have_error_on(:name)
     end
 
+    should "not fail when new object is out of scope" do
+      document = Class.new do
+        include MongoMapper::Document
+        key :name
+        key :adult
+        validates_uniqueness_of :name, :scope => :adult
+      end
+      doc = document.new("name" => "joe", :adult => true)
+      doc.save.should be_true
+
+      doc2 = document.new("name" => "joe", :adult => false)
+      doc2.should be_valid
+
+      document.collection.clear
+    end
+
     should "allow to update an object" do
       doc = @document.new("name" => "joe")
       doc.save.should be_true
@@ -147,6 +163,21 @@ class ValidationsTest < Test::Unit::TestCase
       doc2 = @document.new("name" => "joe")
       doc2.should have_error_on(:name)
     end
+
+    should "fail when object is not unique within scope" do
+      document = Class.new do
+        include MongoMapper::Document
+        key :name
+        key :adult
+        validates_uniqueness_of :name, :scope => :adult
+      end
+      doc = document.new("name" => "joe", :adult => true)
+      doc.save.should be_true
+
+      doc2 = document.new("name" => "joe", :adult => true)
+      doc2.should have_error_on(:name)
+      document.collection.clear
+    end
   end
   
   context "validates uniqueness of with :unique shortcut" do
@@ -169,4 +200,4 @@ class ValidationsTest < Test::Unit::TestCase
       second_john.should have_error_on(:name, 'has already been taken')
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hashrocket-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: mmconsole
 dependencies: 
 - !ruby/object:Gem::Dependency