phony_rails 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b65451e2281a2975a3f79dcf31ca25dc60c7ad0
-  data.tar.gz: 939a731c8afe851abf63610553b2cac826c5744e
+  metadata.gz: 89bf28723abfacd4fca598089c2c674668d21bed
+  data.tar.gz: a8611d6f572bb2e2713abff5d3846e09fb2fd1a6
 SHA512:
-  metadata.gz: deaf1d6b24044a7dbf4267946a07d6262a9fab5e6d17736b49fa731ca8531793950721025227b78793da9d267d2c6e3c06c74aa8f4579b0ad6fe40c33bf76b29
-  data.tar.gz: befd928d11956eced60622a6172df21786599c0cd84130a247b2aa5550d83071f87c33be4edb9425364b7df75164f2bfa58f9d2d92e664309d262d60a98c16c8
+  metadata.gz: d157afaff06b65a3f1af8f0c5aed1392eeb638071dc6dfec09a572c777f9a7427c35dc2c05180a9eccc42f2a72f39ca0bd1ba0a0aabcaaaf7185b2df2a33c683
+  data.tar.gz: f025d73b8f87578ce4866f1a0a012e32ab4e37ecb26d358c0040f8430daa5e15c18641a36d5cd23cc221e186b110c41627ce1df60b8880adb73d22a3b751d8ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.11.0)
+    phony_rails (0.12.0)
       activesupport (>= 3.0)
       countries (~> 0.8, >= 0.8.2)
       phony (~> 2.12)
@@ -9,34 +9,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
-      arel (~> 5.0.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     bson (2.3.0)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
-    connection_pool (2.1.0)
-    countries (0.9.3)
+    connection_pool (2.1.3)
+    countries (0.11.3)
       currencies (~> 0.4.2)
+      i18n_data (~> 0.6.0)
     currencies (0.4.2)
     diff-lcs (1.2.5)
-    ffi (1.9.6)
+    ffi (1.9.8)
     formatador (0.2.5)
     growl (1.0.3)
-    guard (2.10.4)
+    guard (2.10.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -50,28 +51,29 @@ GEM
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     hitimes (1.2.2)
-    i18n (0.6.11)
-    json (1.8.1)
-    listen (2.8.3)
-      celluloid (>= 0.15.2)
+    i18n (0.7.0)
+    i18n_data (0.6.3)
+    json (1.8.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    minitest (5.5.0)
-    mongoid (4.0.0)
+    minitest (5.5.1)
+    mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.2)
+    moped (2.0.4)
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    nenv (0.1.1)
+    nenv (0.2.0)
     optionable (0.2.0)
     origin (2.1.1)
-    phony (2.12.4)
+    phony (2.12.6)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -91,7 +93,7 @@ GEM
     slop (3.6.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     timers (4.0.1)
       hitimes
     tzinfo (1.2.2)

data/lib/phony_rails.rb

@@ -27,11 +27,13 @@ module PhonyRails
     if _country_number = options[:country_number] || country_number_for(options[:country_code])
       options[:add_plus] = true if options[:add_plus].nil?
       # (Force) add country_number if missing
-      number = "#{_country_number}#{number}" if not number =~ /\A(00|\+)?#{_country_number}/
+      # NOTE: do we need to force adding country code? Otherwise we can share lofic with next block
+      if !Phony.plausible?(number) || _country_number != country_code_from_number(number)
+        number = "#{_country_number}#{number}"
+      end
     elsif _default_country_number = options[:default_country_number] || country_number_for(options[:default_country_code])
       options[:add_plus] = true if options[:add_plus].nil?
-      # Add default_country_number if missing
-      number = "#{_default_country_number}#{number}" if not number =~ /\A(00|\+|#{_default_country_number})/
+      number = "#{_default_country_number}#{number}" unless Phony.plausible?(number)
     end
     normalized_number = Phony.normalize(number)
     options[:add_plus] = true if options[:add_plus].nil? && Phony.plausible?(normalized_number)
@@ -40,6 +42,11 @@ module PhonyRails
     number # If all goes wrong .. we still return the original input.
   end
 
+  def self.country_code_from_number(number)
+    return nil unless Phony.plausible?(number)
+    Phony.split(Phony.normalize(number)).first
+  end
+
   # Wrapper for Phony.plausible?.  Takes the same options as #normalize_number.
   # NB: This method calls #normalize_number and passes _options_ directly to that method.
   def self.plausible_number?(number, options = {})

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/spec/lib/phony_rails_spec.rb

@@ -98,6 +98,10 @@ describe PhonyRails do
           PhonyRails.normalize_number("0606060606", default_country_code: 'FR').should eq('+33606060606')
         end
 
+        it "should pass issue Github issue #85" do
+          PhonyRails.normalize_number("47386160",  default_country_code: 'NO').should eq('+4747386160')
+          PhonyRails.normalize_number("47386160",  country_number: '47').should eq('+4747386160')
+        end
       end
 
       it "should not change original String" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony