countries-phone_numbers 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d561853e9d3760b3c102f70af3c152e408fa9dd8
-  data.tar.gz: 1932567b1f8f0eb4d59ad6a3ef59ddfd3608bcb9
+  metadata.gz: adc5cf4e2bbdf410f395c091ab9eb5ed0019cb6d
+  data.tar.gz: 91f80213099c41d8a05ff0b46cbaacd8602a5dcc
 SHA512:
-  metadata.gz: 4c5509d2d0833276557c97c552699e32fabbb91fb4002e3fbffd4206ac3a61371e1ed275cf4ae1b25c4ea827dae87a62536c0107ee6aa2b5464c3cea0f7a0585
-  data.tar.gz: e890000ca9caa47e6fb411cd184cf7bcbadc7bcffac471dd64ba91ba72048683601afaea0fb88903f3c2a7845d7478487b4d1d55287f9c35d5186a4cb6248190
+  metadata.gz: 8f6fe4700f0c6077957574e989866c7b53a9091594652e0eed78904f90ca13794e52615a4a3a5ec88c693bd2cc00523e38b739c85831ec2a531eb29ac641938a
+  data.tar.gz: 03718c0520e2d9c2673d5a24cc5db31706b8e47eba7f7142385e816b446303a12cd350f4096d7a8ead26ae63cd4c150f5f5e336f9464af4bde6d6fbd469b6a92

data/lib/countries/phone_numbers/extensions.rb

@@ -4,23 +4,12 @@ module Countries::PhoneNumbers::Extensions
     base.extend ClassMethods
   end
   
-  def format_phone_number( number, options={} )
-    Phony.formatted( Phony.normalize( number ), options )
-  end
-  
-  def format_local_phone_number( number, options={} )
-    format_phone_number( number, {format: :local}.merge(options) )
-  end
-  
-  def format_international_phone_number( number, options={} )
-    format_phone_number( number, {format: :international}.merge(options) )
-  end
-  
-  def format_national_phone_number( number, options={} )
-    format_phone_number( number, {format: :national}.merge(options) )
-  end
-  
   module ClassMethods
+
+    def plausible_phone_number?( number )
+      Phony.plausible?( number )
+    end
+  
     def normalize_phone_number( number )
       Phony.normalize( number )
     end
@@ -60,7 +49,7 @@ module Countries::PhoneNumbers::Extensions
     ##
     # Find the first country by the given telephone number. Returns the country object itself.
     def find_country_by_phone_number( number )
-      found = Country.find_all_countries_by_phone_number(number)
+      found = find_all_countries_by_phone_number(number)
       found.nil? ? nil : found.first
     end
     

data/lib/countries/phone_numbers/version.rb

@@ -1,5 +1,5 @@
 module Countries
   module PhoneNumbers
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/spec/countries/country_spec.rb

@@ -1,30 +1,12 @@
 require 'spec_helper'
 require 'countries/phone_numbers/ext_finders'
+require 'countries/phone_numbers/ext_formatters'
 
-describe ISO3166::Country, '#find_*_by_phone_number' do
-  subject { Country }
+describe ISO3166::Country do
 
-  # Test a bogus phone number
-  it 'ignores bogus phone numbers (single digit)' do
-    subject.find_country_by_phone_number( '5' ).should == nil
-  end
-  
-  # Test another bogus phone number
-  it 'ignores bogus phone numbers (text)' do
-    subject.find_country_by_phone_number( 'abc' ).should == nil
-  end
+  subject { Country }
   
-  # 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
-        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
-        subject.find_all_countries_by_phone_number(number).should have(1).country
-      end
-    end
-  end
+  it_behaves_like 'a phone number finder'
+  it_behaves_like 'a phone number formatter'
   
 end

data/spec/countries/phone_numbers_spec.rb

@@ -1,32 +1,11 @@
 require 'spec_helper'
 require 'countries/phone_numbers'
 
-describe Countries::PhoneNumbers, '#find_*_by_phone_number' do
-  subject { Countries::PhoneNumbers }
-
-  # Test a bogus phone number
-  it 'ignores bogus phone numbers (single digit)' do
-    subject.find_country_by_phone_number( '5' ).should == nil
-  end
-  
-  # Test another bogus phone number
-  it 'ignores bogus phone numbers (text)' do
-    subject.find_country_by_phone_number( 'abc' ).should == nil
-  end
-  
-  # Test all data given in the 'TEST' block above
-  TEST_DATA.each do |alpha2, numbers|
-    numbers.each do |number|
-      it "recognises #{number} as #{alpha2.to_s}" do
-        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
-        subject.find_all_countries_by_phone_number(number).should have(1).country
-      end
-    end
-  end
+describe Countries::PhoneNumbers do
   
+  it_behaves_like 'a phone number finder'
+  it_behaves_like 'a phone number formatter'
+
   Countries::PhoneNumbers.unresolved_country_codes.each do |country_code, countries|
     pending "Need to resolve CC: #{country_code} for #{countries.join(', ')}."
   end

data/spec/spec_helper.rb

@@ -10,6 +10,10 @@ require 'countries/phone_numbers'
 require 'yaml'
 TEST_DATA = YAML.load_file( File.join( File.dirname(__FILE__), 'test_data.yaml' ) )
 
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f}
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only
@@ -18,8 +22,11 @@ TEST_DATA = YAML.load_file( File.join( File.dirname(__FILE__), 'test_data.yaml'
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  # Filter
+  config.filter_run :focus => true
+  config.filter_run_excluding :skip
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

data/spec/support/acts_like_a_phone_number_finder.rb

@@ -0,0 +1,33 @@
+shared_examples 'a phone number finder' do |factory|
+
+  # Test a bogus phone number
+  it 'ignores bogus phone numbers (single digit)' do
+    subject.find_country_by_phone_number( '5' ).should == nil
+  end
+  
+  # Test another bogus phone number
+  it 'ignores bogus phone numbers (text)' do
+    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}" do
+        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
+        subject.find_all_countries_by_phone_number(number).should have(1).country
+      end
+      
+      it "recognises #{number} as plausible" do
+        subject.plausible_phone_number?(number).should eq(Phony.plausible?(number))
+      end
+      
+    end # number
+  end # test data
+
+end

data/spec/support/acts_like_a_phone_number_formatter.rb

@@ -0,0 +1,20 @@
+shared_examples 'a phone number formatter' do |factory|
+
+  # Test all data given in the 'TEST' block (defined in the spec helper)
+  TEST_DATA.each do |alpha2, numbers|
+    numbers.each do |number|
+
+      it "formats #{number} internationally" do
+        expected = Phony.format(Phony.normalize(number), format: :international)
+        subject.format_international_phone_number(number).should eq(expected)
+      end
+      
+      it "formats #{number} nationally" do
+        expected = Phony.format(Phony.normalize(number), format: :national)
+        subject.format_national_phone_number(number).should eq(expected)
+      end
+      
+    end # number
+  end # test data
+
+end

data/spec/test_data.yaml

@@ -432,7 +432,6 @@ RW:
 - '250721234567'
 - '250731234567'
 - '250251234567'
-- '25006123456'
 ST:
 - '2392220012'
 - '2399920012'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries-phone_numbers
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ian Lloyd
@@ -137,6 +137,8 @@ files:
 - spec/countries/phone_numbers/detector_factory_spec.rb
 - spec/countries/phone_numbers_spec.rb
 - spec/spec_helper.rb
+- spec/support/acts_like_a_phone_number_finder.rb
+- spec/support/acts_like_a_phone_number_formatter.rb
 - spec/test_data.yaml
 homepage: http://github.com/illoyd/countries-phone_numbers
 licenses:
@@ -167,4 +169,6 @@ test_files:
 - spec/countries/phone_numbers/detector_factory_spec.rb
 - spec/countries/phone_numbers_spec.rb
 - spec/spec_helper.rb
+- spec/support/acts_like_a_phone_number_finder.rb
+- spec/support/acts_like_a_phone_number_formatter.rb
 - spec/test_data.yaml