phony_rails 0.2.2 → 0.3.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Preempt the default loading so that we don't get an unqualified Country class imported.
 gem 'countries', :require => 'iso3166'

data/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
       phony (>= 1.7.7)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.13)
       activesupport (= 3.2.13)

data/README.md

@@ -44,11 +44,14 @@ PhonyRails will also check your model for a country_code method to use when norm
 You can also do-it-yourself and call:
 
     # Options:
-    #   :country_code => The country code we should use.
+    #   :country_code => The country code we should use (forced).
     #   :default_country_code => Some fallback code (eg. 'NL') that can be used as default (comes from phony_normalize_numbers method).
 
     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)
+
 ### Validation
 
 In your model use the Phony.plausible method to validate an attribute:
@@ -98,6 +101,10 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## Changelog
 
+0.3.0
+* Now ability to force change a country_code.
+  See: https://github.com/joost/phony_rails/pull/23#issuecomment-17480463
+
 0.2.1
 * Better error handling by @k4nar
 

data/lib/phony_rails.rb

@@ -21,9 +21,12 @@ 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 = country_number_for(options[:country_code] || options[:default_country_code])
-      # Add country_number if missing
+    if country_number = country_number_for(options[:country_code])
+      # (Force) add country_number if missing
       number = "#{country_number}#{number}" if not number =~ /^(00|\+)?#{country_number}/
+    elsif default_country_number = country_number_for(options[:default_country_code])
+      # Add default_country_number if missing
+      number = "#{default_country_number}#{number}" if not number =~ /^(00|\+)/
     end
     number = Phony.normalize(number) if Phony.plausible?(number)
     return number.to_s

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/lib/phony_rails_spec.rb

@@ -68,19 +68,38 @@ describe PhonyRails do
   end
 
   describe 'PhonyRails#normalize_number' do
-    it "should normalize a number with a default_country_code" do
-      PhonyRails.normalize_number('010-1234123', :default_country_code => 'NL').should eql('31101234123')
-    end
+    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
+      end
+
+      it "should force add country_code" do
+        PhonyRails.normalize_number('+4790909090', :country_code => 'SE').should eql('464790909090')
+      end
 
-    it "should normalize a number 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')
     end
 
-    it "should handle different countries" do
-      PhonyRails.normalize_number('(030) 8 61 29 06', :country_code => 'DE').should eql('49308612906')
-      PhonyRails.normalize_number('+43 664 3830412', :country_code => 'AT').should eql('436643830412')
-      PhonyRails.normalize_number('0203 330 8897', :country_code => 'GB').should eql('442033308897')
+    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')
+      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')
+      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')
+      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')
+      end
+
     end
 
     it "should handle some edge cases" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony