mongoa 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/mongoa/mongo_mapper/validations/validate_base.rb

@@ -16,6 +16,10 @@ module Mongoa
         def validation_type
           raise "Redefine in the subclass"
         end
+
+        def validator_class_name
+          raise "Redefine in the subclass"
+        end
         
         private
 
@@ -24,10 +28,16 @@ module Mongoa
         end
         
         def find_validation
-          attr_validations = model_class.validations.select { |validation| validation.attribute == attribute }
-          return nil unless attr_validations
-          validation = attr_validations.detect { |validation| validation.key.include?(validation_type) }
-        end        
+          if model_class.respond_to?(:validators)
+            model_class.validators.detect do |validator|
+              validator.class.to_s == validator_class_name && validator.attributes.include?(attribute)
+            end
+          else
+            attr_validations = model_class.validations.select { |validation| validation.attribute == attribute }
+            return nil unless attr_validations
+            attr_validations.detect { |validation| validation.key.include?(validation_type) }
+          end
+        end
       end
     end
   end

data/lib/mongoa/mongo_mapper/validations/validate_format_of.rb

@@ -1,3 +1,4 @@
+
 module Mongoa
   module MongoMapper
     module Matchers
@@ -35,6 +36,10 @@ module Mongoa
         def validation_type
           "ValidatesFormatOf"
         end
+
+        def validator_class_name
+           "ActiveModel::Validations::FormatValidator"
+        end
       end
     end
   end

data/lib/mongoa/mongo_mapper/validations/validate_inclusion_of.rb

@@ -9,7 +9,7 @@ module Mongoa
 
         def matches?(subject)
           super(subject)
-          @validation ? @validation.within == @within : false
+          @validation ? within == @within : false
         end
 
         def description
@@ -29,6 +29,15 @@ module Mongoa
         def validation_type
           "ValidatesInclusionOf"
         end
+        
+        def validator_class_name
+           "ActiveModel::Validations::InclusionValidator"
+        end
+        
+        #MM - master branch has removed the within
+        def within
+          @validation.respond_to?(:within) ? @validation.within : @validation.options[:in]
+        end
       end
     end
   end

data/lib/mongoa/mongo_mapper/validations/validate_length_of.rb

@@ -23,17 +23,17 @@ module Mongoa
           super(subject)
           if @validation
             if @length_options.keys.include?(:minimum)
-              result = @validation.minimum == @length_options[:minimum]
+              result = minimum == @length_options[:minimum]
               return false if !result
             end
             
             if @length_options.keys.include?(:maximum)
-              result = @validation.maximum == @length_options[:maximum]
+              result = maximum == @length_options[:maximum]
               return false if !result
             end
 
-            if @length_options.keys.include?(:within)            
-              result = @validation.within == @length_options[:within]
+            if @length_options.keys.include?(:within)
+              result = within == @length_options[:within]
               return false if !result
             end
             true
@@ -59,6 +59,26 @@ module Mongoa
         def validation_type
           "ValidatesLengthOf"
         end
+        
+        def validator_class_name
+           "ActiveModel::Validations::LengthValidator"
+        end
+        
+        def minimum
+          @validation.respond_to?(:minimum) ? @validation.minimum : @validation.options[:minimum]
+        end
+        
+        def maximum
+          @validation.respond_to?(:maximum) ? @validation.maximum : @validation.options[:maximum]
+        end
+
+        def within
+          if @validation.respond_to?(:within) 
+            @validation.within
+          else
+            (@validation.options[:minimum]..@validation.options[:maximum])
+          end
+        end
       end
     end
   end

data/lib/mongoa/mongo_mapper/validations/validate_numericality_of.rb

@@ -27,6 +27,10 @@ module Mongoa
         def validation_type
           "ValidatesNumericalityOf"
         end
+        
+        def validator_class_name
+           "ActiveModel::Validations::NumericalityValidator"
+        end
       end
     end
   end

data/lib/mongoa/mongo_mapper/validations/validate_presence_of.rb

@@ -19,6 +19,10 @@ module Mongoa
         def validation_type
           "ValidatesPresenceOf"
         end
+        
+        def validator_class_name
+          "ActiveModel::Validations::PresenceValidator"
+        end
       end
     end
   end

data/lib/mongoa/mongo_mapper/validations/validate_uniqueness_of.rb

@@ -27,6 +27,10 @@ module Mongoa
         def validation_type
           "ValidatesUniquenessOf"
         end
+        
+        def validator_class_name
+          "MongoMapper::Plugins::Validations::UniquenessValidator"
+        end
       end
     end
   end

data/mongoa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoa}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott J. Tamosunas"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-02-21}
   s.description = %q{Adds the association and validation macros for Rspec in the same way Shoulda does for ActiveRecord.}
   s.email = %q{tamosunas@gmail.com}
   s.extra_rdoc_files = [

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # $LOAD_PATH.unshift(File.dirname(__FILE__))
 # $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
+require 'active_model'
 require 'mongo_mapper'
 require 'mongo_mapper/plugins'
 require 'mongo_mapper/plugins/associations'
@@ -20,6 +21,7 @@ end
 require 'mongoa'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/mongoa/mongo_mapper/matchers')
 
+#The models that include ActiveModel are emulating what the later version of MongoMapper is doing
 class User
   include MongoMapper::Document
   
@@ -33,6 +35,20 @@ class User
   validates_numericality_of :years_alive
 end
 
+class UserActiveModel
+  include MongoMapper::Document
+  include ActiveModel::Validations
+  
+  key :name, String
+  key :email, String
+  key :years_alive, Integer
+  key :years_alive_numeric, Integer, :numeric => true
+  key :email_format, String, :format => /(\A(\s*)\Z)|(\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z)/i
+  
+  validates_format_of :email, :with => /(\A(\s*)\Z)|(\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z)/i
+  validates_numericality_of :years_alive
+end
+
 class Post
   include MongoMapper::Document
   
@@ -44,6 +60,18 @@ class Post
   validates_uniqueness_of :unique_name
 end
 
+class PostActiveModel
+  include MongoMapper::Document
+  include ActiveModel::Validations
+  
+  key :name, String
+  key :unique_name, String
+  
+  validates_presence_of :name
+  validates_length_of :name, :minimum => 4, :maximum => 32
+  validates_uniqueness_of :unique_name
+end
+
 class PostRequired
   include MongoMapper::Document
   
@@ -52,6 +80,15 @@ class PostRequired
   key :range_name, String, :required => true, :length => 0..56
 end
 
+class PostRequiredActiveModel
+  include MongoMapper::Document
+  include ActiveModel::Validations
+  
+  key :name, String, :required => true, :length => 32
+  key :unique_name, String, :unique => true
+  key :range_name, String, :required => true, :length => 0..56
+end
+
 class Within
   include MongoMapper::Document
   
@@ -60,8 +97,25 @@ class Within
   validates_inclusion_of :state, :within => ["new", "uploaded"]
 end
 
+class WithinActiveModel
+  include MongoMapper::Document
+  include ActiveModel::Validations
+  
+  key :state, String
+  
+  validates_inclusion_of :state, :in => ["new", "uploaded"]
+end
+
 class WithinIn
   include MongoMapper::Document
   
   key :state, String, :in => ["new", "uploaded"]
-end
+end
+
+#This doesn't work with MM 0.8.6 as is transforms in to within
+# class WithinInActiveModel
+#   include MongoMapper::Document
+#   include ActiveModel::Validations
+#   
+#   key :state, String, :in => ["new", "uploaded"]
+# end

data/spec/validations/validate_inclusion_of_spec.rb

@@ -2,34 +2,43 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mongoa::MongoMapper do
   describe "#validates_inclusion_of or key :in => []" do
-    describe "validates_inclusion_of" do
-      it "should return true if the key has a validate_inclusion_of with the specified within" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["new", "uploaded"])
-        validation.should be_matches(Within.new)
-      end
+    
+    [Within, WithinActiveModel].each do |model_class|
+      context "#{model_class}" do
+        describe "validates_inclusion_of" do
+          it "should return true if the key has a validate_inclusion_of with the specified within" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["new", "uploaded"])
+            validation.should be_matches(Within.new)
+          end
   
-      it "should return false if the key has a validate_inclusion_of but the within doesn't match" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["goo", "gaa"])
-        validation.should_not be_matches(Within.new)
-      end
+          it "should return false if the key has a validate_inclusion_of but the within doesn't match" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["goo", "gaa"])
+            validation.should_not be_matches(Within.new)
+          end
 
-      it "should return false if the key does not have a validate_inclusion_of set" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:foo, ["new", "uploaded"])
-        validation.should_not be_matches(Within.new)
+          it "should return false if the key does not have a validate_inclusion_of set" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:foo, ["new", "uploaded"])
+            validation.should_not be_matches(Within.new)
+          end
+        end
       end
     end
 
-    describe "in" do    
-      it "should work the same as validates_inclusion_of" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["new", "uploaded"])
-        validation.should be_matches(WithinIn.new)
+    [WithinIn].each do |model_class|
+      context "#{model_class}" do
+        describe "in" do    
+          it "should work the same as validates_inclusion_of" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["new", "uploaded"])
+            validation.should be_matches(WithinIn.new)
 
-        validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["goo", "gaa"])
-        validation.should_not be_matches(WithinIn.new)
+            validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:state, ["goo", "gaa"])
+            validation.should_not be_matches(WithinIn.new)
 
-        validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:foo, ["new", "uploaded"])
-        validation.should_not be_matches(WithinIn.new)
+            validation = Mongoa::MongoMapper::Matchers::ValidateInclusionOfMatcher.new(:foo, ["new", "uploaded"])
+            validation.should_not be_matches(WithinIn.new)
+          end
+        end
       end
-    end            
+    end
   end
 end

data/spec/validations/validate_length_of_spec.rb

@@ -2,56 +2,65 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mongoa::MongoMapper do
   describe "#validates_length_of or key :length => <length_options>" do
-    describe "validates_length_of" do
-      describe "maximum" do
-        it "should return true if the key has a validates_length of with the specified :maximum" do
-          validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :maximum => 32)
-          validation.should be_matches(Post.new)
-        end    
-
-        it "should return false if the key has a validates_length but the maximum's don't match" do
-          validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :maximum => 25)
-          validation.should_not be_matches(Post.new)
-        end    
-
-        it "should return false if the key does not have a validates_length of" do
-          validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:foo, :maximum => 32)
-          validation.should_not be_matches(Post.new)
-        end
-      end
     
-      describe "minimum" do
-        it "should return true if the key has a validates_length of with the specified :minimum" do
-          validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :minimum => 4)
-          validation.should be_matches(Post.new)
-        end    
-
-        it "should return false if the key has a validates_length of but the minimum's don't match" do
-          validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :minimum => 2)
-          validation.should_not be_matches(Post.new)
-        end    
-
-        it "should return false if the key does not have a validates_length" do
-          validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:foo, :minimum => 32)
-          validation.should_not be_matches(Post.new)
+    [Post, PostActiveModel].each do |model_class|
+      context "#{model_class}" do
+        describe "validates_length_of" do
+          describe "maximum" do
+            it "should return true if the key has a validates_length of with the specified :maximum" do
+              validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :maximum => 32)
+              validation.should be_matches(model_class.new)
+            end    
+    
+            it "should return false if the key has a validates_length but the maximum's don't match" do
+              validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :maximum => 25)
+              validation.should_not be_matches(model_class.new)
+            end    
+    
+            it "should return false if the key does not have a validates_length of" do
+              validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:foo, :maximum => 32)
+              validation.should_not be_matches(model_class.new)
+            end
+          end
+    
+          describe "minimum" do
+            it "should return true if the key has a validates_length of with the specified :minimum" do
+              validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :minimum => 4)
+              validation.should be_matches(model_class.new)
+            end    
+    
+            it "should return false if the key has a validates_length of but the minimum's don't match" do
+              validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :minimum => 2)
+              validation.should_not be_matches(model_class.new)
+            end    
+    
+            it "should return false if the key does not have a validates_length" do
+              validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:foo, :minimum => 32)
+              validation.should_not be_matches(model_class.new)
+            end
+          end
         end
       end
     end
-  
-    describe "length" do
-      it "should work the same as validates_length_of" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :length => 32)
-        validation.should be_matches(PostRequired.new)
 
-        validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :length => 25)
-        validation.should_not be_matches(PostRequired.new)
+    [PostRequiredActiveModel].each do |model_class|
+      context "#{model_class}" do
+        describe "length" do
+          it "should work the same as validates_length_of" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :length => 32)
+            validation.should be_matches(model_class.new)
+            
+            validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:name, :length => 25)
+            validation.should_not be_matches(model_class.new)
+            
+            validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:foo, :length => 32)
+            validation.should_not be_matches(model_class.new)
 
-        validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:foo, :length => 32)
-        validation.should_not be_matches(PostRequired.new)
-
-        validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:range_name, :length => 0..56)
-        validation.should be_matches(PostRequired.new)
+            validation = Mongoa::MongoMapper::Matchers::ValidateLengthOfMatcher.new(:range_name, :length => 0..56)
+            validation.should be_matches(model_class.new)
+          end
+        end
       end
-    end    
+    end
   end
 end

data/spec/validations/validate_numercality_of_spec.rb

@@ -2,22 +2,26 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mongoa::MongoMapper do
   describe "validates_numericality_of or key numeric" do
-    describe "#validates_numericality_of" do
-      it "should return true if the key has a validates_numericality_of validtion" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateNumericalityOfMatcher.new(:years_alive)
-        validation.should be_matches(User.new)
-      end
+    [User, UserActiveModel].each do |model_class|
+      context model_class do
+        describe "#validates_numericality_of" do
+          it "should return true if the key has a validates_numericality_of validtion" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateNumericalityOfMatcher.new(:years_alive)
+            validation.should be_matches(model_class.new)
+          end
       
-      it "should return false if it doesn't have a validates_numericality_of" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateNumericalityOfMatcher.new(:foo)
-        validation.should_not be_matches(User.new)
-      end
-    end
+          it "should return false if it doesn't have a validates_numericality_of" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateNumericalityOfMatcher.new(:foo)
+            validation.should_not be_matches(model_class.new)
+          end
+        end
       
-    describe "numeric" do
-      it "should work the same if the key is numeric rather than validates_numericality_of" do
-        validation = Mongoa::MongoMapper::Matchers::ValidateNumericalityOfMatcher.new(:years_alive_numeric)
-        validation.should be_matches(User.new)
+        describe "numeric" do
+          it "should work the same if the key is numeric rather than validates_numericality_of" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateNumericalityOfMatcher.new(:years_alive_numeric)
+            validation.should be_matches(model_class.new)
+          end
+        end
       end
     end
   end

data/spec/validations/validate_presence_of_spec.rb

@@ -2,25 +2,34 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mongoa::MongoMapper do
   describe "validates_presence_of or key required => :true" do
-    describe "#validates_presence_of" do
-      it "should return true if the key has a validates_presence_of validtion" do
-        validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:name)
-        validation.should be_matches(Post.new)
-      end
 
-      it "should return false if the key does not have a validates_presence_of validtion" do
-        validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:foo)
-        validation.should_not be_matches(Post.new)
+    [Post, PostActiveModel].each do |model_class|
+      context "#{model_class}" do
+        describe "#validates_presence_of" do
+          it "should return true if the key has a validates_presence_of validtion" do
+            validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:name)
+            validation.should be_matches(model_class.new)
+          end
+
+          it "should return false if the key does not have a validates_presence_of validtion" do
+            validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:foo)
+            validation.should_not be_matches(model_class.new)
+          end
+        end
       end
     end
   
-    describe "required" do
-      it "should work the same if the key is required rather than validates_presence_of" do
-        validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:name)
-        validation.should be_matches(PostRequired.new)
+    [PostRequired, PostRequiredActiveModel].each do |model_class|
+      context "#{model_class}" do
+        describe "required" do
+          it "should work the same if the key is required rather than validates_presence_of" do
+            validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:name)
+            validation.should be_matches(model_class.new)
 
-        validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:foo)
-        validation.should_not be_matches(PostRequired.new)
+            validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:foo)
+            validation.should_not be_matches(model_class.new)
+          end
+        end
       end
     end
   end

data/spec/validations/validate_uniqueness_of_spec.rb

@@ -24,4 +24,33 @@ describe Mongoa::MongoMapper do
       end
     end
   end
+  
+  #This is defined by MonoMapper, not ActiveModel
+  if defined?(ActiveModel::Validations::UniquenessValidator)
+    context "ActiveModel" do
+      describe "validates_uniqueness_of or key required => :true" do
+        describe "#validates_uniqueness_of" do
+          it "should return true if the key has a validates_presence_of validtion" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateUniquenessOfMatcher.new(:unique_name)
+            validation.should be_matches(PostActiveModel.new)
+          end
+
+          it "should return false if the key does not have a validates_presence_of validtion" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateUniquenessOfMatcher.new(:foo)
+            validation.should_not be_matches(PostActiveModel.new)
+          end
+        end
+
+        describe "unique" do
+          it "should work the same if the key is unique rather than validates_presence_of" do
+            validation = Mongoa::MongoMapper::Matchers::ValidateUniquenessOfMatcher.new(:unique_name)
+            validation.should be_matches(PostRequiredActiveModel.new)
+
+            validation = Mongoa::MongoMapper::Matchers::ValidateUniquenessOfMatcher.new(:foo)
+            validation.should_not be_matches(PostRequiredActiveModel.new)
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: mongoa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Scott J. Tamosunas
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -05:00
+date: 2011-02-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency