active_model_validators_ex 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e4923568aea755dd748e40e079e60342b3cab5
-  data.tar.gz: cd6d41be058b4b2c7feaaf0f5739d3550bb80ad8
+  metadata.gz: a05737b152952959d082cacc7e93ddf422da9a9f
+  data.tar.gz: ffb49f4614ca57efbd248df84c55dae753280efc
 SHA512:
-  metadata.gz: c8591102bc58f6d967bb6b68ecfff0ec5faf4385efed81956f188c7103751baca638228701b8c463c9ac00434a670531ce3fd7a1f303290ce13fba87d0a1d03d
-  data.tar.gz: 6ffdaf156137c21e301610bfba8c0d99519db34e84167d405d4230bc9984f82df8441f3c3199f0698c915874549ba84a77bf8f20c787f5e1b602ef7652916d4f
+  metadata.gz: e66f36b5998c3b43cf40487fd130c67d8cd98e79295d8335b42ecb728559e9701f8a226dda075b07817ea2c1d09ab4f5a19d0c1a0c138db0f00f74e0e9fc711d
+  data.tar.gz: 6dd4a3d772f9d09438f10305f019bb619b75f6a6e45d8fd6221c2e7bc3933ccf2fabe6597470a14dbd85225741afce36e8395b1dd13126c067b4e7987b22cf6a

data/README.md

@@ -22,6 +22,13 @@ Or install it yourself as:
 
     $ gem install active_model_validators_ex
 
+## Localization
+
+Translations are supported by [I18n](https://github.com/svenfuchs/i18n) and follows
+the established convention. Default translations are available in the folder
+[config/locales](https://github.com/junhanamaki/active_model_validators_ex/tree/master/config/locales)
+of this project, so just copy them to your project and edit as needed.
+
 ## Usage
 
 After requiring, the following classes will be available for ActiveModel
@@ -60,6 +67,8 @@ validations:
         # returns true
         ExampleModel.new(array: []).valid?
 
+   Used translation keys: array, empty, array_inclusion
+
   * ArrayFormatValidator
 
         class ExampleModel
@@ -87,6 +96,8 @@ validations:
         # return false
         ExampleModel.new(array: ['not', 'matching']).valid?
 
+   Used translation keys: array, empty, array_format
+
   * TimeFormatValidator
 
    Validates if value is of type Time or a string parsable to Time, example:
@@ -111,6 +122,8 @@ validations:
         # returns false
         ExampleModel.new(time: Time.new(2013)).valid?
 
+   Used translation keys: time_greater_than, time_invalid
+
 ## Contributing
 
 1. Fork it ( https://github.com/junhanamaki/active_model_validators_ex/fork )

data/active_model_validators_ex.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
   spec.add_development_dependency 'jazz_hands', '~> 0.5'
   spec.add_development_dependency 'activemodel', '~> 4.1'
+  spec.add_development_dependency 'mongoid', '~> 4.0'
 end

data/config/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  errors:
+    messages:
+      array: must be a collection
+      array_format: values are in an invalid format
+      array_inclusion: values does not belong to list
+      time_greater_than: 'must be after %{previous_time}'
+      time_invalid: value is not a valid time

data/config/locales/pt.yml

@@ -0,0 +1,8 @@
+pt:
+  errors:
+    messages:
+      array: tem de ser uma colecção
+      array_format: os valores estão num formato inválido
+      array_inclusion: tem valores não permitidos
+      time_greater_than: 'tem de ser posterior a %{previous_time}'
+      time_invalid: valor não corresponde a um formato de tempo válido

data/lib/active_model_validators_ex/array_format_validator.rb

@@ -2,8 +2,8 @@ require 'active_model_validators_ex/array_validator_base'
 
 class ArrayFormatValidator < ArrayValidatorBase
   def initialize(options)
-    unless options.key?(:with) && options[:with].is_a?(Regexp)
-      raise 'key with must be present, and value must be a Regexp'
+    unless options.key?(:with) and options[:with].is_a?(Regexp)
+      raise 'options must contain a key :with, where the value is a Regexp'
     end
 
     super(options)
@@ -11,9 +11,7 @@ class ArrayFormatValidator < ArrayValidatorBase
 
   def custom_validations(record, attribute, value)
     unless value.all? { |val| !val.match(options[:with]).nil? }
-      record.errors[attribute] <<
-        "attribute #{attribute} must be an Array with values that matches " \
-        "#{options[:with]}"
+      record.errors.add(attribute, :array_format, options)
     end
   end
 end

data/lib/active_model_validators_ex/array_inclusion_validator.rb

@@ -2,10 +2,9 @@ require 'active_model_validators_ex/array_validator_base'
 
 class ArrayInclusionValidator < ArrayValidatorBase
   def initialize(options)
-    unless options.key?(:in) &&
-           (options[:in].is_a?(Array) ||
-            options[:in].is_a?(Range))
-      raise 'key in must be present, and value must be either a Range or Array'
+    unless options[:in].is_a?(Array) or options[:in].is_a?(Range)
+      raise ArgumentError,
+            'value for in must be either a Range or Array'
     end
 
     super(options)
@@ -13,9 +12,7 @@ class ArrayInclusionValidator < ArrayValidatorBase
 
   def custom_validations(record, attribute, value)
     unless value.all? { |val| options[:in].include?(val) }
-      record.errors[attribute] <<
-        "attribute #{attribute} has be an array composed of values " \
-        "#{options[:in]}"
+      record.errors.add(attribute, :array_inclusion, options)
     end
   end
 end

data/lib/active_model_validators_ex/array_validator_base.rb

@@ -10,12 +10,12 @@ class ArrayValidatorBase < ActiveModel::EachValidator
     return if options[:allow_nil] && value.nil?
 
     unless value.is_a? Array
-      record.errors[attribute] << "attribute #{attribute} must be an Array"
+      record.errors.add(attribute, :array, options)
       return
     end
 
     if !options[:allow_empty] and value.empty?
-      record.errors[attribute] << "attribute #{attribute} can't be empty"
+      record.errors.add(attribute, :empty, options)
       return
     end
 

data/lib/active_model_validators_ex/time_format_validator.rb

@@ -1,5 +1,12 @@
 class TimeFormatValidator < ActiveModel::EachValidator
   def initialize(options)
+    unless options[:after].is_a?(NilClass) or
+           options[:after].is_a?(Proc)     or
+           options[:after].is_a?(Time)
+      raise ArgumentError,
+            'value after must be either NilClass, Proc or Time'
+    end
+
     options[:allow_nil] ||= false
 
     super(options)
@@ -13,10 +20,13 @@ class TimeFormatValidator < ActiveModel::EachValidator
     previous_time = calculate_previous_time(record)
 
     if !previous_time.nil? and parsed_time < previous_time
-      record.errors[attribute] << "invalid value, #{value} must be after #{previous_time}"
+      options[:value]         = value
+      options[:previous_time] = previous_time
+
+      record.errors.add(attribute, :time_greater_than, options)
     end
   rescue StandardError => e
-    record.errors[attribute] << "invalid value, #{value} not valid for #{attribute}"
+    record.errors.add(attribute, :time_invalid, options)
   end
 
   def calculate_previous_time(record)

data/lib/active_model_validators_ex/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelValidatorsEx
-  VERSION = "0.3.1"
-end
+  VERSION = "0.3.2"
+end

data/lib/active_model_validators_ex.rb

@@ -5,4 +5,4 @@ require 'active_model_validators_ex/array_inclusion_validator'
 require 'active_model_validators_ex/time_format_validator'
 
 module ActiveModelValidatorsEx
-end
+end

data/spec/active_model_validators_ex/array_format_validator_spec.rb

@@ -24,7 +24,7 @@ describe ArrayFormatValidator do
   end
 
   describe '#validate_each' do
-    let(:record)    { MockRecord.new(attribute) }
+    let(:record)    { MockRecord.new }
     let(:attribute) { :array }
     let(:validator) { ArrayFormatValidator.new(options) }
     before { validator.validate_each(record, attribute, value) }

data/spec/active_model_validators_ex/array_inclusion_validator_spec.rb

@@ -14,7 +14,7 @@ describe ArrayInclusionValidator do
   end
 
   describe '#validate_each' do
-    let(:record)    { MockRecord.new(attribute) }
+    let(:record)    { MockRecord.new }
     let(:attribute) { :array }
     let(:validator) { ArrayInclusionValidator.new(options) }
     before { validator.validate_each(record, attribute, value) }

data/spec/active_model_validators_ex/array_validator_base_spec.rb

@@ -12,8 +12,8 @@ describe ArrayValidatorBase do
   end
 
   describe '.validate_each' do
-    let(:record)    { MockRecord.new(attribute) }
-    let(:attribute) { :a }
+    let(:record)    { MockRecord.new }
+    let(:attribute) { :array }
     let(:validator) { ArrayValidatorBase.new(options) }
     before do
       validator.validate_each(record, attribute, value) rescue nil

data/spec/active_model_validators_ex/time_format_validator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe TimeFormatValidator do
   describe '#validate_each' do
-    let(:record)    { MockRecord.new(attribute) }
+    let(:record)    { MockRecord.new }
     let(:attribute) { :time }
     let(:validator) { TimeFormatValidator.new(options) }
     before { validator.validate_each(record, attribute, value) }

data/spec/mock_objects/mock_record.rb

@@ -1,7 +1,8 @@
+require 'mongoid'
+
 class MockRecord
-  attr_accessor :errors
+  include Mongoid::Document
 
-  def initialize(attribute)
-    @errors = { attribute => [] }
-  end
+  field :array
+  field :time
 end

data/spec/spec_helper.rb

@@ -11,4 +11,7 @@ end
 require 'pry'
 require 'active_model'
 require 'active_model_validators_ex'
-require 'mock_objects/mock_record'
+require 'mock_objects/mock_record'
+
+I18n.locale     = 'pt'
+I18n::load_path = Dir[File.join('./config/locales', '*.yml')]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_validators_ex
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - junhanamaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Add more validators for your ActiveModel models.
 email:
 - jun.hanamaki@gmail.com
@@ -111,6 +125,8 @@ files:
 - README.md
 - Rakefile
 - active_model_validators_ex.gemspec
+- config/locales/en.yml
+- config/locales/pt.yml
 - lib/active_model_validators_ex.rb
 - lib/active_model_validators_ex/array_format_validator.rb
 - lib/active_model_validators_ex/array_inclusion_validator.rb