tram-validators 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec92d7c68a5e2dbfa32186ae6c1c36ce9cc1664d
-  data.tar.gz: 66e7694f05340e8ca51656599b0dfd9fbfb2f821
+  metadata.gz: f890e67e5985736d2fb52569af92743acd02f021
+  data.tar.gz: '0952d74dcd81759ce8b04118b053758452f86f8f'
 SHA512:
-  metadata.gz: f09e4fc491253e62c2c34cdefa8f0ca27f73098e6cd83f887266913dc47d5a49c6d2b9721a695a9f97f1d7e09ac5f92a4e83ef504fdfe8a167a5fe6b9ec3b4d7
-  data.tar.gz: 0ee2f8fbf636a5e993cc3e452e4914ba34711cd4de2573bfe8f252c4ba270055c59eb47d00d0dd6ed8deaf8cefe1c9331359ee154f335b473d0e6f47875c067d
+  metadata.gz: c8a72c30378c53d742caa9069adc4b77fab8c9bd144bd81d6649f4073000bc8041b8e51a65e8bba50ccbc5123572de02bedf13e82ad660855114f7350b0460e7
+  data.tar.gz: cb5e2e9ff8a40adef4f072a558e2b6e187124e4b128bd12f85d9e8bfde74ccf13599a403c3ccc1ccfd7b572767894227101bd88c99dd21ab90cc1022483940c3

data/.rubocop_todo.yml

@@ -0,0 +1,12 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-02-06 13:19:54 +0300 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 12

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.0.5 (2017-02-06)
+
+## Bug fixes
+- Error messages from outcom validators (nepalez)
+
+[Compare v0.0.4...v0.0.5](https://github.com/tram-rb/tram-validators/compare/v0.0.4...v0.0.5)
+
 # v0.0.4 (2017-01-30)
 
 ## Bug fixes

data/lib/tram/locales/en.yml

@@ -0,0 +1,12 @@
+---
+en:
+  errors:
+    messages:
+      not_validatable: "cannot be validated"
+      not_found: "refers to no record of %{klass} by %{key}: %{value}"
+      size_equal_to: "has size %{size} other than %{limit}"
+      size_other_than: "has size equal to %{limit}"
+      size_greater_than: "has size %{size} which isn't greater than %{limit}"
+      size_greater_than_or_equal_to: "has size %{size} which is less than %{limit}"
+      size_less_than: "has size %{size} which isn't less than %{limit}"
+      size_less_than_or_equal_to: "has size %{size} which is greater than %{limit}"

data/lib/tram/locales/ru.yml

@@ -0,0 +1,13 @@
+---
+ru:
+  errors:
+    messages:
+      invalid: "имеет некорректное значение"
+      not_validatable: "не может быть проверен"
+      not_found: "не соответствует объекту класса %{klass} с идентификатором %{key}: %{value}"
+      size_equal_to: "имеет размер %{size} отличный от %{limit}"
+      size_other_than: "имеет размер равный %{limit}"
+      size_greater_than: "имеет размер %{size} не превышающий %{limit}"
+      size_greater_than_or_equal_to: "имеет размер %{size} меньший %{limit}"
+      size_less_than: "имеет размер %{size} не меньший %{limit}"
+      size_less_than_or_equal_to: "имеет размер %{size} превышающий %{limit}"

data/lib/tram/validators.rb

@@ -77,3 +77,7 @@ module Tram
     require_relative "validators/validity_validator"
   end
 end
+
+Dir["#{File.dirname(__FILE__)}/locales/*.yml}"].each do |file|
+  I18n.load_path << file
+end

data/lib/tram/validators/consistency_validator.rb

@@ -21,6 +21,9 @@ class ConsistencyValidator < ActiveModel::EachValidator
     return if value && other_value && yield(value, other_value)
 
     error_name = [condition, chain.to_s.split(".")].flatten.join("_").to_sym
-    record.errors.add attribute, error_name, value: value, other: other_value
+    record.errors.add attribute, error_name, model: record,
+                                             attribute: attribute,
+                                             value: value,
+                                             other: other_value
   end
 end

data/lib/tram/validators/outcome_validator.rb

@@ -11,6 +11,7 @@
 #   # user_id.user_name_presence
 #
 class OutcomeValidator < ActiveModel::EachValidator
+  # rubocop: disable Metrics/MethodLength
   def validate_each(record, attribute, value)
     dependency = options[:value].to_s.gsub(".", "_")
     dependent  = Tram::Validators.chained_value(record, options[:value])
@@ -20,11 +21,14 @@ class OutcomeValidator < ActiveModel::EachValidator
     validators.each do |condition, validator|
       next if valid_in_sandbox(sandbox, attribute, dependent, validator)
 
-      key  = message_key(dependency, condition)
-      text = message(record, attribute, value, dependent, key)
-      record.errors.add attribute, text
+      key = message_key(dependency, condition)
+      record.errors.add attribute, key, model:       record,
+                                        attribute:   attribute,
+                                        value:       value,
+                                        delependent: dependent
     end
   end
+  # rubocop: enable Metrics/MethodLength
 
   private
 
@@ -37,14 +41,4 @@ class OutcomeValidator < ActiveModel::EachValidator
   def message_key(dependency, condition)
     [dependency, condition.to_s].compact.join("_").to_sym
   end
-
-  def message(record, attribute, value, dependent, message_key)
-    model = record.class.name.underscore
-    scope = %W(active_model errors models #{model} attributes #{attribute})
-    I18n.t message_key, record:      record,
-                        attribute:   attribute,
-                        value:       value,
-                        delependent: dependent,
-                        scope:       scope
-  end
 end

data/lib/tram/validators/reference_validator.rb

@@ -6,9 +6,14 @@
 class ReferenceValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     model = options.fetch(:model) { raise "You should define :model option" }
+    model = model.constantize if model.is_a? String
     key   = options.fetch(:find_by, :id)
 
     return if model.find_by(key => value)
-    record.errors.add attribute, :not_found
+    record.errors.add attribute, :not_found, model:    record,
+                                             attribute: attribute,
+                                             value:     value,
+                                             klass:     model.name,
+                                             key:       key
   end
 end

data/lib/tram/validators/size_validator.rb

@@ -8,19 +8,23 @@ class SizeValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     size = value.size if value.respond_to? :size
     Tram::Validators::CONDITIONS.each do |key, block|
-      check(key, record, attribute, size, &block)
+      check(key, record, attribute, value, size, &block)
     end
   end
 
   private
 
-  def check(condition, record, attribute, size)
+  def check(condition, record, attribute, value, size)
     return unless options.key? condition
 
     limit = extract_limit(record, condition)
     return if size && limit && yield(size, limit.to_i)
 
-    record.errors.add attribute, error_key(condition), size: size, limit: limit
+    record.errors.add attribute, error_key(condition), model:    record,
+                                                       attribute: attribute,
+                                                       value:     value,
+                                                       size:      size,
+                                                       limit:     limit
   end
 
   def extract_limit(record, condition)

data/lib/tram/validators/validity_validator.rb

@@ -14,10 +14,11 @@
 class ValidityValidator < ActiveModel::EachValidator
   def validate_each(record, key, value)
     if !value.respond_to? :valid?
-      record.errors
-            .add attribute, :valid, record: record, attribute: key, value: value
+      record.errors.add attribute, :not_validatable, model: record,
+                                                     attribute: key,
+                                                     value: value
     elsif !value.valid?
-      Tram::Validators.copy_errors(value, record, key, :valid, value, options)
+      Tram::Validators.copy_errors(value, record, key, :invalid, 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.4"
+  gem.version     = "0.0.5"
   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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -86,6 +87,8 @@ files:
 - README.md
 - Rakefile
 - lib/tram-validators.rb
+- lib/tram/locales/en.yml
+- lib/tram/locales/ru.yml
 - lib/tram/validators.rb
 - lib/tram/validators/consistency_validator.rb
 - lib/tram/validators/contract_validator.rb