standalone_validator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4868f5c6e7fb2d79339602a81cdbe6dd952605c8
-  data.tar.gz: c2e756efc4ec3a2b02f72231946369d663e378b1
+  metadata.gz: 5240e1091aa1fd4290b125cb6d22cf2a3cd33c2b
+  data.tar.gz: fdf9ef36aedb36bc40cfdcf614e0c404294c0f8e
 SHA512:
-  metadata.gz: 962ddadc9c26f336502212fa747114a50200d08e90f5af05076eb64f605c2d1ea1b0df3fd32d6b77eb216ac888d1066b450a3bb38fd87ece2d61b61dfad62b43
-  data.tar.gz: 2f03ddb81348c6b48ba55c0d1b5e92ee434ec8a39eb4fd4fe760450e0b3d8626285bab29d41b797e0e84dcf8b635703f0611caead9e5847fcb70edf1d493588e
+  metadata.gz: f9dfd502615a818b236e367367d4ac8102848bf7e0ed13c8c37c41b1c000ce7030b40299007c9c94a389744a446bef026cfbbc9bb86000476db0edab063cf645
+  data.tar.gz: e212f3ce900f2b2ed9abece568defc32fa05bb3ef88178be2bfe025dd32f56c24174f6da6067c00c06fd202a79a7353673c90df344e9fcd99c33956c2f1e5f30

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
+  - "2.1.0"
   - "jruby-19mode"
-  - "rbx-19mode"
+  - "rbx"
 bundler_args: --binstubs --without debugging
 before_install:
   - gem install bundler

data/lib/standalone_validator/named_validations/common_rails_options.rb

@@ -29,8 +29,6 @@ class StandaloneValidator
       module ClassMethods
         def include_validation(&block)
           super do |object, result|
-            condition = CommonRailsOptions.condition_for(options)
-
             if condition.call(object)
               instance_exec(object, result, &block)
             end
@@ -48,6 +46,10 @@ class StandaloneValidator
     private
       attr_reader :attributes, :options
 
+      def condition
+        @condition ||= CommonRailsOptions.condition_for(options)
+      end
+
       def each_validated_attribute_on(object)
         return to_enum(:each_validated_attribute, object) unless block_given?
 

data/lib/standalone_validator/named_validations/validates_presence_of.rb

@@ -16,8 +16,8 @@ class StandaloneValidator
         end
       end
 
-      def requires_field?(field)
-        attributes.include?(field.to_sym)
+      def requires_field?(field, object)
+        attributes.include?(field.to_sym) && condition.call(object)
       end
     end
   end

data/lib/standalone_validator/version.rb

@@ -1,3 +1,3 @@
 class StandaloneValidator
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/standalone_validator.rb

@@ -81,12 +81,12 @@ class StandaloneValidator
     validation_result
   end
 
-  def requires_field?(field)
+  def requires_field?(field, object)
     return true if self.class.required_fields.include?(field.to_sym)
 
     validations.any? do |validation|
       if validation.respond_to?(:requires_field?)
-        validation.requires_field?(field)
+        validation.requires_field?(field, object)
       end
     end
   end

data/spec/named_validations/validates_presence_of_spec.rb

@@ -46,8 +46,23 @@ module StandaloneValidator::NamedValidations
 
     it "requires the attributes it was given on construction" do
       validator = ValidatesPresenceOf.new :foo
-      expect(validator.requires_field?(:foo)).to be_true
-      expect(validator.requires_field?(:bar)).to be_false
+      expect(validator.requires_field?(:foo, nil)).to be_true
+      expect(validator.requires_field?(:bar, nil)).to be_false
+    end
+
+    context "if it was given a conditional" do
+      it "uses the conditional to decide if a field is required" do
+        validator = ValidatesPresenceOf.new(:foo, if: :bar)
+
+        requires       = double(foo: blank_value, bar: true)
+        doesnt_require = double(foo: blank_value, bar: false)
+
+        result = validator.requires_field?(:foo, requires)
+        expect(result).to be_true
+
+        result = validator.requires_field?(:foo, doesnt_require)
+        expect(result).to be_false
+      end
     end
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: standalone_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Renato Zannon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -103,9 +103,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -135,17 +135,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: PORO standalone validators compatible with ActiveRecord