nested_validator 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWYzM2NmNDIzYTkxOTM5NDc1ZGMyNGFlODA4Y2M2NGI2NGQxNTRiMw==
+    NjkwYmI4M2ZlNjJmY2MwNmM5NzcyYmMxOTE4OGIyMDFhYjk2YWI2MA==
   data.tar.gz: !binary |-
-    ODRmZTNjYTcyY2VhODI5ODY3YjlmOTMwMzk5M2VmODY2MmNhNDk5Yw==
+    ODkyMzQ1YTYwZWI0MTA2ODdiY2RlNjI2Y2IwM2JkMjE1ODYxODRhOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTRhMjg2NTgyMGQ2MDEyMjY4NzM3NjQ0NjdkYzIxOTlmOTk5M2JmNGRiNjhk
-    NTgwYmU1NDg5M2M1YzczNGE3MTcwODZjZjYzOWU0MzA5ZDkyNDEyYzkzNmFh
-    ZjlkZTZjMjAyMWUxMWQ1ZThkM2IzM2ExMWVlYTBiOTRhNDM4MmM=
+    M2UzMDY5YTNiNzZkNDcwMTk0YmFjZWExZGM5ZWYyMmNhM2E5NDJiMDkzOTJj
+    Nzk4Zjk4ODM5OTQ0YTI0ZmM2OTVmODE5NjFhZmI3MDg2OWYyM2NkMDExNWQ3
+    NjA4NGNiN2EzMWM3YTQyM2IwMzU1ZDVjYzEwYjA3ODhlZmRhNTk=
   data.tar.gz: !binary |-
-    NGM2YzJhN2I5MmM2NmNmMjkwZmU1NDg3NzBhOWYyZWZlMWY3NzE2MjAzOTg0
-    Y2QxYTlkMGM2YzRmMTUxNzZlNWM3YzNhZjBlZmFmNTUzY2QzODVjMGM2YzYz
-    YzY0NjE1MWY5ZmI1ZWNmYjFiNjI5ODhkZTgxZTM0ODU5M2EzM2E=
+    MzhhNTE1NGI2YThlZGY5ZjU0NjE3MTMzMDY3YWMzNWYzZTFiM2M0MGY4ZmZm
+    ZGMyNTE3ZDI1ZjI3MjM4YWEyZWU5ZWVlNjllNDRiNGRlYjVhYTJjNGIyNTNi
+    NjUwZWFiNmI2OGQxZmQwZDM4ZTBiMzI0YjcwZjQ4ODY3MmM4MDY=

data/Gemfile.lock

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

data/lib/nested_validator/nested_validator.rb

@@ -3,7 +3,9 @@ require 'active_support/core_ext/array'
 
 module ActiveModel
   module Validations
-
+    # Bases an object's validity on nested attributes.
+    #
+    # @see ActiveModel::Validations::HelperMethods#validates_nested validates_nested
     class NestedValidator < EachValidator
 
       private
@@ -64,7 +66,7 @@ module ActiveModel
     end
 
     module HelperMethods
-      # Bases an object's validity on nested attr_names.
+      # Bases an object's validity on nested attributes.
       #
       #   class Parent < ActiveRecord::Base
       #     has_one :child
@@ -110,6 +112,8 @@ module ActiveModel
       # @option attr_names [boolean] :strict Specifies whether validation should be strict.
       #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
       #
+      # @see ActiveModel::Validations::NestedValidator
+
       def validates_nested(*attr_names)
         validates_with NestedValidator, _merge_attributes(attr_names)
       end

data/lib/nested_validator/validate_nested_matcher.rb

@@ -11,127 +11,129 @@
 #       it { should validate_nested(:child).only(:attribute1, :attribute2) }
 #       it { should validate_nested(:child).except(:attribute1) }
 #     end
+if defined? RSpec
 
-RSpec::Matchers.define :validate_nested do |child_name|
+  RSpec::Matchers.define :validate_nested do |child_name|
 
-  attr_accessor :child_name, :prefix, :only_keys, :except_keys # inputs
-  attr_accessor :parent, :actual_keys
+    attr_accessor :child_name, :prefix, :only_keys, :except_keys # inputs
+    attr_accessor :parent, :actual_keys
 
-  TEST_KEY ||= :__test_key__
+    TEST_KEY ||= :__test_key__
 
-  match do |parent|
-    self.prefix      ||= ''
-    self.only_keys   ||= []
-    self.except_keys ||= []
+    match do |parent|
+      self.prefix      ||= ''
+      self.only_keys   ||= []
+      self.except_keys ||= []
 
-    self.child_name  = child_name
-    self.parent      = parent
+      self.child_name  = 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?
+      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
+      actual_keys == expected_keys
+    end
 
-  chain(:with_prefix) { |prefix|  self.prefix      = prefix }
-  chain(:only)        { |*only|   self.only_keys   = only   }
-  chain(:except)      { |*except| self.except_keys = except }
+    chain(:with_prefix) { |prefix|  self.prefix      = prefix }
+    chain(:only)        { |*only|   self.only_keys   = only   }
+    chain(:except)      { |*except| self.except_keys = except }
 
-  def child
-    parent.send child_name
-  end
+    def child
+      parent.send child_name
+    end
 
-  def error_keys_when_child_validity_is(valid)
-    child_error_keys = combine TEST_KEY, only_keys, except_keys
-    child_errors = child_error_keys.inject({}){|result, key| result[key] = ['error message'];result }
+    def error_keys_when_child_validity_is(valid)
+      child_error_keys = combine TEST_KEY, only_keys, except_keys
+      child_errors = child_error_keys.inject({}){|result, key| result[key] = ['error message'];result }
 
-    allow(child).to receive(:valid?) { valid }
-    allow(child).to receive(:errors) { valid ? [] : child_errors }
+      allow(child).to receive(:valid?) { valid }
+      allow(child).to receive(:errors) { valid ? [] : child_errors }
 
-    parent.valid?
-    parent.errors.keys
-  end
+      parent.valid?
+      parent.errors.keys
+    end
 
-  def expected_keys
-    expected_child_keys.map{|key| :"#{expected_prefix} #{key}"}
-  end
+    def expected_keys
+      expected_child_keys.map{|key| :"#{expected_prefix} #{key}"}
+    end
 
-  def expected_prefix
-    prefix.present? ? prefix : child_name
-  end
+    def expected_prefix
+      prefix.present? ? prefix : child_name
+    end
 
-  def actual_prefix
-    :"#{actual_keys.first.to_s.split.first}"
-  end
+    def actual_prefix
+      :"#{actual_keys.first.to_s.split.first}"
+    end
 
-  def expected_child_keys
-    expected_keys = only_keys.present? ? only_keys : [TEST_KEY]
-    unique_except_keys = except_keys - only_keys
-    combine expected_keys - unique_except_keys
-  end
+    def expected_child_keys
+      expected_keys = only_keys.present? ? only_keys : [TEST_KEY]
+      unique_except_keys = except_keys - only_keys
+      combine expected_keys - unique_except_keys
+    end
 
-  def actual_child_keys
-    actual_keys.map{|key| key.to_s.sub(/^.*\s+/, '').to_sym }
-  end
+    def actual_child_keys
+      actual_keys.map{|key| key.to_s.sub(/^.*\s+/, '').to_sym }
+    end
 
-  def invalid_child_keys
-    (only_keys + except_keys).reject{|key| child.respond_to? key}
-  end
+    def invalid_child_keys
+      (only_keys + except_keys).reject{|key| child.respond_to? key}
+    end
 
-  description do
-    message =  "validate nested #{show child_name}"
-    message << " with only: #{show only_keys}" if only_keys.present?
-    message << " except: #{show except_keys}"  if except_keys.present?
-    message << " with prefix #{show prefix}"   if prefix.present?
-    message
-  end
+    description do
+      message =  "validate nested #{show child_name}"
+      message << " with only: #{show only_keys}" if only_keys.present?
+      message << " except: #{show except_keys}"  if except_keys.present?
+      message << " with prefix #{show prefix}"   if prefix.present?
+      message
+    end
 
-  failure_message do
-    case
-      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?
-        "parent doesn't nest validations for #{show child_name}"
-      when actual_prefix != expected_prefix
-        if prefix.present?
-          "parent uses a prefix of #{show actual_prefix} rather than #{show expected_prefix}"
+    failure_message do
+      case
+        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?
+          "parent doesn't nest validations for #{show child_name}"
+        when actual_prefix != expected_prefix
+          if prefix.present?
+            "parent uses a prefix of #{show actual_prefix} rather than #{show expected_prefix}"
+          else
+            "parent has a prefix of #{show actual_prefix}. Are you missing '.with_prefix(#{show actual_prefix})'?"
+          end
         else
-          "parent has a prefix of #{show actual_prefix}. Are you missing '.with_prefix(#{show actual_prefix})'?"
-        end
-      else
-        "parent does nest validations for: #{show except_keys & actual_child_keys}"
+          "parent does nest validations for: #{show except_keys & actual_child_keys}"
+      end
     end
-  end
 
-  failure_message_when_negated do
-    case
-      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 except_keys.present?
-          "#{parent} doesn't nest #{show child_name} validations for: #{show except_keys - actual_child_keys}"
-      when prefix.present?
-        "#{parent} does nest validations for: #{show child_name} with a prefix of #{show prefix}"
-      else
-        "#{parent} does nest validations for: #{show child_name}"
+    failure_message_when_negated do
+      case
+        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 except_keys.present?
+            "#{parent} doesn't nest #{show child_name} validations for: #{show except_keys - actual_child_keys}"
+        when prefix.present?
+          "#{parent} does nest validations for: #{show child_name} with a prefix of #{show prefix}"
+        else
+          "#{parent} does nest validations for: #{show child_name}"
+      end
     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 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
+    def show(value)
+      Array.wrap(value).map{|key| key.is_a?(Symbol) ? ":#{key}" : key.to_s}.join(', ')
+    end
 
-  def combine(*keys)
-    keys.flatten.compact
+    def combine(*keys)
+      keys.flatten.compact
+    end
   end
 end

data/lib/nested_validator/version.rb

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

data/spec/lib/nested_validator/nested_validator_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nested_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Declan Whelan