Fix github issue joost#22. joost#22

Author: Joost Hietbrink

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'

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)

lib/phony_rails.rb

@@ -21,9 +21,12 @@ def self.normalize_number(number, options = {})
     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

spec/lib/phony_rails_spec.rb

@@ -68,19 +68,38 @@
   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