phony_rails 0.9.0 → 0.11.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 80dc843f05314cf9e2803669393f3b098a673c46
+  data.tar.gz: 2d0bf093da3ee71fb2067d87e61dd15fd706dbaa
+SHA512:
+  metadata.gz: 05c20a589cf245c3ab11f971e8111a32734e362e67562ce0911b56779fda6f86a79a2c4598b049cc443457a3c96c4f3bd37c28ec39aac9184a49293739f4a1e4
+  data.tar.gz: dd3085cd688a02853f4fae937a45208cc2ba895b20be49bcef1b32fa20e9cc4ab67c8686a410f14c0a7284067b73c60b63bc8f7b7fb94addd88588c42da231a2

data/.gitignore

@@ -1,2 +1,4 @@
 /.rvmrc
 /.idea/
+.ruby-gemset
+.ruby-version

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.8.2)
+    phony_rails (0.10.1)
       activesupport (>= 3.0)
       countries (>= 0.8.2)
-      phony (~> 2.10.1)
+      phony (~> 2.11.1)
 
 GEM
   remote: https://rubygems.org/
@@ -71,7 +71,7 @@ GEM
     nenv (0.1.1)
     optionable (0.2.0)
     origin (2.1.1)
-    phony (2.10.1)
+    phony (2.11.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)

data/README.md

@@ -51,7 +51,7 @@ For **Mongoid**, in keeping with Mongoid plug-in conventions you must include th
 
 The `:default_country_code` options is used to specify a country_code when normalizing.
 
-PhonyRails will also check your model for a country_code method to use when normalizing the number. So `'070-12341234'` with `country_code` 'NL' will get normalized to `'317012341234'`.
+PhonyRails will also check your model for a country_code method to use when normalizing the number. So `'070-12341234'` with `country_code` 'NL' will get normalized to `'+317012341234'`.
 
 You can also do-it-yourself and call:
 
@@ -61,8 +61,8 @@ You can also do-it-yourself and call:
 
     PhonyRails.normalize_number('some number', :country_code => 'NL')
 
-    PhonyRails.normalize_number('+4790909090', :country_code => 'SE') # => '464790909090' (forced to +46)
-    PhonyRails.normalize_number('+4790909090', :default_country_code => 'SE') # => '4790909090' (still +47 so not changed)
+    PhonyRails.normalize_number('+4790909090', :country_code => 'SE') # => '+464790909090' (forced to +46)
+    PhonyRails.normalize_number('+4790909090', :default_country_code => 'SE') # => '+4790909090' (still +47 so not changed)
 
 The country_code should always be a ISO 3166-1 alpha-2 (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).
 
@@ -102,6 +102,16 @@ You can validate against the normalized input as opposed to the raw input:
     phony_normalize :phone_number, as: :phone_number_normalized, :default_country_code => 'US'
     validates_plausible_phone :phone_number, :normalized_country_code => 'US'
 
+#### Allowing records country codes to not match phone number country codes
+
+You may have a record specifying one country (via a `country_code` attribute) but using a phone number from another country.  For example, your record may be from Japan but have a phone number from the Philippines. By default, `phony_rails` will consider your record's `country_code` as part of the validation.  If that country doesn't match the country code in the phone number, validation will fail.  
+
+If you want to allow records from one country to have phone numbers from a different one, there are a couple of options you can use: `ignore_record_country_number` and `ignore_record_country_code`.  Use them like so:
+
+    validates :phone_number, :phony_plausible => { :ignore_record_country_code => true, :ignore_record_country_number => true }
+
+Obviously, you don't have to use both, and you may not need or want to set either.
+
 ### Display / Views
 
 In your views use:
@@ -136,17 +146,6 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
     Home.find_by_normalized_phone_number(PhonyRails.normalize_number(params[:phone_number]))
 
-## Changelog
-
-0.8.2
-* Added String#phony_normalized method
-
-## TODO
-
-* Make this work: Home.find_by_normalized_phone_number(Home.normalize_number(params[:phone_number]))
-  So we use Home.normalize_number instead of PhonyRails.normalize_number. This way we can use the same default_country_code.
-* Make country_code method configurable.
-
 ## Contributing
 
 1. Fork it

data/lib/phony_rails.rb

@@ -16,6 +16,7 @@ module PhonyRails
   #   :default_country_number => Fallback country code.
   #   :country_code => The country code we should use.
   #   :default_country_code => Some fallback code (eg. 'NL') that can be used as default (comes from phony_normalize_numbers method).
+  #   :add_plus => Add a '+' in front so we know the country code is added. (default: true)
   # This idea came from:
   #   http://www.redguava.com.au/2011/06/rails-convert-phone-numbers-to-international-format-for-sms/
   def self.normalize_number(number, options = {})
@@ -23,14 +24,18 @@ module PhonyRails
     number = number.clone # Just to be sure, we don't want to change the original.
     number.gsub!(/[^\d\+]/, '') # Strips weird stuff from the number
     return if number.blank?
-    if country_number = options[:country_number] || country_number_for(options[:country_code])
+    if _country_number = options[:country_number] || country_number_for(options[:country_code])
+      options[:add_plus] = true if options[:add_plus].nil?
       # (Force) add country_number if missing
-      number = "#{country_number}#{number}" if not number =~ /\A(00|\+)?#{country_number}/
-    elsif default_country_number = options[:default_country_number] || country_number_for(options[:default_country_code])
+      number = "#{_country_number}#{number}" if not number =~ /\A(00|\+)?#{_country_number}/
+    elsif _default_country_number = options[:default_country_number] || country_number_for(options[:default_country_code])
+      options[:add_plus] = true if options[:add_plus].nil?
       # Add default_country_number if missing
-      number = "#{default_country_number}#{number}" if not number =~ /\A(00|\+|#{default_country_number})/
+      number = "#{_default_country_number}#{number}" if not number =~ /\A(00|\+|#{_default_country_number})/
     end
-    Phony.normalize(number)
+    normalized_number = Phony.normalize(number)
+    options[:add_plus] = true if options[:add_plus].nil? && Phony.plausible?(normalized_number)
+    options[:add_plus] ? "+#{normalized_number}" : normalized_number
   rescue
     number # If all goes wrong .. we still return the original input.
   end

data/lib/phony_rails/locales/ja.yml

@@ -1,4 +1,4 @@
 ja:
   errors:
     messages:
-      improbable_phone: "は正し電話番号ではありません"
+      improbable_phone: "は正しい電話番号ではありません"

data/lib/phony_rails/string_extensions.rb

@@ -1,7 +1,7 @@
   class String
 
     # Usage:
-    #   "+31 (0)30 1234 123".phony_normalized # => '31301234123'
+    #   "+31 (0)30 1234 123".phony_normalized # => '+31301234123'
     #   "(0)30 1234 123".phony_normalized # => '301234123'
     #   "(0)30 1234 123".phony_normalized(country_code: 'NL') # => '301234123'
     def phony_normalized(options = {})
@@ -17,12 +17,21 @@
     #   "010-12341234".phony_formatted(:normalize => :NL)
     # To return nil when a number is not correct (checked using Phony.plausible?) use
     #   "010-12341234".phony_formatted(strict: true)
+    # When an error occurs during conversion it will return the original String.
+    # To raise an error use:
+    #   "somestring".phone_formatted(raise: true)
     def phony_formatted(options = {})
       normalize_country_code = options.delete(:normalize)
-      s = (normalize_country_code ? PhonyRails.normalize_number(self, :default_country_code => normalize_country_code.to_s) : self.gsub(/\D/, ''))
+      s = (normalize_country_code ? PhonyRails.normalize_number(self, :default_country_code => normalize_country_code.to_s, :add_plus => false) : self.gsub(/\D/, ''))
       return if s.blank?
       return if options[:strict] && !Phony.plausible?(s)
       Phony.format(s, options.reverse_merge(:format => :national))
+    rescue
+      if options[:raise]
+        raise
+      else
+        s
+      end
     end
 
     # The bang method

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.9.0"
+  VERSION = "0.11.0"
 end

data/lib/validators/phony_validator.rb

@@ -24,7 +24,7 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   end
 
   def record_country_number
-    @record.country_number if @record.respond_to?(:country_number)
+    @record.country_number if @record.respond_to?(:country_number) && !options[:ignore_record_country_number]
   end
 
   def country_number_from_country_code
@@ -36,7 +36,7 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   end
 
   def record_country_code
-    @record.country_code if @record.respond_to?(:country_code)
+    @record.country_code if @record.respond_to?(:country_code) && !options[:ignore_record_country_code]
   end
 
   def normalized_country_code

data/phony_rails.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
   gem.summary       = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
   gem.homepage      = "https://github.com/joost/phony_rails"
-  gem.license = 'MIT'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -16,8 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = PhonyRails::VERSION
 
-  gem.add_dependency "phony", "~> 2.10.1"
-  gem.add_dependency "countries", ">= 0.8.2"
+  gem.post_install_message = "PhonyRails v0.10.0 changes the way numbers are stored!"
+  gem.post_install_message = "It now ads a '+' to the normalized number when it starts with a country number!"
+
+  gem.add_dependency "phony", '~> 2.11', '>= 2.11.1'
+  gem.add_dependency "countries", '~> 0.8', '>= 0.8.2'
   gem.add_dependency "activesupport", ">= 3.0"
   gem.add_development_dependency "activerecord", ">= 3.0"
   gem.add_development_dependency "mongoid", ">= 3.0"

data/spec/lib/phony_rails_spec.rb

@@ -66,19 +66,44 @@ describe PhonyRails do
 
       end
 
+      describe 'with raise option' do
+
+        # https://github.com/joost/phony_rails/issues/79
+
+        context 'when raise is true' do
+          it "should raise the error" do
+            lambda {
+              "8887716095".phony_formatted(format: :international, raise: true)
+            }.should raise_error(NoMethodError)
+          end
+        end
+
+        context 'when raise is false (default)' do
+          it "should return original String on exception" do
+            "8887716095".phony_formatted(format: :international).should eq('8887716095')
+          end
+        end
+
+      end
+
       describe "specific tests from issues" do
 
+        # https://github.com/joost/phony_rails/issues/79
+        it "should pass issue Github issue #42" do
+          "8887716095".phony_formatted(format: :international, normalize: 'US', raise: true).should eq('+1 888 771 6095')
+        end
+
         # https://github.com/joost/phony_rails/issues/42
         it "should pass issue Github issue #42" do
-          PhonyRails.normalize_number("0606060606", default_country_code: 'FR').should eq('33606060606')
+          PhonyRails.normalize_number("0606060606", default_country_code: 'FR').should eq('+33606060606')
         end
 
       end
 
       it "should not change original String" do
-        s = "0101234123"
+        s = '0101234123'
         s.phony_formatted(:normalize => :NL).should eql('010 123 4123')
-        s.should eql("0101234123")
+        s.should eql('0101234123')
       end
 
       it "should phony_format a digits string with spaces String" do
@@ -107,7 +132,7 @@ describe PhonyRails do
 
       context "when String misses a country_code" do
         it "should normalize with :country_code option" do
-          "010 1231234".phony_normalized(:country_code => :NL).should eql("31101231234")
+          "010 1231234".phony_normalized(:country_code => :NL).should eql("+31101231234")
         end
 
         it "should normalize without :country_code option" do
@@ -116,7 +141,7 @@ describe PhonyRails do
       end
 
       it "should normalize a String" do
-        "+31 (0)10 1231234".phony_normalized.should eql("31101231234")
+        "+31 (0)10 1231234".phony_normalized.should eql("+31101231234")
       end
 
     end
@@ -127,19 +152,19 @@ describe PhonyRails do
     context 'number with a country code' do
 
       it "should not add default_country_code" do
-        PhonyRails.normalize_number('+4790909090', :default_country_code => 'SE').should eql('4790909090') # SE = +46
-        PhonyRails.normalize_number('004790909090', :default_country_code => 'SE').should eql('4790909090')
-        PhonyRails.normalize_number('4790909090', :default_country_code => 'NO').should eql('4790909090') # NO = +47
+        PhonyRails.normalize_number('+4790909090', :default_country_code => 'SE').should eql('+4790909090') # SE = +46
+        PhonyRails.normalize_number('004790909090', :default_country_code => 'SE').should eql('+4790909090')
+        PhonyRails.normalize_number('4790909090', :default_country_code => 'NO').should eql('+4790909090') # NO = +47
       end
 
       it "should force add country_code" do
-        PhonyRails.normalize_number('+4790909090', :country_code => 'SE').should eql('464790909090')
-        PhonyRails.normalize_number('004790909090', :country_code => 'SE').should eql('4604790909090') # FIXME: differs due to Phony.normalize in v2.7.1?!
-        PhonyRails.normalize_number('4790909090', :country_code => 'SE').should eql('464790909090')
+        PhonyRails.normalize_number('+4790909090', :country_code => 'SE').should eql('+464790909090')
+        PhonyRails.normalize_number('004790909090', :country_code => 'SE').should eql('+4604790909090') # FIXME: differs due to Phony.normalize in v2.7.1?!
+        PhonyRails.normalize_number('4790909090', :country_code => 'SE').should eql('+464790909090')
       end
 
       it "should recognize lowercase country codes" do
-        PhonyRails.normalize_number('4790909090', :country_code => 'se').should eql('464790909090')
+        PhonyRails.normalize_number('4790909090', :country_code => 'se').should eql('+464790909090')
       end
 
     end
@@ -147,36 +172,47 @@ describe PhonyRails do
     context 'number without a country code' do
 
       it "should normalize with a default_country_code" do
-        PhonyRails.normalize_number('010-1234123', :default_country_code => 'NL').should eql('31101234123')
+        PhonyRails.normalize_number('010-1234123', :default_country_code => 'NL').should eql('+31101234123')
       end
 
       it "should normalize with a country_code" do
-        PhonyRails.normalize_number('010-1234123', :country_code => 'NL', :default_country_code => 'DE').should eql('31101234123')
-        PhonyRails.normalize_number('010-1234123', :country_code => 'NL').should eql('31101234123')
+        PhonyRails.normalize_number('010-1234123', :country_code => 'NL', :default_country_code => 'DE').should eql('+31101234123')
+        PhonyRails.normalize_number('010-1234123', :country_code => 'NL').should eql('+31101234123')
       end
 
       it "should handle different countries" do
-        PhonyRails.normalize_number('(030) 8 61 29 06', :country_code => 'DE').should eql('49308612906')
-        PhonyRails.normalize_number('0203 330 8897', :country_code => 'GB').should eql('442033308897')
+        PhonyRails.normalize_number('(030) 8 61 29 06', :country_code => 'DE').should eql('+49308612906')
+        PhonyRails.normalize_number('0203 330 8897', :country_code => 'GB').should eql('+442033308897')
       end
 
       it "should prefer country_code over default_country_code" do
-        PhonyRails.normalize_number('(030) 8 61 29 06', :country_code => 'DE', :default_country_code => 'NL').should eql('49308612906')
+        PhonyRails.normalize_number('(030) 8 61 29 06', :country_code => 'DE', :default_country_code => 'NL').should eql('+49308612906')
       end
 
       it "should recognize lowercase country codes" do
-        PhonyRails.normalize_number('010-1234123', :country_code => 'nl').should eql('31101234123')
+        PhonyRails.normalize_number('010-1234123', :country_code => 'nl').should eql('+31101234123')
       end
 
     end
 
-    it "should handle some edge cases" do
-      PhonyRails.normalize_number('some nasty stuff in this +31 number 10-1234123 string', :country_code => 'NL').should eql('31101234123')
-      PhonyRails.normalize_number('070-4157134', :country_code => 'NL').should eql('31704157134')
-      PhonyRails.normalize_number('0031-70-4157134', :country_code => 'NL').should eql('31704157134')
-      PhonyRails.normalize_number('+31-70-4157134', :country_code => 'NL').should eql('31704157134')
-      PhonyRails.normalize_number('0322-69497', :country_code => 'BE').should eql('3232269497')
-      PhonyRails.normalize_number('+32 3 226 94 97', :country_code => 'BE').should eql('3232269497')
+    it "should handle some edge cases (with country_code)" do
+      PhonyRails.normalize_number('some nasty stuff in this +31 number 10-1234123 string', :country_code => 'NL').should eql('+31101234123')
+      PhonyRails.normalize_number('070-4157134', :country_code => 'NL').should eql('+31704157134')
+      PhonyRails.normalize_number('0031-70-4157134', :country_code => 'NL').should eql('+31704157134')
+      PhonyRails.normalize_number('+31-70-4157134', :country_code => 'NL').should eql('+31704157134')
+      PhonyRails.normalize_number('0322-69497', :country_code => 'BE').should eql('+3232269497')
+      PhonyRails.normalize_number('+32 3 226 94 97', :country_code => 'BE').should eql('+3232269497')
+      PhonyRails.normalize_number('0450 764 000', :country_code => 'AU').should eql('+61450764000')
+    end
+
+    it "should handle some edge cases (with default_country_code)" do
+      PhonyRails.normalize_number('some nasty stuff in this +31 number 10-1234123 string', :country_code => 'NL').should eql('+31101234123')
+      PhonyRails.normalize_number('070-4157134', :default_country_code => 'NL').should eql('+31704157134')
+      PhonyRails.normalize_number('0031-70-4157134', :default_country_code => 'NL').should eql('+31704157134')
+      PhonyRails.normalize_number('+31-70-4157134', :default_country_code => 'NL').should eql('+31704157134')
+      PhonyRails.normalize_number('0322-69497', :default_country_code => 'BE').should eql('+3232269497')
+      PhonyRails.normalize_number('+32 3 226 94 97', :default_country_code => 'BE').should eql('+3232269497')
+      PhonyRails.normalize_number('0450 764 000', :default_country_code => 'AU').should eql('+61450764000')
     end
 
     it "should normalize even an implausible number" do
@@ -285,12 +321,12 @@ describe PhonyRails do
     # Following examples have complete number (with country code!)
       it "should return a normalized version of an attribute" do
         model = model_klass.new(:phone_attribute => "+31-(0)10-1234123")
-        model.normalized_phone_attribute.should eql('31101234123')
+        model.normalized_phone_attribute.should eql('+31101234123')
       end
 
       it "should return a normalized version of a method" do
         model = model_klass.new(:phone_method => "+31-(0)10-1234123")
-        model.normalized_phone_method.should eql('31101234123')
+        model.normalized_phone_method.should eql('+31101234123')
       end
 
     # Following examples have incomplete number
@@ -301,59 +337,60 @@ describe PhonyRails do
 
       it "should use country_code option" do
         model = model_klass.new(:phone_attribute => "(0)10-1234123")
-        model.normalized_phone_attribute(:country_code => 'NL').should eql('31101234123')
+        model.normalized_phone_attribute(:country_code => 'NL').should eql('+31101234123')
       end
 
       it "should use country_code object method" do
         model = model_klass.new(:phone_attribute => "(0)10-1234123", :country_code => 'NL')
-        model.normalized_phone_attribute.should eql('31101234123')
+        model.normalized_phone_attribute.should eql('+31101234123')
       end
 
       it "should fallback to default_country_code option" do
         model = model_klass.new(:phone1_method => "(030) 8 61 29 06")
-        model.normalized_phone1_method.should eql('49308612906')
+        model.normalized_phone1_method.should eql('+49308612906')
       end
 
       it "should overwrite default_country_code option with object method" do
         model = model_klass.new(:phone1_method => "(030) 8 61 29 06", :country_code => 'NL')
-        model.normalized_phone1_method.should eql('31308612906')
+        model.normalized_phone1_method.should eql('+31308612906')
       end
 
       it "should overwrite default_country_code option with option" do
         model = model_klass.new(:phone1_method => "(030) 8 61 29 06")
-        model.normalized_phone1_method(:country_code => 'NL').should eql('31308612906')
+        model.normalized_phone1_method(:country_code => 'NL').should eql('+31308612906')
       end
 
       it "should use last passed options" do
         model = model_klass.new(:phone1_method => "(030) 8 61 29 06")
-        model.normalized_phone1_method(:country_code => 'NL').should eql('31308612906')
-        model.normalized_phone1_method(:country_code => 'DE').should eql('49308612906')
-        model.normalized_phone1_method(:country_code => nil).should eql('49308612906')
+        model.normalized_phone1_method(:country_code => 'NL').should eql('+31308612906')
+        model.normalized_phone1_method(:country_code => 'DE').should eql('+49308612906')
+        model.normalized_phone1_method(:country_code => nil).should eql('+49308612906')
       end
 
       it "should use last object method" do
         model = model_klass.new(:phone1_method => "(030) 8 61 29 06")
         model.country_code = 'NL'
-        model.normalized_phone1_method.should eql('31308612906')
+        model.normalized_phone1_method.should eql('+31308612906')
         model.country_code = 'DE'
-        model.normalized_phone1_method.should eql('49308612906')
+        model.normalized_phone1_method.should eql('+49308612906')
         model.country_code = nil
-        model.normalized_phone1_method(:country_code => nil).should eql('49308612906')
+        model.normalized_phone1_method(:country_code => nil).should eql('+49308612906')
       end
     end
 
     describe 'using model#phony_normalize' do
-      it "should set a normalized version of an attribute" do
+      it "should not change normalized numbers (see #76)" do
         model = model_klass.new(:phone_number => "+31-(0)10-1234123")
         model.valid?.should be_true
-        model.phone_number.should eql('31101234123')
+        model.phone_number.should eql('+31101234123')
+
       end
 
       it "should set a normalized version of an attribute using :as option" do
         model_klass.phony_normalize :phone_number, :as => :phone_number_as_normalized
         model = model_klass.new(:phone_number => "+31-(0)10-1234123")
         model.valid?.should be_true
-        model.phone_number_as_normalized.should eql('31101234123')
+        model.phone_number_as_normalized.should eql('+31101234123')
       end
 
       it "should raise a RuntimeError at validation if the attribute doesn't exist" do
@@ -378,6 +415,20 @@ describe PhonyRails do
     let(:model_klass){ ActiveRecordModel }
     let(:dummy_klass){ ActiveRecordDummy }
     it_behaves_like 'model with PhonyRails'
+
+    it "should correctly keep a hard set country_code" do
+      model = model_klass.new(:fax_number => '+1 978 555 0000')
+      model.valid?.should be_true
+      model.fax_number.should eql('+19785550000')
+      model.save.should be_true
+      model.save.should be_true # revalidate
+      model.reload
+      model.fax_number.should eql('+19785550000')
+      model.fax_number = '(030) 8 61 29 06'
+      model.save.should be_true # revalidate
+      model.reload
+      model.fax_number.should eql('+61308612906')
+    end
   end
 
   describe 'Mongoid' do

data/spec/lib/validators/phony_validator_spec.rb

@@ -46,6 +46,10 @@ ActiveRecord::Schema.define do
   create_table :polish_helpful_homes do |table|
     table.column :phone_number, :string
   end
+
+  create_table :mismatched_helpful_homes do |table|
+    table.column :phone_number, :string
+  end
 end
 
 #--------------------
@@ -108,6 +112,11 @@ class BigHelpfulHome < ActiveRecord::Base
   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}
+end
 #-----------------------------------------------------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------------------------------------------------
@@ -121,6 +130,7 @@ FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'
 FRENCH_NUMBER_WITH_COUNTRY_CODE = '33627899541'
 FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 627899541'
 INVALID_NUMBER = '123456789 123456789 123456789 123456789'
+JAPAN_COUNTRY = 'jp'
 
 #-----------------------------------------------------------------------------------------------------------------------
 describe PhonyPlausibleValidator do
@@ -167,7 +177,7 @@ describe PhonyPlausibleValidator do
       I18n.with_locale(:ja) do
         @home.phone_number = INVALID_NUMBER
         @home.valid?
-        @home.errors.messages.should include(:phone_number => ["は正し電話番号ではありません"])
+        @home.errors.messages.should include(:phone_number => ["は正しい電話番号ではありません"])
       end
     end
 
@@ -433,6 +443,19 @@ describe ActiveModel::Validations::HelperMethods do
 
     end
 
+    #--------------------
+    context 'when a phone number does not match the records country' do
+      before(:each) do
+        @home = MismatchedHelpfulHome.new
+        @home.country_code = JAPAN_COUNTRY
+        @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
+      end
+
+      it "should allow this number" do
+        @home.should be_valid
+      end
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ ActiveRecord::Schema.define do
     table.column :phone_attribute, :string
     table.column :phone_number, :string
     table.column :phone_number_as_normalized, :string
+    table.column :fax_number, :string
   end
 end
 
@@ -26,6 +27,7 @@ module SharedModelMethods
     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_normalize :phone_number # normalized on validation
+    phony_normalize :fax_number, :default_country_code => 'AU'
   end
 end
 
@@ -42,6 +44,7 @@ class MongoidModel
   field :phone_attribute, :type => String
   field :phone_number,    :type => String
   field :phone_number_as_normalized, :type => String
+  field :fax_number
   include SharedModelMethods
 end
 

metadata

@@ -1,94 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.11.0
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: '2.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: This Gem adds useful methods to your Rails app to validate, display and
@@ -99,8 +100,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -125,27 +126,27 @@ files:
 homepage: https://github.com/joost/phony_rails
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message: It now ads a '+' to the normalized number when it starts with
+  a country number!
 rdoc_options: []
 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This Gem adds useful methods to your Rails app to validate, display and save
   phone numbers.
 test_files: