phony_rails 0.14.7 → 0.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c4c27ba9b21ca10478542b5ba5f87112b0566e
-  data.tar.gz: f081e0772586515e34ff639dc1839152a9a19d62
+  metadata.gz: a7e279baa79785d7c0db788f230299a530f95900
+  data.tar.gz: 2b99f584e90f49369cd5114aac04e6b5c09f198b
 SHA512:
-  metadata.gz: f24f3dbb6851ae7e5ef4886a9ac78c316aa735632b02e3083a18c0b7966d34e846f212532aca21db4b315c9c0d54837d6c39c9f5d53735081e9280a47b24e25a
-  data.tar.gz: 67ede59cd91fe43798eefbb839b3bf17f02e817ce9bd779021f33fad736dee1a34a7ab5f97ff5996e3daf924a16f854f5d8c501154e95a3431cedd48bd7caac3
+  metadata.gz: 6ae91b311ac825d4a8fe61b44d7b74ccfa515ab2702c017c5bcf32774b00fcd622ac29c1fea2da0b962643e848b69dcbef5a8871f5b3c92a1db87ff2cb8dc93b
+  data.tar.gz: d3cdc2fdc49cabb7562b4916e6b56bd8eaf1b85c2d71b93813cda6dfb025a4538bc564115f30a2bde638717f682198915e38aae38258cfab5a297363e5d5551f

data/.rubocop_todo.yml

@@ -61,3 +61,6 @@ Style/Documentation:
     - 'lib/phony_rails.rb'
     - 'lib/phony_rails/string_extensions.rb'
     - 'lib/validators/phony_validator.rb'
+
+Style/RescueModifier:
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-- 2.2.5
-- 2.3.1
+- 2.3.7
+- 2.4.4
+- 2.5.1
 script:
 - bundle exec rspec spec
 - bundle exec rubocop

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [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)
+
+**Closed issues:**
+
+- Country code wrapped in brackets is not recognized [\#170](https://github.com/joost/phony_rails/issues/170)
+- Invalid number in countryCode VN [\#159](https://github.com/joost/phony_rails/issues/159)
+
+**Merged pull requests:**
+
+- Extension option added to normalize\_number [\#176](https://github.com/joost/phony_rails/pull/176) ([ramaboo](https://github.com/ramaboo))
+- return country from phone number [\#169](https://github.com/joost/phony_rails/pull/169) ([aovertus](https://github.com/aovertus))
+- Fix code example in README to match description [\#167](https://github.com/joost/phony_rails/pull/167) ([mattruzicka](https://github.com/mattruzicka))
+
 ## [v0.14.6](https://github.com/joost/phony_rails/tree/v0.14.6) (2017-06-20)
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.14.5...v0.14.6)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.14.7)
+    phony_rails (0.14.9)
       activesupport (>= 3.0)
       phony (> 2.15)
 
@@ -32,7 +32,7 @@ GEM
       tins (~> 1.6)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.18)
+    ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.1)
       formatador (>= 0.2.4)
@@ -74,7 +74,7 @@ GEM
     parallel (1.12.0)
     parser (2.4.0.2)
       ast (~> 2.3)
-    phony (2.16.3)
+    phony (2.16.5)
     powerpack (0.1.1)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -140,4 +140,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

data/README.md

@@ -1,4 +1,4 @@
-# PhonyRails [![Build Status](https://travis-ci.org/joost/phony_rails.svg?branch=master)](https://travis-ci.org/joost/phony_rails) [![Coverage Status](https://coveralls.io/repos/joost/phony_rails/badge.svg)](https://coveralls.io/r/joost/phony_rails) ![Dependencies Status](https://img.shields.io/gemnasium/joost/phony_rails.svg) ![Gem](https://img.shields.io/gem/v/phony_rails.svg)
+# PhonyRails [![Build Status](https://travis-ci.org/joost/phony_rails.svg?branch=master)](https://travis-ci.org/joost/phony_rails) [![Coverage Status](https://coveralls.io/repos/joost/phony_rails/badge.svg)](https://coveralls.io/r/joost/phony_rails) ![Dependencies Status](https://img.shields.io/gem/v/phony_rails.svg)
 
 This small Gem adds useful methods to your Rails app to validate, display and save phone numbers.
 It uses the super awesome Phony gem (https://github.com/floere/phony).
@@ -133,7 +133,7 @@ validates_plausible_phone :phone_number, without: /\A\+\d+/
 validates_plausible_phone :phone_number, presence: true, with: /\A\+\d+/
 ```
 
-the i18n key is `:improbable_phone`. Languages supported by default: de, en, fr, it, ja, kh, nl, tr, ua and ru.
+the i18n key is `:improbable_phone`. Languages supported by default: de, en, es, fr, it, ja, kh, nl, tr, ua and ru.
 
 You can also validate if a number has the correct country number:
 

data/lib/phony_rails.rb

@@ -44,7 +44,7 @@ module PhonyRails
   #   :extension => Include the extension. (default: true)
   # This idea came from:
   #   http://www.redguava.com.au/2011/06/rails-convert-phone-numbers-to-international-format-for-sms/
-  def self.normalize_number(number, options = {})
+  def self.normalize_number(number, options = {}, current_instance = nil)
     return if number.nil?
     original_number = number
     number = number.dup # Just to be sure, we don't want to change the original.
@@ -58,7 +58,7 @@ module PhonyRails
       if !Phony.plausible?(number) || _country_number != country_code_from_number(number)
         number = "#{_country_number}#{number}"
       end
-    elsif _default_country_number = extract_default_country_number(options)
+    elsif _default_country_number = extract_default_country_number(options, current_instance)
       options[:add_plus] = true if options[:add_plus].nil?
       number = normalize_number_default_country(number, _default_country_number)
     end
@@ -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\(?\+/ # if we don't have a +
       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
@@ -88,8 +88,13 @@ module PhonyRails
     number
   end
 
-  def self.extract_default_country_number(options = {})
-    options[:default_country_number] || country_number_for(options[:default_country_code]) || default_country_number
+  def self.extract_default_country_number(options = {}, current_instance = nil)
+    country_code = if current_instance.present? && options[:default_country_code].respond_to?(:call)
+                     options[:default_country_code].call(current_instance) rescue nil
+                   else
+                     options[:default_country_code]
+                   end
+    options[:default_country_number] || country_number_for(country_code) || default_country_number
   end
 
   def self.country_code_from_number(number)
@@ -136,7 +141,7 @@ module PhonyRails
 
       # This methods sets the attribute to the normalized version.
       # It also adds the country_code (number), eg. 31 for NL numbers.
-      def set_phony_normalized_numbers(attributes, options = {})
+      def set_phony_normalized_numbers(current_instance, attributes, options = {})
         options = options.dup
         assign_values_for_phony_symbol_options(options)
         if respond_to?(:country_code)
@@ -146,7 +151,7 @@ module PhonyRails
         attributes.each do |attribute|
           attribute_name = options[:as] || attribute
           raise("No attribute #{attribute_name} found on #{self.class.name} (PhonyRails)") unless self.class.attribute_method?(attribute_name)
-          new_value = PhonyRails.normalize_number(send(attribute), options)
+          new_value = PhonyRails.normalize_number(send(attribute), options, current_instance)
           send("#{attribute_name}=", new_value) if new_value || attribute_name != attribute
         end
       end
@@ -178,7 +183,7 @@ module PhonyRails
 
         # Add before validation that saves a normalized version of the phone number
         before_validation conditional do
-          set_phony_normalized_numbers(attributes, options)
+          set_phony_normalized_numbers(self, attributes, options)
         end
       end
 

data/lib/phony_rails/locales/es.yml

@@ -0,0 +1,4 @@
+es:
+  errors:
+    messages:
+      improbable_phone: "es un número inválido"

data/lib/phony_rails/version.rb

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

data/phony_rails.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../lib/phony_rails/version', __FILE__)
+require File.expand_path('lib/phony_rails/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ['Joost Hietbrink']

data/spec/lib/phony_rails_spec.rb

@@ -20,7 +20,7 @@ describe PhonyRails do
       describe 'with the bang!' do
         it 'changes the String using the bang method' do
           # Mutable String
-          s = +'0101234123' rescue '0101234123' # rubocop:disable Style/RescueModifier
+          s = +'0101234123' rescue '0101234123'
           expect(s.phony_formatted!(normalize: :NL, format: :international)).to eql('+31 10 123 4123')
           expect(s).to eql('+31 10 123 4123')
         end
@@ -218,6 +218,12 @@ describe PhonyRails do
           phone = PhonyRails.normalize_number(phone)
           expect(phone).to eq('+491751234567')
         end
+
+        it 'should pass Github issue #170 (part 2)' do
+          phone = '(+49) 175 123 4567'
+          phone = PhonyRails.normalize_number(phone, default_country_code: 'DE')
+          expect(phone).to eq('+491751234567')
+        end
       end
 
       it 'should not change original String' do
@@ -722,6 +728,30 @@ describe PhonyRails do
         expect(model.symboled_phone).to eql('+33606060606')
       end
 
+      context 'relational normalization' do
+        it 'should normalize based on custom attribute of the current model' do
+          model_klass.phony_normalize :phone_number, default_country_code: ->(instance) { instance.custom_country_code }
+          model = model_klass.new phone_number: '012 416 0001', custom_country_code: 'MY'
+          expect(model).to be_valid
+          expect(model.phone_number).to eq('+60124160001')
+        end
+
+        it 'should normalize based on specific attribute of the associative model' do
+          model_klass.phony_normalize :phone_number, default_country_code: ->(instance) { instance.home_country.country_code }
+          home_country = double('home_country', country_code: 'MY')
+          model = model_klass.new phone_number: '012 416 0001', home_country: home_country
+          expect(model).to be_valid
+          expect(model.phone_number).to eq('+60124160001')
+        end
+
+        it 'should normalize based on default value if missing associative model' do
+          model_klass.phony_normalize :phone_number, default_country_code: ->(instance) { instance.home_country&.country_code || 'MY' }
+          model = model_klass.new phone_number: '012 416 0001', home_country: nil
+          expect(model).to be_valid
+          expect(model.phone_number).to eq('+60124160001')
+        end
+      end
+
       context 'conditional normalization' do
         context 'standalone methods' do
           it 'should only normalize if the :if conditional is true' do

data/spec/lib/validators/phony_validator_spec.rb

@@ -240,6 +240,14 @@ describe PhonyPlausibleValidator do
       end
     end
 
+    it 'should translate the error message in Spanish' do
+      I18n.with_locale(:es) do
+        @home.phone_number = INVALID_NUMBER
+        @home.valid?
+        expect(@home.errors.messages).to include(phone_number: ['es un número inválido'])
+      end
+    end
+
     it 'should translate the error message in French' do
       I18n.with_locale(:fr) do
         @home.phone_number = INVALID_NUMBER

data/spec/spec_helper.rb

@@ -31,7 +31,10 @@ end
 module SharedModelMethods
   extend ActiveSupport::Concern
   included do
-    attr_accessor :phone_method, :phone1_method, :symboled_phone_method, :country_code, :country_code_attribute, :recipient, :delivery_method
+    attr_accessor(
+      :country_code, :country_code_attribute, :custom_country_code, :delivery_method,
+      :home_country, :phone_method, :phone1_method, :recipient, :symboled_phone_method
+    )
     phony_normalized_method :phone_attribute # adds normalized_phone_attribute method
     phony_normalized_method :phone_method # adds normalized_phone_method method
     phony_normalized_method :phone1_method, default_country_code: 'DE' # adds normalized_phone_method method

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.9
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,6 +90,7 @@ files:
 - lib/phony_rails.rb
 - lib/phony_rails/locales/de.yml
 - lib/phony_rails/locales/en.yml
+- lib/phony_rails/locales/es.yml
 - lib/phony_rails/locales/fr.yml
 - lib/phony_rails/locales/he.yml
 - lib/phony_rails/locales/it.yml