nested_validator 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTc4N2MxNWMwNGRjZGRlNjA0MzBkNzZlZjRlZjczMGU5M2I4YjE3OQ==
+    OTAwNDBjOGJmNDEzM2I0MjYwOTczMmMwNzUxNTRjMTc2NDAzMTM1Yg==
   data.tar.gz: !binary |-
-    YmNhNWI2YzdjYmE1YjNhNGE0ZDdiMzY4Yzg0YWYwZmRiODUzNjk2Yg==
+    ZjM4OGNjMmZkNzc2MmY0OGJhMTdjNGE2NDM2M2M0ZjJmMTY5YTY3OQ==
 SHA512:
   metadata.gz: !binary |-
-    NWY5NmU2ZjA4NmY4OWI3ZGMwMjI0NzU0ZDM4YWVjZjRlNzYzZDc5MTE4ZDM4
-    NjgxZWQyNTc3ODZhMDhlYzc4OGQyYTk4MTI1Y2Q1N2NhYmFiNmMxMTgwYzBl
-    NTEzYjhhMDM2MjMzMTI0MzQ3ZGZkY2EyNmRiNzAxZDJjZThhMTE=
+    MDFhY2E0ZDlmY2E3Mzk0MzVmNWY5NzFkNGE3ZjVmNjEwNzZlNTE0MjQzOTI5
+    ZjZmZGU3NWRmYjUxNTlmMjdmNTY3YTRiYjZiM2VlMjY0ODU0MTFkOTBkZjgy
+    OGM5NDRjY2NjYzg1NWM5YTcwMjAzMjA0ODNlNTQ0NTcwOGY0NzI=
   data.tar.gz: !binary |-
-    YzkyZmRiNGJiYjFkZTRhMWIxODY0ZmFiNGZkN2Y5Mjk5ZjYyMTU5YzJkODFi
-    ODEzMWRmZDg2NjdhNjNhYzdjNTUxZWEwODY1ZjcwNTE2N2YyMjQxMjM1ZmNj
-    MzczMjU5ZmQ3MmY1ZDlmYTBiYzA1ZjYwNGUxNGM1NjA0Mzg5ODM=
+    MTM1ZDY2NmNhMjgzN2E3YjIxNjIyNzllMzM4NzJhNzM3NTg5NGE0OTU2NzQ2
+    OGM5OTJlY2JiNTQyMzU5YTYwZGE4M2M2NWM3YThlOGQ2YjcxYmYxZjljNTU3
+    NjU1YTQ5NmEzYTIyODJhYzBkNGUxYmM4Mjg2MTk1MzZmNTQyOTU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nested_validator (1.0.5)
+    nested_validator (1.0.6)
       activemodel
       activesupport
 

data/lib/nested_validator/nested_validator.rb

@@ -41,9 +41,9 @@ module ActiveModel
           valid_keys = any - value.errors.keys.map{|k| k.to_s.split.first}
           return if valid_keys.present?
         end
-        value.errors.each do |key, error|
-          key = key.to_s.split.first
-          record.errors.add(nested_key(prefix, key), error) if include?(key)
+        value.errors.select{|key, _| include?(key)}.each do |key, error|
+          message = [key.to_s, error].join(' ').strip
+          record.errors.add(prefix, message) unless record.errors[prefix].include?(message)
         end
       end
 

data/lib/nested_validator/validate_nested_matcher.rb

@@ -16,8 +16,15 @@ require 'rspec/expectations'
 #     end
 RSpec::Matchers.define :validate_nested do |child_name|
 
-  attr_accessor :child_name, :prefix, :only_keys, :except_keys, :any_keys
-  attr_accessor :parent, :actual_keys
+  [:child_name, :prefix, :only_keys, :except_keys, :any_keys, :parent, :child_attributes, :child_error_key].each do |attr|
+    define_method(attr) do
+      instance_variable_get "@#{attr}"
+    end
+
+    define_method("#{attr}=") do |value|
+      instance_variable_set "@#{attr}", value
+    end
+  end
 
   TEST_KEY ||= :__test_key__
 
@@ -27,14 +34,16 @@ RSpec::Matchers.define :validate_nested do |child_name|
     self.except_keys ||= []
     self.any_keys    ||= []
 
-    self.child_name  = child_name
+    self.child_name  = child_name.to_sym
     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
+    self.child_attributes = child_attributes_when_validity_is(false) - child_attributes_when_validity_is(true)
+    self.child_error_key  = (child_error_keys_when_validity_is(false) - child_error_keys_when_validity_is(true)).first
+
+    child_attributes == expected_child_attributes && child_error_key == expected_child_error_key
   end
 
   def prepare_keys(keys)
@@ -45,38 +54,42 @@ RSpec::Matchers.define :validate_nested do |child_name|
     end
   end
 
-  chain(:with_prefix) { |prefix|  self.prefix      = prefix }
+  chain(:with_prefix) { |prefix|  self.prefix      = prefix.to_sym }
   chain(:only)        { |*only|   self.only_keys   = prepare_keys(only)   }
   chain(:except)      { |*except| self.except_keys = prepare_keys(except) }
   chain(:any)         { |*any|    self.any_keys    = prepare_keys(any) }
 
   def child
-    parent.public_send child_name
+    parent.public_send(child_name)
   end
 
-  def error_keys_when_child_validity_is(valid)
+  def child_attributes_when_validity_is(valid)
+    errors_when_child_validity_is(valid).map{|k, msg| msg.split.first.to_sym}
+  end
+
+  def child_error_keys_when_validity_is(valid)
+    errors_when_child_validity_is(valid).keys
+  end
+
+  def errors_when_child_validity_is(valid)
     child_error_keys = combine TEST_KEY, only_keys, except_keys, any_keys
-    child_errors = child_error_keys.inject({}){|result, key| result[key] = ['error message'];result }
+    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 }
 
     parent.valid?
-    parent.errors.keys
+    parent.errors
   end
 
-  def expected_keys
-    expected_child_keys.map{|key| :"#{expected_prefix} #{key}"}
+  def expected_child_attributes
+    expected_child_keys.map{|k| k.to_sym}
   end
 
-  def expected_prefix
+  def expected_child_error_key
     prefix.present? ? prefix : child_name
   end
 
-  def actual_prefix
-    :"#{actual_keys.first.to_s.split.first}"
-  end
-
   def expected_child_keys
     expected_keys = case
       when only_keys.present?
@@ -91,11 +104,10 @@ RSpec::Matchers.define :validate_nested do |child_name|
   end
 
   def actual_child_keys
-    actual_keys.map{|key| key.to_s.sub(/^.*\s+/, '').to_sym }
+    child_attributes.map{|key| key.to_s.sub(/^.*\s+/, '').to_sym }
   end
 
   def invalid_child_keys
-    #binding.pry
     (only_keys + except_keys).reject{|key| child.respond_to? key}
   end
 
@@ -114,13 +126,13 @@ RSpec::Matchers.define :validate_nested do |child_name|
         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?
+      when child_attributes.empty?
         "parent doesn't nest validations for #{show child_name}"
-      when actual_prefix != expected_prefix
+      when child_error_key != expected_child_error_key
         if prefix.present?
-          "parent uses a prefix of #{show actual_prefix} rather than #{show expected_prefix}"
+          "parent uses a prefix of #{show child_error_key} rather than #{show expected_child_error_key}"
         else
-          "parent has a prefix of #{show actual_prefix}. Are you missing '.with_prefix(#{show actual_prefix})'?"
+          "parent has a prefix of #{show child_error_key}. Are you missing '.with_prefix(#{show child_error_key})'?"
         end
       else
         "parent does nest validations for: #{show except_keys & actual_child_keys}"

data/lib/nested_validator/version.rb

@@ -1,3 +1,3 @@
 module NestedValidator
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/lib/nested_validator/nested_validator_spec.rb

@@ -7,19 +7,19 @@ RSpec::Matchers.define :detect_nested_error_for do
   end
 
   def description
-    "detect an error for '#{child_attribute}'"
+    "detect an error for child '#{child_attribute}'"
   end
 
   failure_message do
-    "has no error for '#{child_attribute}'"
+    "has no error for child '#{child_attribute}'"
   end
 
   failure_message_when_negated do
-    "has an error '#{child_attribute}' => '#{error}'"
+    "has an error child '#{child_attribute}' => '#{error}'"
   end
 
   def error
-    subject.errors[child_attribute].first
+    subject.errors[:child].find{|e| e =~ /^#{expected} /}
   end
 
   def attribute
@@ -31,7 +31,7 @@ RSpec::Matchers.define :detect_nested_error_for do
   end
 
   def child_attribute
-    :"child #{attribute}"
+    :"#{attribute}"
   end
 end
 
@@ -193,31 +193,42 @@ describe 'nested validation' do
     end
   end
 
-  describe 'error message keys' do
+  describe 'error keys' do
     before { parent.valid? }
     subject { parent.errors.messages.keys.first }
 
-    context('true')            { it { should eq :'child attribute' } }
-    context('{prefix: ""}')    { it { should eq :'attribute' } }
-    context('{prefix: nil}')   { it { should eq :'attribute' } }
-    context('{prefix: "OMG"}') { it { should eq :'OMG attribute' } }
+    context('true')            { it { should eq :'child' } }
+    context('{prefix: ""}')    { it { should eq :'' } }
+    context('{prefix: nil}')   { it { should eq :'' } }
+    context('{prefix: "OMG"}') { it { should eq :'OMG' } }
 
     context 'with arrays' do
       let(:child) { [child_class.new] }
 
-      context('true')            { it { should eq :'child[0] attribute' } }
-      context('{prefix: ""}')    { it { should eq :'[0] attribute' } }
-      context('{prefix: nil}')   { it { should eq :'[0] attribute' } }
-      context('{prefix: "OMG"}') { it { should eq :'OMG[0] attribute' } }
+      context('true')            { it { should eq :'child[0]' } }
+      context('{prefix: ""}')    { it { should eq :'[0]' } }
+      context('{prefix: nil}')   { it { should eq :'[0]' } }
+      context('{prefix: "OMG"}') { it { should eq :'OMG[0]' } }
     end
 
     context('with hashes') do
       let(:child) { {key: child_class.new} }
 
-      context('true')            { it { should eq :'child[key] attribute' } }
-      context('{prefix: ""}')    { it { should eq :'[key] attribute' } }
-      context('{prefix: nil}')   { it { should eq :'[key] attribute' } }
-      context('{prefix: "OMG"}') { it { should eq :'OMG[key] attribute' } }
+      context('true')            { it { should eq :'child[key]' } }
+      context('{prefix: ""}')    { it { should eq :'[key]' } }
+      context('{prefix: nil}')   { it { should eq :'[key]' } }
+      context('{prefix: "OMG"}') { it { should eq :'OMG[key]' } }
+    end
+  end
+
+  describe 'error messages' do
+    before { parent.valid? }
+    subject { parent.errors.messages.values.first }
+
+    context('true') do
+      it { should include "attribute can't be blank" }
+      it { should include "attribute2 can't be blank" }
+      it { should include "attribute3 can't be blank" }
     end
   end
 
@@ -265,5 +276,16 @@ describe 'nested validation' do
         it { expect(grand_parent).to_not be_valid }
       end
     end
+
+    describe 'errors[:parent]' do
+      let(:parent_options) { true}
+
+      before { grand_parent.valid? }
+      subject { grand_parent.errors[:parent] }
+
+      it { should include "child attribute can't be blank"  }
+      it { should include "child attribute2 can't be blank" }
+      it { should include "child attribute3 can't be blank" }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nested_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Declan Whelan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel