phony_rails 0.4.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGNmYjVlMTE5NDBiNGY5Y2MwZGE4ZDVlYzA2M2IxN2M1ZmI1MDBhMg==
+  data.tar.gz: !binary |-
+    ZDQ4MTIxNTdlNjVkYzNhNTZjMDQ5NWZiZDc0MTkzY2JkM2MxOWYwOQ==
+SHA512:
+  metadata.gz: !binary |-
+    ODIxZDY3ZDdjY2NiZGU2OGE3NzdjNzI2YzcxYzc5OGQwNGEwZTYwOTA5YWJm
+    MDAyZTc4Njc3NDRkZjU0ODc1NWRiYThjODUzNmI4MDljMzZiNWU1OTQ4YzNm
+    NDMxNGJlMjA5ZWMwMDlkOWJmOTUyNDY0NDM2Mjg0MjcwZWFhMjI=
+  data.tar.gz: !binary |-
+    MzFjNDU4OWQxNTA5ZDFkOWE4M2U5ZTNiN2FmNjE4NzE4NDMyODZlOWQ1OTc4
+    Y2JiMjkyYzkwMTQ5YTA1NjRhOWZlNjhmZDY0ZWU4NGUzODFkNmZkNjRkMjE3
+    ODA5ZWI5ZTRiOTY3MzJjNTJmNDRlNjJjMjg4MmU0MjI2OGY5NzQ=

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.4.1)
+    phony_rails (0.5.0)
       activesupport (>= 3.0)
       countries (>= 0.8.2)
-      phony (>= 1.7.7)
+      phony (= 2.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -49,7 +49,7 @@ GEM
     moped (1.5.1)
     multi_json (1.7.9)
     origin (1.1.0)
-    phony (1.9.0)
+    phony (2.0.0)
     rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.1)

data/README.md

@@ -100,6 +100,10 @@ To first normalize the String to a certain country use:
 
     <%= "010-12341234".phony_formatted(:normalize => :NL, :format => :international, :spaces => '-') %>
 
+To return nil when a number is not valid:
+
+    "123".phony_formatted(:strict => true) # => nil
+
 You can also use the bang method (phony_formatted!):
 
     number = "010-12341234"
@@ -114,6 +118,9 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## Changelog
 
+0.5.0
+* Added :strict option to String#phony_formatted.
+
 0.4.2
 * Added @fareastside validation for country_code.
 

data/lib/phony_rails.rb

@@ -7,7 +7,7 @@ require 'phony_rails/version'
 module PhonyRails
 
   def self.country_number_for(country_code)
-    ISO3166::Country::Data[country_code].try(:[], 'country_code')
+    ISO3166::Country::Data[country_code.to_s.upcase].try(:[], 'country_code')
   end
 
   # This method requires a country_code attribute (eg. NL) and phone_number to be set.

data/lib/phony_rails/string_extensions.rb

@@ -6,10 +6,13 @@
     #   "31612341234".phony_formatted(:spaces => '-') # => '06-12341234'
     # To first normalize a String use:
     #   "010-12341234".phony_formatted(:normalize => :NL)
+    # To return nil when a number is not correct (checked using Phony.plausible?) use
+    #   "010-12341234".phony_formatted(strict: true)
     def phony_formatted(options = {})
       normalize_country_code = options.delete(:normalize)
       s = (normalize_country_code ? PhonyRails.normalize_number(self, :default_country_code => normalize_country_code.to_s) : self.gsub(/\D/, ''))
       return if s.blank?
+      return if options[:strict] && !Phony.plausible?(s)
       Phony.formatted(s, options.reverse_merge(:format => :national))
     end
 

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/phony_rails.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
   gem.summary       = %q{This Gem adds useful methods to your Rails app to validate, display and save phone numbers.}
   gem.homepage      = "https://github.com/joost/phony_rails"
+  gem.license = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = PhonyRails::VERSION
 
-  gem.add_dependency "phony", ">= 1.7.7"
+  gem.add_dependency "phony", "= 1.9.0"
   gem.add_dependency "countries", ">= 0.8.2"
   gem.add_dependency "activesupport", ">= 3.0"
   gem.add_development_dependency "activerecord", ">= 3.0"

data/spec/lib/phony_rails_spec.rb

@@ -17,6 +17,22 @@ describe PhonyRails do
 
     end
 
+    describe 'with strict option' do
+
+      it "should return nil with non plausible number" do
+        number = '+319090' # not valid
+        Phony.plausible?(number).should be_false
+        number.phony_formatted(:strict => true).should eql(nil)
+      end
+
+      it "should not return nil with plausible number" do
+        number = '+31101234123' # valid
+        Phony.plausible?(number).should be_true
+        number.phony_formatted(:strict => true).should_not eql(nil)
+      end
+
+    end
+
     describe 'with normalize option' do
 
       it "should phony_format" do
@@ -48,6 +64,15 @@ describe PhonyRails do
 
     end
 
+    describe "specific tests from issues" do
+
+      # https://github.com/joost/phony_rails/issues/42
+      it "should pass issue Github issue #42" do
+        PhonyRails.normalize_number("0606060606", default_country_code: 'FR').should eq('33606060606')
+      end
+
+    end
+
     it "should not change original String" do
       s = "0101234123"
       s.phony_formatted(:normalize => :NL).should eql('010 1234123')
@@ -86,6 +111,10 @@ describe PhonyRails do
         PhonyRails.normalize_number('4790909090', :country_code => 'SE').should eql('464790909090')
       end
 
+      it "should recognize lowercase country codes" do
+        PhonyRails.normalize_number('4790909090', :country_code => 'se').should eql('464790909090')
+      end
+
     end
 
     context 'number without a country code' do
@@ -108,6 +137,10 @@ describe PhonyRails do
         PhonyRails.normalize_number('(030) 8 61 29 06', :country_code => 'DE', :default_country_code => 'NL').should eql('49308612906')
       end
 
+      it "should recognize lowercase country codes" do
+        PhonyRails.normalize_number('010-1234123', :country_code => 'nl').should eql('31101234123')
+      end
+
     end
 
     it "should handle some edge cases" do

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,32 +108,31 @@ files:
 - spec/lib/validators/phony_validator_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/joost/phony_rails
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This Gem adds useful methods to your Rails app to validate, display and save
   phone numbers.
 test_files:
 - spec/lib/phony_rails_spec.rb
 - spec/lib/validators/phony_validator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: