phony_rails 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89bf28723abfacd4fca598089c2c674668d21bed
-  data.tar.gz: a8611d6f572bb2e2713abff5d3846e09fb2fd1a6
+  metadata.gz: 69276a65ab509580ebd6b96adb01c6ae03ff2bf8
+  data.tar.gz: 3faddbca4183fee934927c93787223f8a46b4c00
 SHA512:
-  metadata.gz: d157afaff06b65a3f1af8f0c5aed1392eeb638071dc6dfec09a572c777f9a7427c35dc2c05180a9eccc42f2a72f39ca0bd1ba0a0aabcaaaf7185b2df2a33c683
-  data.tar.gz: f025d73b8f87578ce4866f1a0a012e32ab4e37ecb26d358c0040f8430daa5e15c18641a36d5cd23cc221e186b110c41627ce1df60b8880adb73d22a3b751d8ca
+  metadata.gz: 852574f157477ddf3d38658f778f394e423db680ba326cd182ac691619eabf652aeee20612f51744d971bdfecd0e880edfa338928c0750c5b6cba10bf42867bb
+  data.tar.gz: 58d821718858e450291e23a006099630eb259284186e2aeb3c60fdc717cb12f406f2ba535b71de7c432d8bacc60be3a5944b7b81e79ee2792672cc10d320d8fd

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.1.3"
+  - "2.2.1"
+  - rbx
+script: bundle exec rspec spec

data/Gemfile

@@ -13,17 +13,3 @@ gem 'rspec',          '~> 2.14.0'
 gem 'guard',          '~> 2.10.1'
 gem 'guard-bundler',  '~> 2.0.0'
 gem 'guard-rspec',    '~> 4.2.0'
-
-case RbConfig::CONFIG['host_os']
-  when /darwin/i
-    gem 'growl'
-    gem 'rb-fsevent'
-  when /linux/i
-    gem 'libnotify'
-    gem 'rb-inotify'
-  when /mswin|windows/i
-    gem 'rb-fchange'
-    gem 'rb-notifu'
-    gem 'win32console'
-end
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.12.0)
+    phony_rails (0.12.1)
       activesupport (>= 3.0)
       countries (~> 0.8, >= 0.8.2)
       phony (~> 2.12)
@@ -36,7 +36,6 @@ GEM
     diff-lcs (1.2.5)
     ffi (1.9.8)
     formatador (0.2.5)
-    growl (1.0.3)
     guard (2.10.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -105,13 +104,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (>= 3.0)
   countries
-  growl
   guard (~> 2.10.1)
   guard-bundler (~> 2.0.0)
   guard-rspec (~> 4.2.0)
   mongoid (>= 3.0)
   phony_rails!
   rake
-  rb-fsevent
   rspec (~> 2.14.0)
   sqlite3

data/README.md

@@ -1,4 +1,4 @@
-# PhonyRails
+# PhonyRails [![Build Status](https://travis-ci.org/joost/phony_rails.svg?branch=master)](https://travis-ci.org/joost/phony_rails)
 
 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).

data/lib/phony_rails/version.rb

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

data/lib/phony_rails.rb

@@ -33,7 +33,12 @@ module PhonyRails
       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?
-      number = "#{_default_country_number}#{number}" unless Phony.plausible?(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
+      if Phony.plausible?("#{_default_country_number}#{number}") || !Phony.plausible?(number) || country_code_from_number(number).nil?
+        number = "#{_default_country_number}#{number}"
+      end
+      # 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)

data/spec/lib/phony_rails_spec.rb

@@ -89,19 +89,24 @@ describe PhonyRails do
       describe "specific tests from issues" do
 
         # https://github.com/joost/phony_rails/issues/79
-        it "should pass issue Github issue #42" do
+        it "should pass Github issue #42" do
           "8887716095".phony_formatted(format: :international, normalize: 'US', raise: true).should eq('+1 888 771 6095')
         end
 
         # https://github.com/joost/phony_rails/issues/42
-        it "should pass issue Github issue #42" do
+        it "should pass Github issue #42" do
           PhonyRails.normalize_number("0606060606", default_country_code: 'FR').should eq('+33606060606')
         end
 
-        it "should pass issue Github issue #85" do
+        it "should pass 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
+
+        it "should pass Github issue #87" do
+          PhonyRails.normalize_number('2318725305', country_code: 'US').should eq('+12318725305')
+          PhonyRails.normalize_number('2318725305', default_country_code: 'US').should eq('+12318725305')
+        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.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -96,6 +96,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile