tram-validators 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051a300329482a3a9e2fb6fd94b0b1524dfa4414
-  data.tar.gz: 1ba098b3f8491e39685344c6b6d3388974cb432b
+  metadata.gz: d7b5954212b6f7dbef5a5d28551e572fb2b358f2
+  data.tar.gz: be6bda44967fe6e4744a71c4a1b99c46e48d0c5f
 SHA512:
-  metadata.gz: 010b15497c14c7941109b8f03659736773d61a57096e586a80e118538ac918dee792f1f0e4011afffed89ba1b2926fe61302d7fc388e7cf7705ab21b75390b7d
-  data.tar.gz: 1eb3588d68494cd4a19fa38cac85cddc67e596beff3e76ea5a768b41632253fb3fd79e3b215308dcf1ac1842ae1f3201a2ef4b5ae222a214ea29ad581aff17bc
+  metadata.gz: 5ee5ab84a8ff686c3e89d001a96b9926cad5c802f4286f22bdc8b8bbab9944b7393a0a7e974b210cb765a02f5c0834726294db621322f99546ea01b5249f0196
+  data.tar.gz: 4c032675fec6f86507cb9c9eff376d0c583318a5a62b17c4d537f0aa0bb58b9936f8e13c26910870800575493fec8ccc3e3808ca7c332bdd850fdf735aa36eb9

data/.rubocop.yml

@@ -5,6 +5,9 @@ AllCops:
   StyleGuideCopsOnly: true
   TargetRubyVersion:  2.3
 
+Metrics/ParameterLists:
+  Max: 6
+
 Style/Alias:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.0.3 (2017-01-30)
+
+## Bug fixes
+- Error messages from validity and contract validators (nepalez)
+
+[Compare v0.0.2...v0.0.3](https://github.com/tram-rb/tram-validators/compare/v0.0.2...v0.0.3)
+
 # v0.0.2 (2017-01-27)
 
 ## New Features

data/README.md

@@ -26,22 +26,28 @@ Checks that a value satisfies a contract, represented by a standalone validator
 It applies policy validator, and collects its messages under corresponding keys.
 
 ```ruby
-class PolicyObject < SimpleDelegator
+require "tram-validators" # defines `validity` validator
+
+class SpecificPolicy < SimpleDelegator
   include ActiveModel::Validations
   validates :bar, presence: true
+  validates :itself, validity: true # validates wrapped object per se
 end
 
 # PolicyObject.new(record.foo).valid? == true
-# collects original error messages from policy under the key `foo`
-validates :foo, contract: { policy: PolicyObject }
+# adds message with i18 translation `foo.contract_specific_policy`
+validates :foo, contract: { policy: SpecificPolicy }
 
-# collects the same messages from policy under their original keys (`bar`)
+# collects messages from policy under their original keys (`bar`)
 validates :foo, contract: { policy: PolicyObject, original_keys: true }
 
-# collects the same messages from policy under nested keys (`foo[bar]`)
+# collects messages from policy under nested keys (`foo[bar]`)
 validates :foo, contract: { policy: PolicyObject, nested_keys: true }
 ```
 
+When you use `:nested_keys`, the keys `:base` and `:itself` will be excluded from chain of nesting.
+That's why when `PolicyObject` is invalid at `:itself`, the last definition will collect error under the key `foo`, not the `foo[itself]`.
+
 ### Validity Validator
 
 Checks that an attribute is valid per se.
@@ -49,13 +55,13 @@ It collects original error messages under corresponding keys.
 
 ```ruby
 # record.foo.valid? == true
-# collects original error messages under the key `foo`
+# adds message with i18 translation `foo.valid`
 validates :foo, validity: true
 
-# collects the same messages from policy under their original keys (`bar`)
+# collects messages from invalid value under their original keys (`bar`)
 validates :foo, validity: { original_keys: true }
 
-# collects the same messages from policy under nested keys (`foo[bar]`)
+# collects messages from invalid value under nested keys (`foo[bar]`)
 validates :foo, validity: { nested_keys: true }
 ```
 
@@ -65,7 +71,7 @@ Applies validation rule to every element of the collection (that responds to `to
 
 ```ruby
 # Checks that every element of record.list is present
-# collects original errors under the key `list[i]` (i for index of invalid item)
+# collects original errors under keys `list[i]` (i for index of invalid item)
 validates :list, each: { presence: true }
 ```
 

data/lib/tram/validators.rb

@@ -19,13 +19,28 @@ module Tram
         chain.to_s.split(".").inject(record) { |obj, name| obj&.send(name) }
       end
 
-      # Provides standard key for error collected by standalone validators
-      def error_key(source, target, nested_keys: nil, original_keys: nil, **)
-        return source if     original_keys
-        return target unless nested_keys
+      # Copies errors from source to target
+      # if either nested or original keys selected
+      def copy_errors(source, target, name, key, value, **opts)
+        nested   = opts[:nested_keys]
+        original = opts[:original_keys]
+
+        if !nested && !original
+          target.errors.add(name, key, record: target, value: value)
+        else
+          source.errors.messages.each do |k, texts|
+            target_key = nested ? nested_key(name, k) : k
+            texts.each { |text| target.errors.add(target_key, text) }
+          end
+        end
+      end
+
+      # Builds nested key
+      def nested_key(target, source)
         source.to_s
               .split(/\[|\]/)
               .compact
+              .reject { |key| %w(base itself).include? key.to_s }
               .inject(target) { |obj, key| "#{obj}[#{key}]" }
               .to_sym
       end

data/lib/tram/validators/contract_validator.rb

@@ -5,10 +5,13 @@
 #
 class ContractValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    return unless options[:policy]
-    options[:policy].new(value).tap(&:valid?).errors.messages.each do |key, msg|
-      error_key = Tram::Validators.error_key(key, attribute, options)
-      msg.each { |message| record.errors.add error_key, message }
-    end
+    policy = options[:policy]
+    return unless policy
+
+    source = policy.new(value)
+    return if source.valid?
+
+    key = "contract_#{policy.name.underscore}"
+    Tram::Validators.copy_errors(source, record, attribute, key, value, options)
   end
 end

data/lib/tram/validators/validity_validator.rb

@@ -12,16 +12,12 @@
 #   validates :user, validity: { nested_keys: true }
 #
 class ValidityValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    if !value.respond_to? :invalid?
-      record.errors.add attribute, :invalidable, record:    record,
-                                                 attribute: attribute,
-                                                 value:     value
-    elsif value.invalid?
-      value.errors.messages.each do |key, messages|
-        error_key = Tram::Validators.error_key(key, attribute, options)
-        messages.each { |message| record.errors.add error_key, message }
-      end
+  def validate_each(record, key, value)
+    if !value.respond_to? :valid?
+      record.errors
+            .add attribute, :valid, record: record, attribute: key, value: value
+    elsif !value.valid?
+      Tram::Validators.copy_errors(value, record, key, :valid, value, options)
     end
   end
 end

data/tram-validators.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "tram-validators"
-  gem.version     = "0.0.2"
+  gem.version     = "0.0.3"
   gem.author      = "Andrew Kozin (nepalez)"
   gem.email       = "andrew.kozin@gmail.com"
   gem.homepage    = "https://github.com/tram-rb/tram-validators"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tram-validators
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails