nested_validator 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjkwYmI4M2ZlNjJmY2MwNmM5NzcyYmMxOTE4OGIyMDFhYjk2YWI2MA==
+    NTMyMTRjODIyZWYxOTZmZDIyNTc4MTlmNWYyNmQyZjY1MTQ2MTc1Mw==
   data.tar.gz: !binary |-
-    ODkyMzQ1YTYwZWI0MTA2ODdiY2RlNjI2Y2IwM2JkMjE1ODYxODRhOQ==
+    ZGVhZGFmOTRjZmM0ZmVhYWNkNGM3NjVjNDAyNWRiMGI1ZmEyMDBmOA==
 SHA512:
   metadata.gz: !binary |-
-    M2UzMDY5YTNiNzZkNDcwMTk0YmFjZWExZGM5ZWYyMmNhM2E5NDJiMDkzOTJj
-    Nzk4Zjk4ODM5OTQ0YTI0ZmM2OTVmODE5NjFhZmI3MDg2OWYyM2NkMDExNWQ3
-    NjA4NGNiN2EzMWM3YTQyM2IwMzU1ZDVjYzEwYjA3ODhlZmRhNTk=
+    NWY0Y2FkZmE0OGU4MTYyYjBlYzM4N2EwNWU1ZDEzMDQzYjUzZGE0NzMxN2Nj
+    YzliMmJkOWQ3MTY2YjlmNjYzM2I1OWQ4ZTBhMzM2NTRlYzMyNTE5M2Q4NDc1
+    ZjdjNTI3N2YwOWJmMDg2MjBiMWZmZTBlNWY1NWQ5NGY0ZTc0OWU=
   data.tar.gz: !binary |-
-    MzhhNTE1NGI2YThlZGY5ZjU0NjE3MTMzMDY3YWMzNWYzZTFiM2M0MGY4ZmZm
-    ZGMyNTE3ZDI1ZjI3MjM4YWEyZWU5ZWVlNjllNDRiNGRlYjVhYTJjNGIyNTNi
-    NjUwZWFiNmI2OGQxZmQwZDM4ZTBiMzI0YjcwZjQ4ODY3MmM4MDY=
+    YzE4N2RhYTkxNWQ3MjFiYzg4ZGU1YzM1YmM4MDBiZmQ0ZjA0NWZkMjVjYjNj
+    MTFlZTA5MGQyMGZmY2VhZWM2OGRkZTYzM2MzNzNhODg3ZGRiNDcyY2UwODVj
+    Y2E2N2RmNDk5NjIyNzZjYmViZjU2NWM3ZTY5MDE2MGM1NGM4ZTM=

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    nested_validator (1.0.2)
+    nested_validator (1.0.3)
       activemodel
+      activesupport
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -153,7 +153,7 @@ You can use the ```validates_nested``` method:
 class ParentMultiple < ParentBase
   attr_accessor :child2
 
-  validates_nested :child, :child2, only: :attribute1
+  validate_nested :child, :child2, only: :attribute1
 
   def initialize
     self.child  = Child.new

data/lib/nested_validator/validate_nested_matcher.rb

@@ -11,129 +11,126 @@
 #       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}"
-          else
-            "parent has a prefix of #{show actual_prefix}. Are you missing '.with_prefix(#{show actual_prefix})'?"
-          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}"
         else
-          "parent does nest validations for: #{show except_keys & actual_child_keys}"
-      end
+          "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}"
     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}"
-      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}"
     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
-    end
+  def combine(*keys)
+    keys.flatten.compact
   end
 end

data/lib/nested_validator/version.rb

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

data/lib/nested_validator.rb

@@ -1,3 +1,3 @@
 require_relative 'nested_validator/version'
 require_relative 'nested_validator/nested_validator'
-require_relative 'nested_validator/validate_nested_matcher'
+require_relative 'nested_validator/validate_nested_matcher' if defined?(RSpec)

data/nested_validator.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activemodel'
+  spec.add_dependency 'activesupport'
 
   #spec.add_development_dependency 'awesome_print'
   #spec.add_development_dependency 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Declan Whelan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: bundler
   requirement: !ruby/object:Gem::Requirement