phony_rails 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.2.2)
+    phony_rails (0.3.0)
       activerecord (>= 3.0)
       countries (>= 0.8.2)
       phony (>= 1.7.7)

data/lib/phony_rails.rb

@@ -12,6 +12,8 @@ module PhonyRails
 
   # This method requires a country_code attribute (eg. NL) and phone_number to be set.
   # Options:
+  #   :country_number => The country dial code (eg. 31 for NL).
+  #   :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).
   # This idea came from:
@@ -21,12 +23,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])
+    if country_number = options[: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])
+    elsif default_country_number = options[: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|\+)/
+      number = "#{default_country_number}#{number}" if not number =~ /^(00|\+|#{default_country_number})/
     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.3.0"
+  VERSION = "0.3.1"
 end

data/spec/lib/phony_rails_spec.rb

@@ -72,10 +72,14 @@ describe PhonyRails 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
       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('464790909090')
+        PhonyRails.normalize_number('4790909090', :country_code => 'SE').should eql('464790909090')
       end
 
     end

metadata

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