context_validations 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1886594767f1f8f0d780368a10a173a2f9ce5149
-  data.tar.gz: 41eac3490683767852f92a55064003a213800583
+  metadata.gz: 73cdca917a7c501806a934a2a078dee76089ce0e
+  data.tar.gz: 28a7ab80f6cadfc68e930a3c605f8d5228c08fef
 SHA512:
-  metadata.gz: 9358334e44c7103ddf6a47db980e4774ffe067fb4095afc7c1e2d5d0269257a82342d382ca58d0644c7c7a7232200046d1eeaaf159ae1e1a4f31c1ed33690307
-  data.tar.gz: 0750e6349b8b8d5a31f2333050295d12ad0a923b23ef414580638ae3b701d8731b77a95fc5a878e5101804de68f32c459914e1eabb1a92f89714cc78ee258841
+  metadata.gz: b0178c54af6220b49ce4cd14366827130c6dcad234a2bb2f44af889224b14ae55adcdf29c697d25820ec4808f93a12b232f23de5d81a664bf461484a645c6da2
+  data.tar.gz: e05af07a17649aef1991cfc013851f8a945e0d7ef1093d464c7a898a6ad233488fbd083a15ad118b6759fa27602de97749528a77c480cb8b19e300c16a1e8845

data/CONTRIBUTING.md

@@ -16,7 +16,7 @@ If you'd like to submit a pull request please adhere to the following:
 4. Single-quotes instead of double-quotes unless you are using string
    interpolation or escapes.
 5. General Rails/Ruby naming conventions for files and classes
-6. *Do not* use Ruby 1.9 stubby proc syntax
+6. *Do not* use Ruby 1.9 stabby proc syntax
 
 Please note that you must adhere to each of the above mentioned rules.
 Failure to do so will result in an immediate closing of the pull

data/README.md

@@ -137,6 +137,12 @@ We highly recommend using [ValidAttribute](https://github.com/bcardarella/valid_
 
 ### MiniTest ###
 
+In `/test/test_helper.rb`:
+
+```ruby
+require 'context_validations/minitest'
+```
+
 You are given access to a `#validations_for(:action_name)` method. You should pass the action in your
 controller that is the context of the validations and use the `#validations=` setter on the model.
 

data/lib/context_validations/model.rb

@@ -32,7 +32,25 @@ module ContextValidations::Model
       if validator.respond_to?(:setup)
         validator.setup(self.class)
       end
-      validator.validate(self)
+      if validator.options[:if]
+        if validator.options[:if].respond_to?(:call)
+          if validator.options[:if].call(self)
+            validator.validate(self)
+          end
+        elsif self.send(validator.options[:if])
+          validator.validate(self)
+        end
+      elsif validator.options[:unless]
+        if validator.options[:unless].respond_to?(:call)
+          if !validator.options[:unless].call(self)
+            validator.validate(self)
+          end
+        elsif !self.send(validator.options[:unless])
+          validator.validate(self)
+        end
+      else
+        validator.validate(self)
+      end
     end
     errors.empty?
   end

data/lib/context_validations/version.rb

@@ -1,3 +1,3 @@
 module ContextValidations
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/test/model_test.rb

@@ -26,4 +26,21 @@ describe 'Model' do
     @user.valid?.must_equal false
     @user.errors.count.must_equal 2
   end
+
+  it 'respect conditional validations set onto the instance' do
+    validations = [
+      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :if => :can_validate?),
+      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :if => Proc.new { |model| model.can_validate? }),
+      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :unless => :cannot_validate?),
+      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :unless => Proc.new { |model| model.cannot_validate? })
+    ]
+    def @user.can_validate?
+      false
+    end
+    def @user.cannot_validate?
+      true
+    end
+    @user.validations = validations
+    @user.valid?.must_equal true
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: context_validations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport