phony_rails 0.1.7 → 0.1.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.1.6)
+    phony_rails (0.1.8)
       activerecord (~> 3.0)
       countries (~> 0.8.2)
       phony (~> 1.7.7)

data/README.md

@@ -62,6 +62,8 @@ so we can use:
     validates_plausible_phone :phone_number, :without => /^\+\d+/
     validates_plausible_phone :phone_number, :presence => true, :with => /^\+\d+/
 
+the i18n key is `:improbable_phone`
+
 ### Display / Views
 
 In your views use:
@@ -76,6 +78,9 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## Changelog
 
+0.1.8
+* Improved validation methods by ddidier.
+
 0.1.6
 * Added :as option to phony_normalize.
 

data/lib/phony_rails.rb

@@ -40,8 +40,8 @@ module PhonyRails
     end
 
     module InstanceMethods
-  
-    private
+
+      private
 
       # This methods sets the attribute to the normalized version.
       # It also adds the country_code (number), eg. 31 for NL numbers.
@@ -70,7 +70,7 @@ module PhonyRails
         attributes.each do |attribute|
           raise ArgumentError, "No attribute #{attribute} found on #{self.class.name} (PhonyRails)" if not self.attribute_method?(attribute)
           # Add before validation that saves a normalized version of the phone number
-          self.before_validation do 
+          self.before_validation do
             set_phony_normalized_numbers(attributes, options)
           end
         end
@@ -80,7 +80,7 @@ module PhonyRails
       #   phony_normalized_method :fax_number, :default_country_code => 'US'
       # Creates a normalized_fax_number method.
       def phony_normalized_method(*attributes)
-        main_options = attributes.last.is_a?(Hash) ? attributes.pop : {} 
+        main_options = attributes.last.is_a?(Hash) ? attributes.pop : {}
         main_options.assert_valid_keys :country_code, :default_country_code
         attributes.each do |attribute|
           raise StandardError, "Instance method normalized_#{attribute} already exists on #{self.name} (PhonyRails)" if self.instance_methods.include?(:"normalized_#{attribute}")
@@ -97,4 +97,9 @@ module PhonyRails
   end
 
 end
-ActiveRecord::Base.extend PhonyRails::ActiveRecordExtension
+
+ActiveRecord::Base.extend PhonyRails::ActiveRecordExtension
+
+Dir["#{File.dirname(__FILE__)}/phony_rails/locales/*.yml"].each do |file|
+  I18n.load_path << file
+end

data/lib/phony_rails/locales/en.yml

@@ -0,0 +1,6 @@
+
+en:
+  activerecord:
+    errors:
+      messages:
+        improbable_phone: "is an invalid number"

data/lib/phony_rails/locales/fr.yml

@@ -0,0 +1,6 @@
+
+fr:
+  activerecord:
+    errors:
+      messages:
+        improbable_phone: "est un numéro invalide"

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/validators/phony_validator.rb

@@ -6,7 +6,7 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   # Validates a String using Phony.plausible? method.
   def validate_each(record, attribute, value)
     return if value.blank?
-    record.errors[attribute] << (options[:message] || "is an invalid number") if not Phony.plausible?(value)
+    record.errors.add(attribute,  options[:message] || :improbable_phone) if not Phony.plausible?(value)
   end
 
 end

data/spec/lib/validators/phony_validator_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 #-----------------------------------------------------------------------------------------------------------------------
@@ -81,6 +82,7 @@ end
 # Tests
 #-----------------------------------------------------------------------------------------------------------------------
 
+I18n.locale = :en
 VALID_NUMBER = '123456789'
 INVALID_NUMBER = '123456789 123456789 123456789 123456789'
 
@@ -109,6 +111,22 @@ describe PhonyPlausibleValidator do
       @home.errors.messages.should include(:phone_number => ["is an invalid number"])
     end
 
+    it "should translate the error message in english" do
+      I18n.with_locale(:en) do
+        @home.phone_number = INVALID_NUMBER
+        @home.valid?
+        @home.errors.messages.should include(:phone_number => ["is an invalid number"])
+      end
+    end
+
+    it "should translate the error message in french" do
+      I18n.with_locale(:fr) do
+        @home.phone_number = INVALID_NUMBER
+        @home.valid?
+        @home.errors.messages.should include(:phone_number => ["est un numéro invalide"])
+      end
+    end
+
   end
 end
 

metadata

@@ -1,72 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: phony_rails
-version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 8
+  version: 0.1.8
 platform: ruby
-authors:
+authors: 
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-30 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: phony
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 7
+        - 7
         version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: countries
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: countries
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 2
         version: 0.8.2
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: This Gem adds useful methods to your Rails app to validate, display and
-  save phone numbers.
-email:
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id003
+description: This Gem adds useful methods to your Rails app to validate, display and save phone numbers.
+email: 
 - joost@joopp.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -76,6 +77,8 @@ files:
 - README.md
 - Rakefile
 - lib/phony_rails.rb
+- lib/phony_rails/locales/en.yml
+- lib/phony_rails/locales/fr.yml
 - lib/phony_rails/string_extensions.rb
 - lib/phony_rails/version.rb
 - lib/validators/phony_validator.rb
@@ -83,33 +86,37 @@ files:
 - spec/lib/phony_rails_spec.rb
 - spec/lib/validators/phony_validator_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/joost/phony_rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: This Gem adds useful methods to your Rails app to validate, display and save
-  phone numbers.
-test_files:
+summary: This Gem adds useful methods to your Rails app to validate, display and save phone numbers.
+test_files: 
 - spec/lib/phony_rails_spec.rb
 - spec/lib/validators/phony_validator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: