nested_validator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDVlMmQxNWU4MjFkZjYxMmZkY2I2OGVlNzM0YzE4NzcwMGMwMjExYw==
+    YWYzM2NmNDIzYTkxOTM5NDc1ZGMyNGFlODA4Y2M2NGI2NGQxNTRiMw==
   data.tar.gz: !binary |-
-    MTk5MmQ5MmRmMWE4NGZjMzQxOGU2ZWUwNWRiMWMyMDI3NTAwNWZmMA==
+    ODRmZTNjYTcyY2VhODI5ODY3YjlmOTMwMzk5M2VmODY2MmNhNDk5Yw==
 SHA512:
   metadata.gz: !binary |-
-    YjNiNDNhNjc0YTBkYzQzN2ViMzViNDY4M2YzODZmYWMyYzQ2ZTY2NWI2M2Yy
-    YTQ3NWE3OGRmNjA4YmIzNGNlMTY5NDgyMzJiYWQyNDQwYzE1MTIyMmY3MmM5
-    NzA3M2E0YjczMDk5N2Y2NzA1Mjg1OGU0MDE2M2NhODVjMDkxM2U=
+    MTRhMjg2NTgyMGQ2MDEyMjY4NzM3NjQ0NjdkYzIxOTlmOTk5M2JmNGRiNjhk
+    NTgwYmU1NDg5M2M1YzczNGE3MTcwODZjZjYzOWU0MzA5ZDkyNDEyYzkzNmFh
+    ZjlkZTZjMjAyMWUxMWQ1ZThkM2IzM2ExMWVlYTBiOTRhNDM4MmM=
   data.tar.gz: !binary |-
-    OGJjZDAyOTMzYWNjNzgwZmY2YzYzMWNkYTA3OTIxNWVhNDM0MDVhNjk0OGVk
-    MDU0YWJmY2FkMGI5MTdlZTcyM2ExMjBlNWQ1NjllYTI3MmQyN2IxZjc0OWM5
-    OTE2MGI3ZWU0MjkyNzAyZTQ0Y2M0ZWYyMzQzOWMyYWE0MjJlZWI=
+    NGM2YzJhN2I5MmM2NmNmMjkwZmU1NDg3NzBhOWYyZWZlMWY3NzE2MjAzOTg0
+    Y2QxYTlkMGM2YzRmMTUxNzZlNWM3YzNhZjBlZmFmNTUzY2QzODVjMGM2YzYz
+    YzY0NjE1MWY5ZmI1ZWNmYjFiNjI5ODhkZTgxZTM0ODU5M2EzM2E=

data/.gitignore

@@ -0,0 +1,4 @@
+.yardoc
+coverage
+doc
+pkg

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nested_validator (1.0.0)
+    nested_validator (1.0.1)
       activemodel
 
 GEM

data/README.md

@@ -1,7 +1,7 @@
-[![Gem Version](https://badge.fury.io/rb/percentable.png)](http://badge.fury.io/rb/percentable)
-[![Build Status](https://travis-ci.org/ericroberts/percentable.png?branch=master)](https://travis-ci.org/ericroberts/percentable)
-[![Code Climate](https://codeclimate.com/github/ericroberts/percentable.png)](https://codeclimate.com/github/ericroberts/percentable)
-[![Coverage Status](https://coveralls.io/repos/ericroberts/percentable/badge.png?branch=master)](https://coveralls.io/r/ericroberts/percentable?branch=master)
+[![Gem Version](https://badge.fury.io/rb/nested_validator.png)](https://badge.fury.io/rb/nested_validator.png)
+[![Build Status](https://travis-ci.org/dwhelan/nested_validator.png?branch=master)](https://travis-ci.org/dwhelan/nested_validator)
+[![Code Climate](https://codeclimate.com/github/dwhelan/nested_validator.png)](https://codeclimate.com/github/dwhelan/nested_validator)
+[![Coverage Status](https://coveralls.io/repos/dwhelan/nested_validator/badge.png)](https://coveralls.io/r/dwhelan/nested_validator)
 
 # Nested Validator
 

data/lib/nested_validator/nested_validator.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/array'
 
 module ActiveModel
   module Validations
+
     class NestedValidator < EachValidator
 
       private
@@ -63,8 +64,54 @@ module ActiveModel
     end
 
     module HelperMethods
-      def validates_nested(*attributes)
-        validates_with NestedValidator, _merge_attributes(attributes)
+      # Bases an object's validity on nested attr_names.
+      #
+      #   class Parent < ActiveRecord::Base
+      #     has_one :child
+      #
+      #     validates_nested :child
+      #   end
+      #
+      #   class Child < ActiveRecord::Base
+      #     has_one :child
+      #
+      #     validates_presence_of :attribute
+      #   end
+      #
+      # Any errors in the child will be copied to the parent using the child's name as
+      # a prefix for the error:
+      #
+      #   puts parent.errors.messages #=> { :'child attribute' => ["can't be blank"] }
+      #
+      # @param attr_names attribute names followed with options
+      #
+      # @option attr_names [String] :prefix The prefix to use instead of the attribute name
+      #
+      # @option attr_names [String, Array] :only The name(s) of attr_names to include
+      #   when validating. Default is <tt>all</tt>
+      #
+      # @option attr_names [String, Array] :except The name(s) of attr_names to exclude
+      #   when validating. Default is <tt>none</tt>
+      #
+      # @option attr_names [Symbol] :on Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
+      #
+      # @option attr_names  [Symbol, String or Proc] :if a method, proc or string to call to determine
+      #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
+      #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a true or false value.
+      #
+      # @option attr_names [[Symbol, String or Proc]] :unless a method, proc or string to call to determine
+      #   if the validation should not occur (e.g. <tt>unless: :skip_validation</tt>,
+      #   or <tt>unless: Proc.new { |user| user.signup_step <= 2 }</tt>). The method,
+      #   proc or string should return or evaluate to a true or false value.
+      #
+      # @option attr_names [boolean] :strict Specifies whether validation should be strict.
+      #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
+      #
+      def validates_nested(*attr_names)
+        validates_with NestedValidator, _merge_attributes(attr_names)
       end
     end
   end

data/lib/nested_validator/validate_nested_matcher.rb

@@ -28,8 +28,9 @@ RSpec::Matchers.define :validate_nested do |child_name|
     self.parent      = parent
 
     return false unless parent.respond_to? child_name
-
     self.actual_keys = (error_keys_when_child_validity_is(false) - error_keys_when_child_validity_is(true))
+    return false if invalid_child_keys.present?
+
 
     actual_keys == expected_keys
   end
@@ -89,10 +90,8 @@ RSpec::Matchers.define :validate_nested do |child_name|
 
   failure_message do
     case
-      when !parent.respond_to?(child_name)
-        "#{parent} doesn't respond to #{show child_name}"
-      when invalid_child_keys.present?
-        "#{child_name} doesn't respond to #{show invalid_child_keys}"
+      when common_failure_message
+        common_failure_message
       when (missing_child_keys = expected_child_keys - actual_child_keys - invalid_child_keys - [TEST_KEY]).present?
         "#{parent} doesn't nest validations for: #{show missing_child_keys}"
       when actual_keys.empty?
@@ -110,12 +109,10 @@ RSpec::Matchers.define :validate_nested do |child_name|
 
   failure_message_when_negated do
     case
-      when !parent.respond_to?(child_name)
-        "#{parent} doesn't respond to #{show child_name}"
+      when common_failure_message
+        common_failure_message
       when (extras = only_keys & actual_child_keys).present?
-          "#{parent} does nest #{show child_name} validations for: #{show extras}"
-      when invalid_child_keys.present?
-          "#{child_name} doesn't respond to #{show invalid_child_keys}"
+        "#{parent} does nest #{show child_name} validations for: #{show extras}"
       when except_keys.present?
           "#{parent} doesn't nest #{show child_name} validations for: #{show except_keys - actual_child_keys}"
       when prefix.present?
@@ -125,6 +122,11 @@ RSpec::Matchers.define :validate_nested do |child_name|
     end
   end
 
+  def common_failure_message
+    return "#{parent} doesn't respond to #{show child_name}" unless parent.respond_to?(child_name)
+    "#{child_name} doesn't respond to #{show invalid_child_keys}" if  invalid_child_keys.present?
+  end
+
   def show(value)
     Array.wrap(value).map{|key| key.is_a?(Symbol) ? ":#{key}" : key.to_s}.join(', ')
   end

data/lib/nested_validator/version.rb

@@ -1,3 +1,3 @@
 module NestedValidator
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/lib/nested_validator/nested_validator_spec.rb

@@ -86,10 +86,16 @@ describe NestedValidator do
         its('errors.messages') { should eq :'child1 attribute1' => ["can't be blank"] }
       end
 
-      describe 'with "prefix: "OMG""' do
+      describe 'with "prefix: "OMG"', :focus do
         subject { with_nested_options prefix: 'OMG' }
 
-        its('errors.messages') { should eq :'OMG attribute1' => ["can't be blank"] }
+        its('errors.messages') { puts subject.errors.messages; should eq :'OMG attribute1' => ["can't be blank"] }
+      end
+
+      describe 'with "prefix: ""' do
+        subject { with_nested_options prefix: '' }
+
+        its('errors.messages') { should eq :'attribute1' => ["can't be blank"] }
       end
     end
 

data/spec/lib/nested_validator/validate_nested_matcher_spec.rb

@@ -38,8 +38,9 @@ describe 'validates_nested with [parent class with "validates, child1]"' do
     }
   end
 
-  let(:parent)  { parent_class.new child_class.new, child_class.new }
-  let(:options) { { presence: true } }
+  let(:parent)    { parent_class.new child_class.new, child_class.new }
+  let(:options)   { { nested: true } }
+  let(:validator) { instance_eval self.class.description }
 
   before { parent_class.class_eval "validates :child1, #{options}" }
 
@@ -57,7 +58,6 @@ describe 'validates_nested with [parent class with "validates, child1]"' do
     end
 
     context 'nested: {prefix: "OMG"}' do
-
       it { should validate_nested(:child1).with_prefix('OMG') }
       it { should validate_nested(:child1).with_prefix(:OMG) }
 
@@ -99,8 +99,6 @@ describe 'validates_nested with [parent class with "validates, child1]"' do
   end
 
   describe 'its description for:' do
-    let(:validator) { instance_eval self.class.description }
-
     subject { validator.description }
 
     context('validate_nested(:child1)')                     { it { should eq 'validate nested :child1' } }
@@ -110,17 +108,28 @@ describe 'validates_nested with [parent class with "validates, child1]"' do
   end
 
   describe 'its error messages:' do
-    let(:options)   { self.class.parent.description }
-    let(:validator) { instance_eval self.class.description }
+    let(:options)      { self.class.parent.description }
+    let(:expect_match) { false }
 
-    describe 'should failure messages for' do
-      before { expect(validator.matches? parent).to be false }
+    before { expect(validator.matches? parent).to be expect_match }
+
+    describe 'failures for should and should_not' do
+      [:failure_message, :failure_message_when_negated].each do |message|
+        subject { validator.send message }
 
+        context 'nested: true' do
+          describe('validate_nested(:invalid_child_name)')                     { it { should eq "parent doesn't respond to :invalid_child_name" } }
+          describe('validate_nested(:child1).only(:invalid_attribute_name)')   { it { should eq "child1 doesn't respond to :invalid_attribute_name" } }
+          describe('validate_nested(:child1).except(:invalid_attribute_name)') { it { should eq "child1 doesn't respond to :invalid_attribute_name"  } }
+        end
+      end
+    end
+
+    describe 'should failure messages for' do
       subject { validator.failure_message }
 
       context 'nested: true' do
-        describe('validate_nested(:child2)')             { it { should eq "parent doesn't nest validations for :child2" } }
-        describe('validate_nested(:invalid_child_name)') { it { should eq "parent doesn't respond to :invalid_child_name" } }
+        describe('validate_nested(:child2)') { it { should eq "parent doesn't nest validations for :child2" } }
       end
 
       context 'nested: {prefix: :OMG}' do
@@ -129,20 +138,18 @@ describe 'validates_nested with [parent class with "validates, child1]"' do
       end
 
       context 'nested: {only: :attribute1}' do
-        describe('validate_nested(:child1).only(:invalid_attribute_name)')  { it { should eq "child1 doesn't respond to :invalid_attribute_name" } }
         describe('validate_nested(:child1).only(:attribute2)')              { it { should eq "parent doesn't nest validations for: :attribute2"  } }
         describe('validate_nested(:child1).only(:attribute1, :attribute2)') { it { should eq "parent doesn't nest validations for: :attribute2"  } }
       end
 
       context 'nested: {except: :attribute1}' do
-        describe('validate_nested(:child1).except(:invalid_attribute_name)')  { it { should eq "child1 doesn't respond to :invalid_attribute_name"  } }
         describe('validate_nested(:child1).except(:attribute2)')              { it { should eq 'parent does nest validations for: :attribute2' } }
         describe('validate_nested(:child1).except(:attribute1, :attribute2)') { it { should eq 'parent does nest validations for: :attribute2' } }
       end
     end
 
     describe 'should_not failure messages for' do
-      before { expect(validator.matches? parent).to be true }
+      let(:expect_match) { true }
 
       subject { validator.failure_message_when_negated }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Declan Whelan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel