vexile 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad9587fbca289149c8be8a608ec01b0910268cd
-  data.tar.gz: dedce8656b1cb4ade0896ef501663347a32f46ff
+  metadata.gz: 039b9f7d26db4200534c252b5279ab14d562b0f5
+  data.tar.gz: c7c1b580fe37ceeea4068b2d89d845c2a0e38585
 SHA512:
-  metadata.gz: d7bf3e3ed015171568a71bc256d4d06eae7f26b295bced408a1fbe3a84110c1a8fc8f30f99bfe489bdf05f3f9e86ce3000c993ed2773cbb8d61e6578ed84a4d2
-  data.tar.gz: 34748f8d92c79b90176b059ebc52d96d0ea4eb870f858187b27004815312c8dee9cf6efaa378a278e272960897d2fc57f117ac590d1e1a4e776f324e6f9d7f2a
+  metadata.gz: d9dfbd08bb0ed03e9209b0e494ad81872a50a0e9613fa234c975cff508309128af9e5176221c282cb0a0a4eb139a1b1e8dac4c23195b4f32e6074a09e81a166e
+  data.tar.gz: 12c60b62e77c62c9050ce9c520753ae2b364e13a90b5ef20a148179ecb318e74f1760d4101ab86b6dfc76f92df8037681d799f6503a2ca301695c8de699554d8

data/lib/locales/en.yml

@@ -0,0 +1,16 @@
+en:
+  errors:
+    messages:
+      invalid_url: invalid url
+      incorrect_count: 
+        one: should have exaclty %{count} elements
+        many: should have exactly %{count} elements
+      too_few:
+        one: should have at least %{count} element
+        many: should have at least %{count} elements
+      too_many:
+        one: should have at most %{count} element
+        many: should have at most %{count} elements
+      uncountable: value is uncountable
+      recursivelu_invalid: "is invalid in %{in} : %{messages}"
+

data/lib/vexile.rb

@@ -5,8 +5,11 @@ require "vexile/validators/size_validator"
 require "vexile/validators/url_validator"
 require 'active_support/inflector'
 require 'active_support/concern'
+require 'i18n'
 require 'bzproxies'
 
+I18n.load_path += Dir.glob( File.dirname(__FILE__) + "/locales/*.{rb,yml}" ) 
+
 module Vexile
   class << self
     attr_accessor :klasses

data/lib/vexile/validators/recursive_validator.rb

@@ -4,10 +4,16 @@ class RecursiveValidator < ActiveModel::EachValidator
     if param_proxy
       if param_proxy.respond_to? :each
         param_proxy.each do |sub_proxy|
-          record.errors.add attribute, "is invalid in #{sub_proxy} : #{sub_proxy.errors.messages}" if !sub_proxy.valid?
+          if !sub_proxy.valid?
+            message = I18n.translate('errors.messages.recursively_invalid', :in => sub_proxy, :messages => sub_proxy.errors.messages)
+            record.errors.add attribute, message
+          end
         end
       else
-        record.errors.add attribute, "is invalid in #{param_proxy} : #{param_proxy.errors.messages}" if !param_proxy.valid?
+        if !param_proxy.valid?
+          message = I18n.translate('errors.messages.recursively_invalid', :in => param_proxy, :messages => param_proxy.errors.messages)
+          record.errors.add attribute, message
+        end
       end
     end
   end

data/lib/vexile/validators/size_validator.rb

@@ -3,18 +3,18 @@ class SizeValidator < ActiveModel::EachValidator
     real_value = record.__send__(attribute)
     if real_value.respond_to? :size
       if @options[:with] and (real_value.size != @options[:with].to_i)
-        record.errors.add attribute, "should have #{@options[:with]} element(s)"
+        record.errors.add attribute, I18n.translate('errors.messages.incorrect_count', :count => @options[:with])
       else
         if @options[:min] and (real_value.size < @options[:min].to_i)
-          record.errors.add attribute, "should be bigger than #{@options[:min]} element(s)"
+          record.errors.add attribute, I18n.translate('errors.messages.too_few', :count => @options[:min])
         end
         if @options[:max] and (real_value.size > @options[:max].to_i)
-          record.errors.add attribute, "should be shorter than #{@options[:max]} element(s)"
+          record.errors.add attribute, I18n.translate('errors.messages.too_many', :count => @options[:max])
         end
       end
     else
       if (@options[:with] and (@options[:with].to_i != 0)) || @options[:min]
-        record.errors.add attribute, "is blank or could not be counted"
+        record.errors.add attribute, I18n.translate('errors.messages.uncountable')
       end
     end
   end

data/lib/vexile/validators/url_validator.rb

@@ -7,7 +7,7 @@ class UrlValidator < ActiveModel::EachValidator
         raise ::Addressable::URI::InvalidURIError
       end
     rescue ::Addressable::URI::InvalidURIError
-      record.errors[attribute] << "Invalid URL"
+      record.errors[attribute] << I18n.translate('errors.messages.invalid_url')
     end
   end
 end

data/lib/vexile/version.rb

@@ -1,3 +1,3 @@
 module Vexile
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/spec_helper.rb

@@ -3,5 +3,7 @@ require 'rubygems'
 require 'bundler/setup'
 require 'vexile'
 
+I18n.enforce_available_locales = true
+
 RSpec.configure do |config|
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vexile
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Alexander Kostrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: bzproxies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: addressable
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Auto generating ActiveModel validations for hashes
@@ -86,13 +86,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- lib/locales/en.yml
 - lib/vexile.rb
 - lib/vexile/validators/recursive_validator.rb
 - lib/vexile/validators/size_validator.rb
@@ -111,20 +112,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: ActiveModel validations for hashes
 test_files:
 - spec/main_spec.rb
 - spec/spec_helper.rb
+has_rdoc: