countries-phone_numbers 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e01743be9db3b672170580db4f87af93098682b
-  data.tar.gz: f7ee78a09bebc978aa02c1260d29e86e1fec35e7
+  metadata.gz: 73aa4e1c2d1502535d08993e53b1d8cb56731a9f
+  data.tar.gz: 8e315ad315ebb4680df7496ff82258c27d8066cf
 SHA512:
-  metadata.gz: 7ef8f13cbb4faae29eb73b7bdcdaf163de76f6695648aa9545e0fcd1b1aa8f9e3feac59aa3f4b5d28a41858e273872eaa72abe18e68eb5a223d2ac3b0580c689
-  data.tar.gz: 017cd3072663ce7c2c39905adde84874f5a02959030c884d379c6566e892a0f80864bd4bbde511c9926871fb9718ceebf06c2c3da3d5e3bfd10758701f040810
+  metadata.gz: 3c8bed726e415737eca3ea216b29d6b19396f2c7b641371eff7e71940dff09dd0c26189fcff1c48f94fbb3ef04d8e36a5fbfee902d69b258bbbdefd7dce71beb
+  data.tar.gz: 1059811a467a47700be9288045f8260de6640e43aeeec561f453fb8d7f7623b4652e26db689b128ec42617a27c19dbbdf5b93a3c4887df6eb30106dfa721dc35

data/lib/countries/phone_numbers/extensions.rb

@@ -5,7 +5,7 @@ module Countries::PhoneNumbers::Extensions
   end
   
   def format_phone_number( number, options={} )
-    Phony.formatted( number, options )
+    Phony.formatted( Phony.normalize( number ), options )
   end
   
   def format_local_phone_number( number, options={} )

data/lib/countries/phone_numbers/version.rb

@@ -1,5 +1,5 @@
 module Countries
   module PhoneNumbers
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/countries/phone_numbers.rb

@@ -4,7 +4,7 @@ require "countries/phone_numbers/version"
 require 'countries'
 require 'phony'
 
-# Country::PhoneNumber
+# Countries::PhoneNumber
 require 'countries/phone_numbers/extensions'
 require 'countries/phone_numbers/detector_factory'
 require 'countries/phone_numbers/detector'
@@ -16,8 +16,8 @@ require 'countries/phone_numbers/start_with_detector'
 
 module Countries
   module PhoneNumbers
-    extend Extensions::ClassMethods
-    DATA_FILE = File.join( 'lib', 'countries', 'phone_numbers', 'detectors.yaml' )
+    include Extensions
+    DATA_FILE = File.join( File.dirname(__FILE__), 'phone_numbers', 'detectors.yaml' )
 
     ##
     # Find all countries with shared country codes.

data/spec/countries/country_spec.rb

@@ -5,23 +5,23 @@ describe ISO3166::Country, '#find_*_by_phone_number' do
 
   # Test a bogus phone number
   it 'ignores bogus phone numbers (single digit)' do
-    Country.find_country_by_phone_number( '5' ).should == nil
+    subject.find_country_by_phone_number( '5' ).should == nil
   end
   
   # Test another bogus phone number
   it 'ignores bogus phone numbers (text)' do
-    Country.find_country_by_phone_number( 'abc' ).should == nil
+    subject.find_country_by_phone_number( 'abc' ).should == nil
   end
   
   # Test all data given in the 'TEST' block (defined in the spec helper)
   TEST_DATA.each do |alpha2, numbers|
     numbers.each do |number|
       it "recognises #{number} as #{alpha2.to_s}" do
-        Country.find_country_by_phone_number(number).should_not be_nil
-        Country.find_country_by_phone_number(number).alpha2.should == alpha2.to_s
+        subject.find_country_by_phone_number(number).should_not be_nil
+        subject.find_country_by_phone_number(number).alpha2.should == alpha2.to_s
       end
       it "returns only one country for #{number}" do
-        Country.find_all_countries_by_phone_number(number).should have(1).country
+        subject.find_all_countries_by_phone_number(number).should have(1).country
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries-phone_numbers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ian Lloyd