phony_rails 0.12.10 → 0.12.11

data/spec/lib/validators/phony_validator_spec.rb

@@ -55,7 +55,7 @@ end
 #--------------------
 class SimpleHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates :phone_number, :phony_plausible => true
+  validates :phone_number, phony_plausible: true
 end
 
 #--------------------
@@ -67,55 +67,55 @@ end
 #--------------------
 class RequiredHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :presence => true
+  validates_plausible_phone :phone_number, presence: true
 end
 
 #--------------------
 class OptionalHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :presence => false
+  validates_plausible_phone :phone_number, presence: false
 end
 
 #--------------------
 class FormattedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :with => /\A\+\d+/
+  validates_plausible_phone :phone_number, with: /\A\+\d+/
 end
 
 #--------------------
 class NotFormattedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :without => /\A\+\d+/
+  validates_plausible_phone :phone_number, without: /\A\+\d+/
 end
 
 #--------------------
 class NormalizableHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :normalized_country_code => 'US'
+  validates_plausible_phone :phone_number, normalized_country_code: 'US'
 end
 
 #--------------------
 class AustralianHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :country_number => "61"
+  validates_plausible_phone :phone_number, country_number: "61"
 end
 
 #--------------------
 class PolishHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :country_code => "PL"
+  validates_plausible_phone :phone_number, country_code: "PL"
 end
 
 #--------------------
 class BigHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :presence => true, :with => /\A\+\d+/, :country_number => "33"
+  validates_plausible_phone :phone_number, presence: true, with: /\A\+\d+/, country_number: "33"
 end
 
 #--------------------
 class MismatchedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number, :country_code
-  validates :phone_number, :phony_plausible => {:ignore_record_country_code => true}
+  validates :phone_number, phony_plausible: {ignore_record_country_code: true}
 end
 #-----------------------------------------------------------------------------------------------------------------------
 # Tests
@@ -154,14 +154,14 @@ describe PhonyPlausibleValidator do
     it "should invalidate an invalid number" do
       @home.phone_number = INVALID_NUMBER
       expect(@home).to_not be_valid
-      expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+      expect(@home.errors.messages).to 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?
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
     end
 
@@ -169,7 +169,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:fr) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(:phone_number => ["est un numéro invalide"])
+        expect(@home.errors.messages).to include(phone_number: ["est un numéro invalide"])
       end
     end
 
@@ -177,7 +177,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:ja) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(:phone_number => ["は正しい電話番号ではありません"])
+        expect(@home.errors.messages).to include(phone_number: ["は正しい電話番号ではありません"])
       end
     end
 
@@ -185,7 +185,23 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:km) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        expect(@home.errors.messages).to include(:phone_number => ["គឺជាលេខមិនត្រឹមត្រូវ"])
+        expect(@home.errors.messages).to include(phone_number: ["គឺជាលេខមិនត្រឹមត្រូវ"])
+      end
+    end
+
+    it "should translate the error message in Ukrainian" do
+      I18n.with_locale(:uk) do
+        @home.phone_number = INVALID_NUMBER
+        @home.valid?
+        expect(@home.errors.messages).to include(phone_number: ["є недійсним номером"])
+      end
+    end
+
+    it "should translate the error message in Russian" do
+      I18n.with_locale(:ru) do
+        @home.phone_number = INVALID_NUMBER
+        @home.valid?
+        expect(@home.errors.messages).to include(phone_number: ["является недействительным номером"])
       end
     end
   end
@@ -216,7 +232,7 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate an invalid number" do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
     end
@@ -230,7 +246,7 @@ describe ActiveModel::Validations::HelperMethods do
 
       it "should invalidate an empty number" do
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["can't be blank"])
+        expect(@home.errors.messages).to include(phone_number: ["can't be blank"])
       end
 
       it "should validate a valid number" do
@@ -241,7 +257,7 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate an invalid number" do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
     end
@@ -265,7 +281,7 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate an invalid number" do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
     end
@@ -279,7 +295,7 @@ describe ActiveModel::Validations::HelperMethods do
 
       it "should invalidate an empty number" do
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is invalid"])
+        expect(@home.errors.messages).to include(phone_number: ["is invalid"])
       end
 
       it "should validate a well formatted valid number" do
@@ -290,7 +306,7 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate a bad formatted valid number" do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is invalid"])
+        expect(@home.errors.messages).to include(phone_number: ["is invalid"])
       end
 
     end
@@ -314,7 +330,7 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate a bad formatted valid number" do
         @home.phone_number =  "+#{VALID_NUMBER}"
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is invalid"])
+        expect(@home.errors.messages).to include(phone_number: ["is invalid"])
       end
 
     end
@@ -338,13 +354,13 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate a valid number with the wrong country code" do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
       it "should invalidate a valid number without a country code" do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
     end
@@ -373,7 +389,7 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate an invalid number" do
         @home.phone_number = INVALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
     end
@@ -397,13 +413,13 @@ describe ActiveModel::Validations::HelperMethods do
       it "should invalidate a valid number with the wrong country code" do
         @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
       it "should invalidate a valid number without a country code" do
         @home.phone_number = VALID_NUMBER
         expect(@home).to_not be_valid
-        expect(@home.errors.messages).to include(:phone_number => ["is an invalid number"])
+        expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
       end
 
     end

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ require 'mongoid'
 require 'phony_rails'
 
 ActiveRecord::Base.establish_connection(
-  :adapter  => "sqlite3",
-  :database => ":memory:"
+  adapter: "sqlite3",
+  database: ":memory:"
 )
 
 ActiveRecord::Schema.define do
@@ -30,9 +30,9 @@ module SharedModelMethods
     attr_accessor :phone_method, :phone1_method, :country_code
     phony_normalized_method :phone_attribute # adds normalized_phone_attribute method
     phony_normalized_method :phone_method # adds normalized_phone_method method
-    phony_normalized_method :phone1_method, :default_country_code => 'DE' # adds normalized_phone_method method
+    phony_normalized_method :phone1_method, default_country_code: 'DE' # adds normalized_phone_method method
     phony_normalize :phone_number # normalized on validation
-    phony_normalize :fax_number, :default_country_code => 'AU'
+    phony_normalize :fax_number, default_country_code: 'AU'
   end
 end
 
@@ -44,7 +44,7 @@ class RelaxedActiveRecordModel < ActiveRecord::Base
   self.table_name = 'active_record_models'
   attr_accessor :phone_number, :country_code
 
-  phony_normalize :phone_number, :enforce_record_country => false
+  phony_normalize :phone_number, enforce_record_country: false
 end
 
 class ActiveRecordDummy < ActiveRecordModel
@@ -53,9 +53,9 @@ end
 class MongoidModel
   include Mongoid::Document
   include Mongoid::Phony
-  field :phone_attribute, :type => String
-  field :phone_number,    :type => String
-  field :phone_number_as_normalized, :type => String
+  field :phone_attribute, type: String
+  field :phone_number,    type: String
+  field :phone_number_as_normalized, type: String
   field :fax_number
   include SharedModelMethods
 end
@@ -67,4 +67,4 @@ I18n.config.enforce_available_locales = true
 
 RSpec.configure do |config|
   # some (optional) config here
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.12.10
+  version: 0.12.11
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -93,7 +93,9 @@ files:
 - lib/phony_rails/locales/it.yml
 - lib/phony_rails/locales/ja.yml
 - lib/phony_rails/locales/km.yml
+- lib/phony_rails/locales/ru.yml
 - lib/phony_rails/locales/tr.yml
+- lib/phony_rails/locales/uk.yml
 - lib/phony_rails/string_extensions.rb
 - lib/phony_rails/version.rb
 - lib/validators/phony_validator.rb
@@ -105,7 +107,7 @@ homepage: https://github.com/joost/phony_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: It now ads a '+' to the normalized number when it starts with
+post_install_message: It now adds a '+' to the normalized number when it starts with
   a country number!
 rdoc_options: []
 require_paths: