phony_rails 0.14.9 → 0.14.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7e279baa79785d7c0db788f230299a530f95900
-  data.tar.gz: 2b99f584e90f49369cd5114aac04e6b5c09f198b
+  metadata.gz: 383011d77dc615fbacdbf4ebe23f4c89db28122b
+  data.tar.gz: a123f3f39a984f21216f7f72b5031dda84b84c8c
 SHA512:
-  metadata.gz: 6ae91b311ac825d4a8fe61b44d7b74ccfa515ab2702c017c5bcf32774b00fcd622ac29c1fea2da0b962643e848b69dcbef5a8871f5b3c92a1db87ff2cb8dc93b
-  data.tar.gz: d3cdc2fdc49cabb7562b4916e6b56bd8eaf1b85c2d71b93813cda6dfb025a4538bc564115f30a2bde638717f682198915e38aae38258cfab5a297363e5d5551f
+  metadata.gz: 47a2c46b310e1b4af1d3a41cc5ababd92d7226dfac7c7f9509f9356774c9e81e8e455213f5d23c9ab91434c9d3143f0916ed90d59e21065040613396583ae163
+  data.tar.gz: e31193d4001b20da3d9ab6c737754b896d1a3ae8bdc8aa942c2b7766ba17439a2c751891bfb85bdbdfe484e823898ff9b8bef6e7c97d2cc59fe6e01519976fa1

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Change Log
 
+## [v0.14.10](https://github.com/joost/phony_rails/tree/v0.14.10) (2018-10-11)
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.9...v0.14.10)
+
+**Closed issues:**
+
+- PhonyRails.default\_country\_code too intrusive in plausible\_number? method [\#179](https://github.com/joost/phony_rails/issues/179)
+- default\_country\_code overrides 00-prefix country code [\#175](https://github.com/joost/phony_rails/issues/175)
+- Valid 260 area code number is reported as invalid [\#168](https://github.com/joost/phony_rails/issues/168)
+- Croatian number not validating as plausible. [\#165](https://github.com/joost/phony_rails/issues/165)
+- phony\_formatted not returning original String for non-digit only strings [\#163](https://github.com/joost/phony_rails/issues/163)
+- should all normalized numbers be valid? [\#162](https://github.com/joost/phony_rails/issues/162)
+- Extensions not working out of the box for validator [\#160](https://github.com/joost/phony_rails/issues/160)
+
+**Merged pull requests:**
+
+- Remove errant `puts` [\#188](https://github.com/joost/phony_rails/pull/188) ([stevenharman](https://github.com/stevenharman))
+- Close issues [\#185](https://github.com/joost/phony_rails/pull/185) ([joost](https://github.com/joost))
+- Better PhonyRails.plausible\_number? method. Closes \#179. [\#184](https://github.com/joost/phony_rails/pull/184) ([joost](https://github.com/joost))
+- Allow numbers starting with 00 country codes. Closes \#175. [\#183](https://github.com/joost/phony_rails/pull/183) ([joost](https://github.com/joost))
+
+## [v0.14.9](https://github.com/joost/phony_rails/tree/v0.14.9) (2018-09-05)
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.7...v0.14.9)
+
+**Closed issues:**
+
+- Cut new release 0.14.7 to include new extension removal logic [\#177](https://github.com/joost/phony_rails/issues/177)
+- default\_country\_code based on relation [\#174](https://github.com/joost/phony_rails/issues/174)
+
+**Merged pull requests:**
+
+- Allow brackets. Closes \#170. [\#182](https://github.com/joost/phony_rails/pull/182) ([joost](https://github.com/joost))
+- add lambda support for default country code [\#181](https://github.com/joost/phony_rails/pull/181) ([kimyu92](https://github.com/kimyu92))
+- Add Spanish translation for validation error [\#178](https://github.com/joost/phony_rails/pull/178) ([r-sierra](https://github.com/r-sierra))
+
 ## [v0.14.7](https://github.com/joost/phony_rails/tree/v0.14.7) (2018-05-25)
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.6...v0.14.7)
 
@@ -127,7 +161,7 @@
 **Merged pull requests:**
 
 - Update readme [\#117](https://github.com/joost/phony_rails/pull/117) ([toydestroyer](https://github.com/toydestroyer))
-- Add uk, ru error message translations [\#114](https://github.com/joost/phony_rails/pull/114) ([shhavel](https://github.com/shhavel))
+- Add uk, ru error message translations [\#114](https://github.com/joost/phony_rails/pull/114) ([sanavy](https://github.com/sanavy))
 - Update phony\_rails.gemspec [\#112](https://github.com/joost/phony_rails/pull/112) ([Agsiegert](https://github.com/Agsiegert))
 - Don't re-parse country codes YAML file every time it's needed. [\#111](https://github.com/joost/phony_rails/pull/111) ([jcoleman](https://github.com/jcoleman))
 - Replace countries dependency with YAML file [\#109](https://github.com/joost/phony_rails/pull/109) ([monfresh](https://github.com/monfresh))

data/lib/phony_rails.rb

@@ -76,7 +76,7 @@ module PhonyRails
   def self.normalize_number_default_country(number, default_country_number)
     # We try to add the default country number and see if it is a
     # correct phone number. See https://github.com/joost/phony_rails/issues/87#issuecomment-89324426
-    unless number =~ /\A\(?\+/ # if we don't have a +
+    unless number =~ /\A\(?(\+|00)/ # if we don't have a + or 00
       return "#{default_country_number}#{number}" if Phony.plausible?("#{default_country_number}#{number}") || !Phony.plausible?(number) || country_code_from_number(number).nil?
       # If the number starts with ONE zero (two might indicate a country code)
       # and this is a plausible number for the default_country
@@ -97,11 +97,14 @@ module PhonyRails
     options[:default_country_number] || country_number_for(country_code) || default_country_number
   end
 
+  # Returns the country dail code (eg. '31') for a number (eg. +31612341234).
+  # Should probably be named 'country_number_from_number'.
   def self.country_code_from_number(number)
     return nil unless Phony.plausible?(number)
     Phony.split(Phony.normalize(number)).first
   end
 
+  # Returns the country (eg. 'NL') for a number (eg. +31612341234).
   def self.country_from_number(number)
     return nil unless Phony.plausible?(number)
     country_codes_hash.select { |_country, hash| hash['country_code'] == country_code_from_number(number) }.keys[0]
@@ -109,11 +112,13 @@ module PhonyRails
 
   # Wrapper for Phony.plausible?.  Takes the same options as #normalize_number.
   # NB: This method calls #normalize_number and passes _options_ directly to that method.
+  # It uses the 'cc' option for Phony. This was a required param before?
   def self.plausible_number?(number, options = {})
     return false if number.blank?
     number = extract_extension(number).first
     number = normalize_number(number, options)
     country_number = options[:country_number] || country_number_for(options[:country_code]) ||
+                     country_code_from_number(number) ||
                      options[:default_country_number] || country_number_for(options[:default_country_code]) ||
                      default_country_number
     Phony.plausible? number, cc: country_number

data/lib/phony_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PhonyRails
-  VERSION = '0.14.9'
+  VERSION = '0.14.10'
 end

data/spec/lib/phony_rails_spec.rb

@@ -224,6 +224,18 @@ describe PhonyRails do
           phone = PhonyRails.normalize_number(phone, default_country_code: 'DE')
           expect(phone).to eq('+491751234567')
         end
+
+        it 'should pass Github issue #175' do
+          phone = '0041 23456789'
+          phone = PhonyRails.normalize_number(phone, default_country_code: 'DE')
+          expect(phone).to eq('+4123456789')
+        end
+
+        it 'should pass Github issue #175' do
+          phone = '+1 260-437-9123'
+          phone = PhonyRails.normalize_number(phone, default_country_code: 'DE')
+          expect(phone).to eq('+12604379123')
+        end
       end
 
       it 'should not change original String' do
@@ -409,6 +421,7 @@ describe PhonyRails do
     subject { described_class }
     let(:valid_number) { '1 555 555 5555' }
     let(:invalid_number) { '123456789 123456789 123456789 123456789' }
+    let(:another_invalid_number) { '441212' }
     let(:normalizable_number) { '555 555 5555' }
     let(:formatted_french_number_with_country_code) { '+33 627899541' }
     let(:empty_number) { '' }
@@ -418,8 +431,11 @@ describe PhonyRails do
       is_expected.to be_plausible_number valid_number, country_code: 'US'
     end
 
-    it 'returns false for an invalid number' do
+    it 'returns false for an invalid numbers' do
+      is_expected.not_to be_plausible_number invalid_number
       is_expected.not_to be_plausible_number invalid_number, country_code: 'US'
+      is_expected.not_to be_plausible_number another_invalid_number
+      is_expected.not_to be_plausible_number another_invalid_number, country_code: 'US'
     end
 
     it 'returns true for a normalizable number' do
@@ -451,6 +467,10 @@ describe PhonyRails do
       is_expected.not_to be_plausible_number normalizable_number, country_code: 'US'
     end
 
+    it 'should pass Github issue #95' do
+      is_expected.to be_plausible_number '+358414955444', default_country_code: :de
+    end
+
     context 'with default_country_code set' do
       before { PhonyRails.default_country_code = 'FR' }
       after { PhonyRails.default_country_code = nil }
@@ -501,6 +521,12 @@ describe PhonyRails do
     end
   end
 
+  describe 'PhonyRails.country_code_from_number' do
+    it 'returns the code of the plausible phone number' do
+      expect(PhonyRails.country_code_from_number('+32475000000')).to eq '32'
+    end
+  end
+
   describe 'PhonyRails.country_from_number' do
     it 'returns the country of the plausible phone number' do
       expect(PhonyRails.country_from_number('+32475000000')).to eq 'BE'

data/spec/lib/validators/phony_validator_spec.rb

@@ -180,6 +180,7 @@ POLISH_NUMBER_WITH_COUNTRY_CODE = '48600600600'
 FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'
 FRENCH_NUMBER_WITH_COUNTRY_CODE = '33627899541'
 FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 627899541'
+CROATIA_NUMBER_WITH_COUNTRY_CODE = '385 98 352 085'
 INVALID_NUMBER = '123456789 123456789 123456789 123456789'
 NOT_A_NUMBER = 'HAHA'
 JAPAN_COUNTRY = 'jp'
@@ -593,6 +594,12 @@ describe ActiveModel::Validations::HelperMethods do
         expect(@home).to_not be_valid
         expect(@home.errors.messages).to include(phone_number: ['is an invalid number'])
       end
+
+      it 'should pass Gitlab issue #165' do
+        @home.phone_number = CROATIA_NUMBER_WITH_COUNTRY_CODE
+        @home.phone_number_country_code = 'HR'
+        expect(@home).to be_valid
+      end
     end
 
     #--------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.9
+  version: 0.14.10
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport