mongoa 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/mongoa/integrations/rspec2.rb

@@ -3,6 +3,7 @@ require 'mongoa/mongo_mapper/matchers'
 module RSpec
   module Matchers
     include Mongoa::MongoMapper::Matchers
+    # include Mongoa::MongoMapper::ValidateMatcher
   end
 end
 

data/lib/mongoa/mongo_mapper/association_matcher.rb

@@ -27,6 +27,7 @@ module Mongoa
           return false
         end
         @subject = subject
+        
         result = (association_exists? && macro_correct?)
         result = foreign_key_exists? if result && macro == :belongs_to && !subject.class.embeddable?
         result

data/lib/mongoa/mongo_mapper/matchers.rb

@@ -1,5 +1,6 @@
-require 'mongoa/mongo_mapper/associations'
+require 'mongoa/mongo_mapper/improvements/mongo_mapper_associations'
 require 'mongoa/mongo_mapper/association_matcher'
+require 'mongoa/mongo_mapper/validations'
 
 module Mongoa
   module MongoMapper

data/lib/mongoa/mongo_mapper/validations.rb

@@ -1,47 +1,44 @@
 module Mongoa
   module MongoMapper
     module Matchers
-      
       def validate_presence_of(attr)
-        ValidatePresenceOfMatcher.new(attr)
+        ValidateMatcher.new("ValidatesPresenceOf", attr)
       end
+    end
 
-      class ValidatePresenceOfMatcher < ValidationMatcher
-
-        def with_message(message)
-          @expected_message = message if message
-          self
-        end
-
-        def matches?(subject)
-          super(subject)
-          @expected_message ||= :blank
-          disallows_value_of(blank_value, @expected_message)
-        end
+    class ValidateMatcher
+      attr_reader :validation_type
+      attr_reader :attribute
+      
+      def initialize(validation_type, attribute)
+        @validation_type = validation_type
+        @attribute = attribute
+      end
 
-        def description
-          "require #{@attribute} to be set"
-        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
 
-        private
+      def description
+        "require #{@attribute} to be set"
+      end
 
-        def blank_value
-          if collection?
-            []
-          else
-            nil
-          end
-        end
+      def failure_message
+        "#{@attribute} to be a required field (validates_presence_of) but was not"
+      end
 
-        def collection?
-          if reflection = @subject.class.reflect_on_association(@attribute)
-            [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
-          else
-            false
-          end
-        end
+      def negative_failure_message
+        "#{@attribute} to not be a required field (validates_presence_of), but it was"
       end
       
+      private
+
+      def model_class
+        @subject.class
+      end
     end
   end
 end

data/mongoa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoa}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   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-09}
+  s.date = %q{2010-08-11}
   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 = [
@@ -26,13 +26,14 @@ Gem::Specification.new do |s|
      "lib/mongoa.rb",
      "lib/mongoa/integrations/rspec2.rb",
      "lib/mongoa/mongo_mapper/association_matcher.rb",
-     "lib/mongoa/mongo_mapper/associations.rb",
+     "lib/mongoa/mongo_mapper/improvements/mongo_mapper_associations.rb",
      "lib/mongoa/mongo_mapper/matchers.rb",
      "lib/mongoa/mongo_mapper/validations.rb",
      "mongoa.gemspec",
-     "spec/mongoa_spec.rb",
+     "spec/association_matcher_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/validation_matcher_spec.rb"
   ]
   s.homepage = %q{http://github.com/scotttam/mongoa}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -40,8 +41,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Like Shoulda but for MongoMapper.}
   s.test_files = [
-    "spec/mongoa_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/association_matcher_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/validation_matcher_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/association_matcher_spec.rb

@@ -0,0 +1,81 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class Post
+  include MongoMapper::Document
+  key :name, String
+  
+  has_many :comments
+  has_many :commentwoutfks
+  has_many :embedded_comment_no_specifications
+end
+
+class PostWOutHM
+  include MongoMapper::Document
+  key :name, String
+end
+
+class Comment
+  include MongoMapper::Document
+  key :description, String
+  key :post_id, ObjectId
+  
+  belongs_to :post
+end
+
+class EmbeddedComment
+  include MongoMapper::EmbeddedDocument
+  key :description, String
+  
+  belongs_to :post
+end
+
+class CommentWOutFK
+  include MongoMapper::Document
+  key :description, String
+  
+  belongs_to :post
+end
+
+class EmbeddedCommentNoSpecification
+  include MongoMapper::EmbeddedDocument
+end
+
+describe Mongoa::MongoMapper::Matchers do
+  describe "#belongs_to" do
+    describe "document" do
+      it "should return true of the belongs_to relationship is specified and the foreign key is present" do
+        matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:belongs_to, :post)
+        matcher.should be_matches(Comment.new)
+      end
+      
+      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)
+      end
+    end
+    
+    describe "embedded" do
+      it "should return true if the belongs_to relationship is specified" do
+        matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:belongs_to, :post)
+        matcher.should be_matches(EmbeddedComment.new)
+      end
+      
+      it "should return false if the belongs_to relationship is not specified" do
+        matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:belongs_to, :post)
+        matcher.should_not be_matches(EmbeddedCommentNoSpecification.new)
+      end
+    end
+  end
+  
+  describe "#has_many" do
+    it "should return true if the has_many relationship is specified" do
+      matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:has_many, :comments)
+      matcher.should be_matches(Post.new)
+    end
+    
+    it "should return false of the has_many relationship is not specified" do
+      matcher = Mongoa::MongoMapper::MongoAssociationMatcher.new(:has_many, :comments)
+      matcher.should_not be_matches(PostWOutHM.new)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,23 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongoa'
-require 'spec'
-require 'spec/autorun'
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
+# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'mongo_mapper'
+require 'mongo_mapper/plugins'
+require 'mongo_mapper/plugins/associations'
+
+config = {
+    'test' => {'host' => 'localhost', 'port' => 27017, 'database' => 'mongoa_test'},
+}
+
+MongoMapper.config = config
+MongoMapper.connect("test")
+
+require 'rspec'
 
-Spec::Runner.configure do |config|
-  
+Rspec.configure do |config|
+ 
 end
+
+require 'mongoa'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/mongoa/mongo_mapper/association_matcher')
+

data/spec/validation_matcher_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class Post
+  include MongoMapper::Document
+  
+  key :name, String
+  
+  validates_presence_of :name
+end
+
+class PostRequired
+  include MongoMapper::Document
+  
+  key :name, String, :required => true
+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)
+    end
+
+    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)
+    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)
+
+      validation = Mongoa::MongoMapper::ValidateMatcher.new("ValidatesPresenceOf", :foo)
+      validation.should_not be_matches(PostRequired.new)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Scott J. Tamosunas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -04:00
+date: 2010-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,13 +51,14 @@ files:
 - lib/mongoa.rb
 - lib/mongoa/integrations/rspec2.rb
 - lib/mongoa/mongo_mapper/association_matcher.rb
-- lib/mongoa/mongo_mapper/associations.rb
+- lib/mongoa/mongo_mapper/improvements/mongo_mapper_associations.rb
 - lib/mongoa/mongo_mapper/matchers.rb
 - lib/mongoa/mongo_mapper/validations.rb
 - mongoa.gemspec
-- spec/mongoa_spec.rb
+- spec/association_matcher_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/validation_matcher_spec.rb
 has_rdoc: true
 homepage: http://github.com/scotttam/mongoa
 licenses: []
@@ -91,5 +92,6 @@ signing_key:
 specification_version: 3
 summary: Like Shoulda but for MongoMapper.
 test_files: 
-- spec/mongoa_spec.rb
+- spec/association_matcher_spec.rb
 - spec/spec_helper.rb
+- spec/validation_matcher_spec.rb

data/spec/mongoa_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Mongoa" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end