mongoa 0.1.17 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.2.1

data/lib/mongoa/mongo_mapper/associations/all.rb

@@ -82,7 +82,8 @@ module Mongoa
       end
 
       def belongs_to_foreign_key_exists?
-        model_class.keys.keys.include?("#{reflection_name}_id")
+        foreign_key = model_class.keys["#{reflection_name}_id"]
+        foreign_key && foreign_key.type
       end
 
       def reflection_name

data/lib/mongoa/mongo_mapper/matchers.rb

@@ -4,6 +4,8 @@ require 'mongoa/mongo_mapper/validations/validate_presence_of'
 require 'mongoa/mongo_mapper/validations/validate_inclusion_of'
 require 'mongoa/mongo_mapper/validations/validate_uniqueness_of'
 require 'mongoa/mongo_mapper/validations/validate_length_of'
+require 'mongoa/mongo_mapper/validations/validate_format_of'
+require 'mongoa/mongo_mapper/validations/validate_numericality_of'
 
 module Mongoa
   module MongoMapper

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

@@ -0,0 +1,41 @@
+module Mongoa
+  module MongoMapper
+    module Matchers
+      class ValidateFormatOfMatcher < ValidateBase
+        def initialize(attribute)
+          super(attribute)
+        end
+
+        def matches?(subject)
+          super(subject)
+          raise "The :with is a required option to be checked, but you didn't check it." if !@with
+          @validation.with == @with if @validation && @validation.with
+        end
+
+        def with(value)
+          raise "Can't use both with and not with" if @not_with
+          @with = value
+          self
+        end
+
+        def description
+          "require #{@attribute} to validate the format of"
+        end
+
+        def failure_message
+          "Expected #{@attribute} to validate the format of but didn't"
+        end
+
+        def negative_failure_message
+          "Expected #{@attribute} not to validate the format but did"
+        end
+        
+        private 
+        
+        def validation_type
+          "ValidatesFormatOf"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Mongoa
+  module MongoMapper
+    module Matchers
+      class ValidateNumericalityOfMatcher < ValidateBase
+        def initialize(attribute)
+          super(attribute)
+        end
+
+        def matches?(subject)
+          super(subject)
+        end
+
+        def description
+          "require #{@attribute} to validate the numericality of"
+        end
+
+        def failure_message
+          "Expected #{@attribute} to validate the numericality of but didn't"
+        end
+
+        def negative_failure_message
+          "Expected #{@attribute} not to validate the numericality but did"
+        end
+        
+        private 
+        
+        def validation_type
+          "ValidatesNumericalityOf"
+        end
+      end
+    end
+  end
+end

data/mongoa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoa}
-  s.version = "0.1.17"
+  s.version = "0.2.1"
 
   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-27}
+  s.date = %q{2010-10-20}
   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 = [
@@ -28,16 +28,20 @@ Gem::Specification.new do |s|
      "lib/mongoa/mongo_mapper/associations/all.rb",
      "lib/mongoa/mongo_mapper/matchers.rb",
      "lib/mongoa/mongo_mapper/validations/validate_base.rb",
+     "lib/mongoa/mongo_mapper/validations/validate_format_of.rb",
      "lib/mongoa/mongo_mapper/validations/validate_inclusion_of.rb",
      "lib/mongoa/mongo_mapper/validations/validate_length_of.rb",
+     "lib/mongoa/mongo_mapper/validations/validate_numericality_of.rb",
      "lib/mongoa/mongo_mapper/validations/validate_presence_of.rb",
      "lib/mongoa/mongo_mapper/validations/validate_uniqueness_of.rb",
      "mongoa.gemspec",
      "spec/assoications/all_spec.rb",
      "spec/matchers_spec.rb",
      "spec/spec_helper.rb",
+     "spec/validations/validate_format_of_spec.rb",
      "spec/validations/validate_inclusion_of_spec.rb",
      "spec/validations/validate_length_of_spec.rb",
+     "spec/validations/validate_numercality_of_spec.rb",
      "spec/validations/validate_presence_of_spec.rb",
      "spec/validations/validate_uniqueness_of_spec.rb"
   ]
@@ -50,8 +54,11 @@ Gem::Specification.new do |s|
     "spec/assoications/all_spec.rb",
      "spec/matchers_spec.rb",
      "spec/spec_helper.rb",
+     "spec/validations/validate_exclusion_of_spec.rb",
+     "spec/validations/validate_format_of_spec.rb",
      "spec/validations/validate_inclusion_of_spec.rb",
      "spec/validations/validate_length_of_spec.rb",
+     "spec/validations/validate_numercality_of_spec.rb",
      "spec/validations/validate_presence_of_spec.rb",
      "spec/validations/validate_uniqueness_of_spec.rb"
   ]

data/spec/assoications/all_spec.rb

@@ -5,7 +5,7 @@ class Post
   key :name, String
   
   has_many :comments
-  has_many :commentwoutfks
+  has_many :comment_w_out_fks
   has_many :embedded_comment_no_specifications
 end
 
@@ -29,7 +29,14 @@ class EmbeddedComment
   belongs_to :post
 end
 
-class CommentWOutFK
+class CommentWOutFk
+  include MongoMapper::Document
+  key :description, String
+  
+  belongs_to :post
+end
+
+class CommentWOutFKAddedDynamicallyOnCreate
   include MongoMapper::Document
   key :description, String
   
@@ -70,7 +77,14 @@ describe Mongoa::MongoMapper do
       
       it "should return false if the belongs_to is present but the foreign key is missing" do
         matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:belongs_to, :post)
-        matcher.should_not be_matches(CommentWOutFK.new)
+        matcher.should_not be_matches(CommentWOutFk.new)
+      end
+      
+      it "should return false if the belongs_to is present but the foreign key exists and it's type is null (indicating that the key was added through a create dynamically and not defined on the class)" do
+        post = Post.create(:name => "my post")
+        CommentWOutFKAddedDynamicallyOnCreate.create(:description => "hello", :post => post)
+        matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:belongs_to, :post)
+        matcher.should_not be_matches(CommentWOutFKAddedDynamicallyOnCreate.new)
       end
     end
     

data/spec/spec_helper.rb

@@ -20,6 +20,19 @@ end
 require 'mongoa'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/mongoa/mongo_mapper/matchers')
 
+class User
+  include MongoMapper::Document
+  
+  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
   

data/spec/validations/validate_exclusion_of_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mongoa::MongoMapper do
+  describe "validates_exclusion_of or key not_in => :true" do
+    describe "#validates_exclusion_of" do
+      context "in" do
+        it "should return true if the key has a validates_exclusion_of validtion and it's value is not in the list" do
+          validation = Mongoa::MongoMapper::Matchers::ValidateExclusionOfMatcher.new(:name)
+          validation.in(%w(admin user)).should be_matches(Post.new)
+        end
+
+        it "should raise an exception if the in is not specified"
+        # it "should return false if the key does not have a validates_presence_of validtion" do
+        #   validation = Mongoa::MongoMapper::Matchers::ValidateExclusionOfMatcher.new(:foo)
+        #   validation.should_not be_matches(Post.new)
+        # end
+        end
+      end
+    end
+  
+    describe "not_in" do
+      # it "should work the same if the key is required rather than validates_presence_of" do
+      #   validation = Mongoa::MongoMapper::Matchers::ValidateExclusionOfMatcher.new(:name)
+      #   validation.should be_matches(PostRequired.new)
+      # 
+      #   validation = Mongoa::MongoMapper::Matchers::ValidateExclusionOfMatcher.new(:foo)
+      #   validation.should_not be_matches(PostRequired.new)
+      # end
+    end
+  end
+end

data/spec/validations/validate_format_of_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mongoa::MongoMapper do
+  describe "validates_format_of or key format => <whatev>" do
+    describe "#validates_format_of" do
+      context "with" do
+        before(:each) do
+          @validation = Mongoa::MongoMapper::Matchers::ValidateFormatOfMatcher.new(:email)
+        end
+        it "should return true if the key has a validates_format_of validtion" do
+          @validation.with(/(\A(\s*)\Z)|(\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z)/i).should be_matches(User.new)
+        end
+        
+        it "should return false if the with doesn't match" do
+          @validation.with(/blah/i).should_not be_matches(User.new)
+        end
+        
+        it "should raise an exception if the required option :with is not specified" do
+          lambda { @validation.matches?(User.new) }.should raise_error(RuntimeError)
+        end
+      end
+      
+      it "should return false if the key does not have a validates_format_of validtion" do
+        validation = Mongoa::MongoMapper::Matchers::ValidateFormatOfMatcher.new(:name)
+        validation.with(/(\A(\s*)\Z)|(\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z)/i).should_not be_matches(User.new)
+      end
+    end
+      
+    describe "format" do
+      it "should work the same if the key is format rather than validates_format_of" do
+        validation = Mongoa::MongoMapper::Matchers::ValidateFormatOfMatcher.new(:email_format)
+        validation.with(/(\A(\s*)\Z)|(\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z)/i).should be_matches(User.new)
+      end
+    end
+  end
+end

data/spec/validations/validate_numercality_of_spec.rb

@@ -0,0 +1,24 @@
+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
+      
+      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
+      
+    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)
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 17
-  version: 0.1.17
+  version: 0.2.1
 platform: ruby
 authors: 
 - Scott J. Tamosunas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -04:00
+date: 2010-10-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,18 +53,23 @@ files:
 - lib/mongoa/mongo_mapper/associations/all.rb
 - lib/mongoa/mongo_mapper/matchers.rb
 - lib/mongoa/mongo_mapper/validations/validate_base.rb
+- lib/mongoa/mongo_mapper/validations/validate_format_of.rb
 - lib/mongoa/mongo_mapper/validations/validate_inclusion_of.rb
 - lib/mongoa/mongo_mapper/validations/validate_length_of.rb
+- lib/mongoa/mongo_mapper/validations/validate_numericality_of.rb
 - lib/mongoa/mongo_mapper/validations/validate_presence_of.rb
 - lib/mongoa/mongo_mapper/validations/validate_uniqueness_of.rb
 - mongoa.gemspec
 - spec/assoications/all_spec.rb
 - spec/matchers_spec.rb
 - spec/spec_helper.rb
+- spec/validations/validate_format_of_spec.rb
 - spec/validations/validate_inclusion_of_spec.rb
 - spec/validations/validate_length_of_spec.rb
+- spec/validations/validate_numercality_of_spec.rb
 - spec/validations/validate_presence_of_spec.rb
 - spec/validations/validate_uniqueness_of_spec.rb
+- spec/validations/validate_exclusion_of_spec.rb
 has_rdoc: true
 homepage: http://github.com/scotttam/mongoa
 licenses: []
@@ -101,7 +106,10 @@ test_files:
 - spec/assoications/all_spec.rb
 - spec/matchers_spec.rb
 - spec/spec_helper.rb
+- spec/validations/validate_exclusion_of_spec.rb
+- spec/validations/validate_format_of_spec.rb
 - spec/validations/validate_inclusion_of_spec.rb
 - spec/validations/validate_length_of_spec.rb
+- spec/validations/validate_numercality_of_spec.rb
 - spec/validations/validate_presence_of_spec.rb
 - spec/validations/validate_uniqueness_of_spec.rb