mongoa 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

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

@@ -0,0 +1,34 @@
+module Mongoa
+  module MongoMapper
+    module Matchers
+      class ValidateBase
+        attr_reader :attribute
+  
+        def initialize(attribute)
+          @attribute = attribute
+        end
+
+        def matches?(subject)
+          @subject = subject
+          @validation = find_validation
+        end
+
+        def validation_type
+          raise "Redefine in the subclass"
+        end
+        
+        private
+
+        def model_class
+          @subject.class
+        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        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Mongoa
+  module MongoMapper
+    module Matchers
+      class ValidateInclusionOfMatcher < ValidateBase
+        def initialize(attribute, within)
+          super(attribute)
+          @within = within
+        end
+
+        def matches?(subject)
+          super(subject)
+          @validation ? @validation.within == @within : false
+        end
+
+        def description
+          "require #{@attribute} to be within #{@within}"
+        end
+
+        def failure_message
+          "Expected #{@attribute} to be within #{@within} but was not"
+        end
+
+        def negative_failure_message
+          "Expected #{@attribute} to not be within #{@within} but was"
+        end
+        
+        private 
+        
+        def validation_type
+          "ValidatesInclusionOf"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Mongoa
+  module MongoMapper
+    module Matchers
+      class ValidatePresenceOfMatcher < ValidateBase
+        def description
+          "require #{@attribute} to be set"
+        end
+
+        def failure_message
+          "Expected #{@attribute} to be a required field (validates_presence_of or :required => true) but was not"
+        end
+
+        def negative_failure_message
+          "Expected #{@attribute} to not be a required field (validates_presence_of or :required => true), but it was"
+        end
+        
+        private
+        
+        def validation_type
+          "ValidatesPresenceOf"
+        end
+      end
+    end
+  end
+end

data/lib/mongoa/mongo_mapper/validations.rb

@@ -1,43 +1,16 @@
+require 'mongoa/mongo_mapper/validations/validate_base'
+require 'mongoa/mongo_mapper/validations/validate_presence_of'
+require 'mongoa/mongo_mapper/validations/validate_inclusion_of'
+
 module Mongoa
   module MongoMapper
     module Matchers
       def validate_presence_of(attr)
-        ValidateMatcher.new("ValidatesPresenceOf", attr)
-      end
-    end
-
-    class ValidateMatcher
-      attr_reader :validation_type
-      attr_reader :attribute
-      
-      def initialize(validation_type, attribute)
-        @validation_type = validation_type
-        @attribute = attribute
-      end
-
-      def matches?(subject)
-        @subject = subject
-        attr_validations = model_class.validations.select { |validation| validation.attribute == attribute }
-        return false unless attr_validations
-        attr_validations.detect { |validation| validation.key.include?(validation_type) }
-      end
-
-      def description
-        "require #{@attribute} to be set"
-      end
-
-      def failure_message
-        "#{@attribute} to be a required field (validates_presence_of) but was not"
-      end
-
-      def negative_failure_message
-        "#{@attribute} to not be a required field (validates_presence_of), but it was"
+        ValidatePresenceOfMatcher.new(attr)
       end
       
-      private
-
-      def model_class
-        @subject.class
+      def validates_inclusion_of(attr, within)
+        ValidateInclusionOfMatcher.new(attr, within)
       end
     end
   end

data/mongoa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoa}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott J. Tamosunas"]
-  s.date = %q{2010-08-11}
+  s.date = %q{2010-08-12}
   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 = [
@@ -29,6 +29,9 @@ Gem::Specification.new do |s|
      "lib/mongoa/mongo_mapper/improvements/mongo_mapper_associations.rb",
      "lib/mongoa/mongo_mapper/matchers.rb",
      "lib/mongoa/mongo_mapper/validations.rb",
+     "lib/mongoa/mongo_mapper/validations/validate_base.rb",
+     "lib/mongoa/mongo_mapper/validations/validate_inclusion_of.rb",
+     "lib/mongoa/mongo_mapper/validations/validate_presence_of.rb",
      "mongoa.gemspec",
      "spec/association_matcher_spec.rb",
      "spec/spec.opts",

data/spec/validation_matcher_spec.rb

@@ -14,27 +14,74 @@ class PostRequired
   key :name, String, :required => true
 end
 
+class Within
+  include MongoMapper::Document
+  
+  key :state, String
+  
+  validates_inclusion_of :state, :within => ["new", "uploaded"]
+end
+
+class WithinIn
+  include MongoMapper::Document
+  
+  key :state, String, :in => ["new", "uploaded"]
+end
 
 describe Mongoa::MongoMapper::Matchers do
-  describe "#validates_presence_of" do
-    it "should return true if the key has a validates_presence_of validtion" do
-      validation = Mongoa::MongoMapper::ValidateMatcher.new("ValidatesPresenceOf", :name)
-      validation.should be_matches(Post.new)
+  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)
+      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)
 
-    it "should return false if the key does not have a validates_presence_of validtion" do
-      validation = Mongoa::MongoMapper::ValidateMatcher.new("ValidatesPresenceOf", :foo)
-      validation.should_not be_matches(Post.new)
+        validation = Mongoa::MongoMapper::Matchers::ValidatePresenceOfMatcher.new(:foo)
+        validation.should_not be_matches(PostRequired.new)
+      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::ValidateMatcher.new("ValidatesPresenceOf", :name)
-      validation.should be_matches(PostRequired.new)
+  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
+    
+      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
 
-      validation = Mongoa::MongoMapper::ValidateMatcher.new("ValidatesPresenceOf", :foo)
-      validation.should_not be_matches(PostRequired.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
+
+    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(:foo, ["new", "uploaded"])
+        validation.should_not be_matches(WithinIn.new)
+      end
+    end            
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Scott J. Tamosunas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -04:00
+date: 2010-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,9 @@ files:
 - lib/mongoa/mongo_mapper/improvements/mongo_mapper_associations.rb
 - lib/mongoa/mongo_mapper/matchers.rb
 - lib/mongoa/mongo_mapper/validations.rb
+- lib/mongoa/mongo_mapper/validations/validate_base.rb
+- lib/mongoa/mongo_mapper/validations/validate_inclusion_of.rb
+- lib/mongoa/mongo_mapper/validations/validate_presence_of.rb
 - mongoa.gemspec
 - spec/association_matcher_spec.rb
 - spec/spec.opts