phony_rails 0.12.7 → 0.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1bf0320fb96ad7df05e5ff32c9f8c8ebc45d0ea
-  data.tar.gz: e7229d45cd8439a917d44bedede1ebd790f3a7c7
+  metadata.gz: 5f955ac8d52e7faa2965313a1d8643dce32d780d
+  data.tar.gz: 50cf60a64472724f47bfa733458a8182aaafe651
 SHA512:
-  metadata.gz: c692be57b1024ee4169a81e2eea41667869f1ed61988138cc3429aeac75a60d27f8f2654b92f0f380aaba2a13c6980391737c82dda56220af3bb088fd6198f83
-  data.tar.gz: 9feb8d8b598c9593036995f935a70e8735ea2a2e1254ea46f77357f354a1d21ded8e0ea9341280a6823028712ff3a65fddd87f0e16045b8484dd74de7a1033e2
+  metadata.gz: ad42f17903eff99998805e0ae79609a7dd86e13fce1a27003448ac356fb65f01efdf8ad3449de11369c825bf9c25bdd7408c08c613074953663293642a9db756
+  data.tar.gz: 24e081e4b42f81dcd035c2b3afadb6c83e11c523bffe9e18fec3ea6a84f5dafc216d7904942d733816528b62476da00dcedec9d1b9e86f51bccc0de4e3e0acfc

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+## [v0.12.8](https://github.com/joost/phony_rails/tree/v0.12.8) (2015-06-22)
+
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.7...v0.12.8)
+
+**Closed issues:**
+
+- activerecord dependency [\#99](https://github.com/joost/phony_rails/issues/99)
+
+- Using a number different from the country [\#97](https://github.com/joost/phony_rails/issues/97)
+
+- UK 0203 numbers not handled correctly [\#95](https://github.com/joost/phony_rails/issues/95)
+
+- Consider keeping a Changelog for changes in each version. [\#91](https://github.com/joost/phony_rails/issues/91)
+
+- Phone numbers with extensions [\#78](https://github.com/joost/phony_rails/issues/78)
+
+**Merged pull requests:**
+
+- remove active\_record dependency [\#100](https://github.com/joost/phony_rails/pull/100) ([sbounmy](https://github.com/sbounmy))
+
+- Add enforce\_record\_country option to phony\_normalize method [\#98](https://github.com/joost/phony_rails/pull/98) ([phillipp](https://github.com/phillipp))
+
 ## [v0.12.7](https://github.com/joost/phony_rails/tree/v0.12.7) (2015-06-18)
 
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.6...v0.12.7)

data/README.md

@@ -106,7 +106,9 @@ You can validate against the normalized input as opposed to the raw input:
 
 #### Allowing records country codes to not match phone number country codes
 
-You may have a record specifying one country (via a `country_code` attribute) but using a phone number from another country.  For example, your record may be from Japan but have a phone number from the Philippines. By default, `phony_rails` will consider your record's `country_code` as part of the validation.  If that country doesn't match the country code in the phone number, validation will fail.  
+You may have a record specifying one country (via a `country_code` attribute) but using a phone number from another country.  For example, your record may be from Japan but have a phone number from the Philippines. By default, `phony_rails` will consider your record's `country_code` as part of the validation.  If that country doesn't match the country code in the phone number, validation will fail.
+
+Additionally, `phony_normalize` will always add the records country code as the country number (eg. the user enters '+81xxx' for Japan and the records `country_code` is 'DE' then `phony_normalize` will change the number to '+4981'). You can turn this off by adding `:enforce_record_country => false` to the validation options. The country_code will then only be added if no country code is specified.
 
 If you want to allow records from one country to have phone numbers from a different one, there are a couple of options you can use: `ignore_record_country_number` and `ignore_record_country_code`.  Use them like so:
 

data/lib/phony_rails.rb

@@ -76,7 +76,10 @@ module PhonyRails
       # It also adds the country_code (number), eg. 31 for NL numbers.
       def set_phony_normalized_numbers(attributes, options = {})
         options = options.clone
-        options[:country_code] ||= self.country_code if self.respond_to?(:country_code)
+        if self.respond_to?(:country_code)
+          set_country_as = options[:enforce_record_country] ? :country_code : :default_country_code
+          options[set_country_as] ||= self.country_code
+        end
         attributes.each do |attribute|
           attribute_name = options[:as] || attribute
           raise RuntimeError, "No attribute #{attribute_name} found on #{self.class.name} (PhonyRails)" if not self.class.attribute_method?(attribute_name)
@@ -94,11 +97,13 @@ module PhonyRails
       # you've geocoded before calling this method!
       def phony_normalize(*attributes)
         options = attributes.last.is_a?(Hash) ? attributes.pop : {}
-        options.assert_valid_keys :country_number, :default_country_number, :country_code, :default_country_code, :add_plus, :as
+        options.assert_valid_keys :country_number, :default_country_number, :country_code, :default_country_code, :add_plus, :as, :enforce_record_country
         if options[:as].present?
           raise ArgumentError, ':as option can not be used on phony_normalize with multiple attribute names! (PhonyRails)' if attributes.size > 1
         end
 
+        options[:enforce_record_country] = true if options[:enforce_record_country].nil?
+
         # Add before validation that saves a normalized version of the phone number
         self.before_validation do
           set_phony_normalized_numbers(attributes, options)

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.12.7"
+  VERSION = "0.12.8"
 end

data/lib/validators/phony_validator.rb

@@ -1,7 +1,7 @@
 # Uses the Phony.plausible method to validate an attribute.
 # Usage:
 #   validate :phone_number, :phony_plausible => true
-require 'active_record'
+require 'active_model'
 class PhonyPlausibleValidator < ActiveModel::EachValidator
 
   # Validates a String using Phony.plausible? method.

data/spec/lib/phony_rails_spec.rb

@@ -360,7 +360,7 @@ describe PhonyRails do
       end
 
       it "should accept supported options" do
-        options = [:country_number, :default_country_number, :country_code, :default_country_code, :add_plus, :as]
+        options = [:country_number, :default_country_number, :country_code, :default_country_code, :add_plus, :as, :enforce_record_country]
         options.each do |option_sym|
           expect(lambda {
             dummy_klass.phony_normalize(:phone_number, option_sym => false)
@@ -493,6 +493,55 @@ describe PhonyRails do
       model.reload
       expect(model.fax_number).to eql('+61308612906')
     end
+
+    context 'when enforce_record_country is turned off' do
+      let(:model_klass)  { RelaxedActiveRecordModel }
+      let(:record)       { model_klass.new }
+
+      before {
+        record.phone_number = phone_number
+        record.country_code = 'DE'
+        record.valid? # run the empty validation chain to execute the before hook (normalized the number)
+      }
+
+      context 'when the country_code attribute does not match the country number' do
+        context 'when the number is prefixed with a country number and a plus' do
+          let(:phone_number) { '+436601234567' }
+
+          it 'should not add the records country number' do
+            expect(record.phone_number).to eql('+436601234567')
+          end
+        end
+
+        # In this case it's not clear if there is a country number, so it should be added
+        context 'when the number is prefixed with a country number' do
+          let(:phone_number) { '436601234567' }
+
+          it 'should add the records country number' do
+            expect(record.phone_number).to eql('+49436601234567')
+          end
+        end
+      end
+
+      # This should be the case anyways
+      context 'when the country_code attribute matches the country number' do
+        context 'when the number includes a country number and a plus' do
+          let(:phone_number) { '+491721234567' }
+
+          it 'should not add the records country number' do
+            expect(record.phone_number).to eql('+491721234567')
+          end
+        end
+
+        context 'when the number has neither country number nor plus' do
+          let(:phone_number) { '01721234567' }
+
+          it 'should not add the records country number' do
+            expect(record.phone_number).to eql('+491721234567')
+          end
+        end
+      end
+    end
   end
 
   describe 'Mongoid' do

data/spec/spec_helper.rb

@@ -35,6 +35,13 @@ class ActiveRecordModel < ActiveRecord::Base
   include SharedModelMethods
 end
 
+class RelaxedActiveRecordModel < ActiveRecord::Base
+  self.table_name = 'active_record_models'
+  attr_accessor :phone_number, :country_code
+
+  phony_normalize :phone_number, :enforce_record_country => false
+end
+
 class ActiveRecordDummy < ActiveRecordModel
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.12.8
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony