remarkable_activerecord 3.0.10 → 3.1.0

data/CHANGELOG

@@ -1,5 +1,9 @@
+# v3.1
+
+* Allow validate_presence_of to work with associations [#63]
+
 * Allow validate_uniqueness_of to work when scopes are not stringfiable values.
-  You can now give timestamps, datetime, date and boolean as scopes. [#60]
+  You can now give timestamps, datetime, date and boolean as scopes [#60]
 
 * Allow subjects to be overwriten quickly (quick subjects):
 
@@ -22,7 +26,7 @@
       end
     end
 
-  And the string can be also localized using I18n. [#57]
+  And the string can be also localized using I18n [#57]
 
 [COMPATIBILITY] validate_associated no longer accepts a block to confgure the
 builder:

data/lib/remarkable_activerecord/matchers/validate_presence_of_matcher.rb

@@ -41,7 +41,26 @@ module Remarkable
         optional  :message
 
         collection_assertions :allow_nil?
-        default_options :message => :blank, :allow_nil => false
+        default_options :message => :blank
+
+        protected
+
+          def allow_nil?
+            bad?(blank_value, :message)
+          end
+
+          def blank_value
+            collection? ? [] : nil
+          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
+
       end
 
       # Ensures that the model cannot be saved if one of the attributes listed is not present.

data/spec/validate_presence_of_matcher_spec.rb

@@ -37,7 +37,39 @@ describe 'validate_presence_of' do
       it { should_not validate_presence_of(:category) }
     end
 
-    create_message_specs(self)
+    create_message_specs(self)
+
+    describe 'with belongs to' do
+      def define_and_validate(validation)
+        define_model :category
+
+        define_model :product, :category_id => :integer do
+          belongs_to :category
+          validates_presence_of :category if validation
+        end
+
+        validate_presence_of(:category)
+      end
+
+      it { should define_and_validate(true) }
+      it { should_not define_and_validate(false) }
+    end
+
+    describe 'with has many' do
+      def define_and_validate(validation)
+        define_model :stocks, :product_id => :integer
+
+        define_model :product do
+          has_many :stocks
+          validates_presence_of :stocks if validation
+        end
+
+        validate_presence_of :stocks
+      end
+
+      it { should define_and_validate(true) }
+      it { should_not define_and_validate(false) }
+    end
   end
 
   describe 'macros' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.0.10
+  version: 3.1.0
 platform: ruby
 authors: 
 - Carlos Brando
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 +02:00
+date: 2009-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.10
+        version: 3.1.0
     version: 
 description: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 email: