phony_rails 0.12.13 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97008ef55c4d1d7748babd4150f0cd8ff7cabaeb
-  data.tar.gz: 37045f7383c7811809ba99f151dd133448c4967c
+  metadata.gz: b0995738663fcaf74c4d16fcd132e826cf36f463
+  data.tar.gz: afe9c6ae8831a0bd1fe3c9f3cceab16f3d9cdea3
 SHA512:
-  metadata.gz: 39dc96431aca90966b4d79f6441213cbe6e1fbd920a86e50b1fe10f49606fbe020bb4ae557b0edec411b4a8e15814d3f15e8e102c595b63c6eabf2790596a130
-  data.tar.gz: 73b3c1c05704b4dd21e442888eedd2550688d5d6bb2dbe68475f29671bdff61228f2d0522c919ce8744781ff46060e79eb47c6d5b06bfb523f9d01de9757368c
+  metadata.gz: 7a07bee573a1fc7a166b77346012eec5d5e75d68e339bd59dabbee25e311896fcd05c5431b8b47daea45a00fd7e3ca8c2946160665ace3fd1b590bfaa9e7a34e
+  data.tar.gz: 1744da3879089e47af553e672859a88ccca9f4b85a91a21beeb7074eff1e972bf721a6b2e90b6887b9ac72401c196d5c594af979fbcf3ddebced839a6f2b6644

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## [Unreleased](https://github.com/joost/phony_rails/tree/HEAD)
+
+[Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.11...HEAD)
+
+**Closed issues:**
+
+- Adding country code twice for Luxemburg numbers [\#128](https://github.com/joost/phony_rails/issues/128)
+
+- Unexpected result when calling normalize\_number multiple times with country\_code option [\#126](https://github.com/joost/phony_rails/issues/126)
+
+- No method find\_by\_normalized\_phone\_number [\#125](https://github.com/joost/phony_rails/issues/125)
+
+- Invalid number is valid? [\#124](https://github.com/joost/phony_rails/issues/124)
+
+- Can it validate mobile phone? [\#122](https://github.com/joost/phony_rails/issues/122)
+
+**Merged pull requests:**
+
+- Do not raise NoMethodError when an illegal country code is set [\#133](https://github.com/joost/phony_rails/pull/133) ([klaustopher](https://github.com/klaustopher))
+
+- only assigned normalize values if there is one [\#132](https://github.com/joost/phony_rails/pull/132) ([Smcchoi](https://github.com/Smcchoi))
+
+- Adding Kosovo phone code [\#131](https://github.com/joost/phony_rails/pull/131) ([Xanders](https://github.com/Xanders))
+
+- Add Dutch translation for invalid number [\#129](https://github.com/joost/phony_rails/pull/129) ([bdewater](https://github.com/bdewater))
+
 ## [v0.12.11](https://github.com/joost/phony_rails/tree/v0.12.11) (2015-11-12)
 
 [Full Changelog](https://github.com/joost/phony_rails/compare/v0.12.9...v0.12.11)

data/Gemfile.lock

@@ -1,41 +1,38 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.12.12)
+    phony_rails (0.13.0)
       activesupport (>= 3.0)
       phony (~> 2.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
-    bson (4.0.1)
+    bson (4.0.4)
     builder (3.2.2)
-    coderay (1.1.0)
-    coveralls (0.8.10)
+    coderay (1.1.1)
+    coveralls (0.8.13)
       json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.20160128)
-      unf (>= 0.0.5, < 1.0.0)
     ffi (1.9.10)
     formatador (0.2.5)
     guard (2.13.0)
@@ -56,8 +53,6 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     listen (3.0.6)
@@ -65,39 +60,33 @@ GEM
       rb-inotify (>= 0.9.7)
     lumberjack (1.0.10)
     method_source (0.8.2)
-    mime-types (2.99)
     minitest (5.8.4)
-    mongo (2.2.2)
+    mongo (2.2.4)
       bson (~> 4.0)
-    mongoid (5.1.0)
+    mongoid (5.1.1)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.2)
       tzinfo (>= 0.3.37)
     nenv (0.3.0)
-    netrc (0.11.0)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
     origin (2.2.0)
-    phony (2.15.15)
+    phony (2.15.17)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.5.0)
+    rake (11.1.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -121,9 +110,6 @@ GEM
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby

data/lib/phony_rails.rb

@@ -8,7 +8,7 @@ module PhonyRails
   def self.country_number_for(country_code)
     return if country_code.nil?
 
-    country_codes_hash[country_code.to_s.upcase]['country_code']
+    country_codes_hash.fetch(country_code.to_s.upcase, {})['country_code']
   end
 
   def self.country_codes_hash
@@ -94,7 +94,8 @@ module PhonyRails
         attributes.each do |attribute|
           attribute_name = options[:as] || attribute
           fail(RuntimeError, "No attribute #{attribute_name} found on #{self.class.name} (PhonyRails)") unless self.class.attribute_method?(attribute_name)
-          send("#{attribute_name}=", PhonyRails.normalize_number(send(attribute), options))
+          new_value= PhonyRails.normalize_number(send(attribute), options)
+          send("#{attribute_name}=", new_value) if new_value
         end
       end
     end

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = '0.12.13'
+  VERSION = '0.13.0'
 end

data/spec/lib/phony_rails_spec.rb

@@ -174,6 +174,26 @@ describe PhonyRails do
           phone = PhonyRails.normalize_number(phone, default_country_code: 'FR')
           expect(phone).to eq('+336123456789')
         end
+
+        it 'should pass Github issue #92 (invalid number with normalization)' do
+          ActiveRecord::Schema.define do
+            create_table :normal_homes do |table|
+              table.column :phone_number, :string
+            end
+          end
+
+          class NormalHome < ActiveRecord::Base
+            attr_accessor :phone_number
+            phony_normalize :phone_number, default_country_code: 'US'
+            validates :phone_number, phony_plausible: true
+          end
+
+          normal = NormalHome.new
+          normal.phone_number = 'HAHA'
+          expect(normal).to_not be_valid
+          expect(normal.phone_number).to eq('HAHA')
+          expect(normal.errors.messages).to include(phone_number: ["is an invalid number"])
+        end
       end
 
       it 'should not change original String' do

data/spec/lib/validators/phony_validator_spec.rb

@@ -50,6 +50,10 @@ ActiveRecord::Schema.define do
   create_table :mismatched_helpful_homes do |table|
     table.column :phone_number, :string
   end
+
+  create_table :invalid_country_code_helpful_homes do |table|
+    table.column :phone_number, :string
+  end
 end
 
 #--------------------
@@ -117,6 +121,17 @@ class MismatchedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number, :country_code
   validates :phone_number, phony_plausible: {ignore_record_country_code: true}
 end
+
+#--------------------
+
+class InvalidCountryCodeHelpfulHome < ActiveRecord::Base
+  attr_accessor :phone_number
+  validates_plausible_phone :phone_number
+
+  def country_code
+    "--"
+  end
+end
 #-----------------------------------------------------------------------------------------------------------------------
 # Tests
 #-----------------------------------------------------------------------------------------------------------------------
@@ -130,6 +145,7 @@ FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'
 FRENCH_NUMBER_WITH_COUNTRY_CODE = '33627899541'
 FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 627899541'
 INVALID_NUMBER = '123456789 123456789 123456789 123456789'
+NOT_A_NUMBER = 'HAHA'
 JAPAN_COUNTRY = 'jp'
 
 #-----------------------------------------------------------------------------------------------------------------------
@@ -157,6 +173,12 @@ describe PhonyPlausibleValidator do
       expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
     end
 
+    it "should invalidate not a number" do
+      @home.phone_number = NOT_A_NUMBER
+      expect(@home).to_not be_valid
+      expect(@home.errors.messages).to include(phone_number: ["is an invalid number"])
+    end
+
     it "should translate the error message in Dutch" do
       I18n.with_locale(:nl) do
         @home.phone_number = INVALID_NUMBER
@@ -480,6 +502,29 @@ describe ActiveModel::Validations::HelperMethods do
       end
     end
 
+        #--------------------
+    context 'when a country code is set to something invalid' do
+      before(:each) do
+        @home = InvalidCountryCodeHelpfulHome.new
+      end
+
+      it "should allow any valid number" do
+        @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
+        expect(@home).to be_valid
+      end
+
+      it "should not allow any invalid number" do
+        @home.phone_number = INVALID_NUMBER
+        expect(@home).to_not be_valid
+      end
+
+      it "should not raise a NoMethodError when looking up a country fails (Regression)" do
+        expect {
+          @home.valid?
+        }.to_not raise_error
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.12.13
+  version: 0.13.0
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony