phony_rails 0.5.0 → 0.6.0

data/Gemfile.lock

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

data/README.md

@@ -26,7 +26,6 @@ Or install it yourself as:
 For **ActiveRecord**, in your model add:
 
     class SomeModel < ActiveRecord::Base
-
       # Normalizes the attribute itself before validation
       phony_normalize :phone_number, :default_country_code => 'US'
 
@@ -108,7 +107,7 @@ You can also use the bang method (phony_formatted!):
 
     number = "010-12341234"
     number.phony_formatted!(:normalize => :NL, :format => :international)
-    number # => "+31 10 12341234"
+    number # => "+31 10 123 41234"
 
 ### Find by normalized number
 
@@ -118,6 +117,9 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## Changelog
 
+0.6.0
+* Support for Phony 2.1 by @pjg.
+
 0.5.0
 * Added :strict option to String#phony_formatted.
 
@@ -177,6 +179,7 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## TODO
 
+* Fix phony v2.x issues.
 * Make this work: Home.find_by_normalized_phone_number(Home.normalize_number(params[:phone_number]))
   So we use Home.normalize_number instead of PhonyRails.normalize_number. This way we can use the same default_country_code.
 * Make country_code method configurable.
@@ -189,4 +192,4 @@ Say you want to find a record by a phone number. Best is to normalize user input
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Don't forget to add tests and run rspec before creating a pull request :)
+Don't forget to add tests and run rspec before creating a pull request :)

data/lib/phony_rails/version.rb

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

data/lib/phony_rails.rb

@@ -30,8 +30,8 @@ module PhonyRails
       # Add default_country_number if missing
       number = "#{default_country_number}#{number}" if not number =~ /^(00|\+|#{default_country_number})/
     end
-    number = Phony.normalize(number) if Phony.plausible?(number)
-    return number.to_s
+
+    Phony.normalize(number)
   rescue
     number # If all goes wrong .. we still return the original input.
   end

data/lib/validators/phony_validator.rb

@@ -6,7 +6,27 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
   # Validates a String using Phony.plausible? method.
   def validate_each(record, attribute, value)
     return if value.blank?
-    record.errors.add(attribute,  options[:message] || :improbable_phone) if not Phony.plausible?(value, cc: options[:country_code])
+
+    @record = record
+    @record.errors.add(attribute, error_message) if not Phony.plausible?(value, cc: country_code_or_country_number)
+  end
+
+  private
+
+  def error_message
+    options[:message] || :improbable_phone
+  end
+
+  def country_code_or_country_number
+    options[:country_code] || record_country_number || record_country_code
+  end
+
+  def record_country_number
+    @record.country_number if @record.respond_to?(:country_number)
+  end
+
+  def record_country_code
+    @record.country_code if @record.respond_to?(:country_code)
   end
 
 end

data/phony_rails.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = PhonyRails::VERSION
 
-  gem.add_dependency "phony", "= 1.9.0"
+  gem.add_dependency "phony", "~> 2.1"
   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

@@ -11,8 +11,8 @@ describe PhonyRails do
 
       it "should change the String using the bang method" do
         s = "0101234123"
-        s.phony_formatted!(:normalize => :NL, :format => :international).should eql('+31 10 1234123')
-        s.should eql("+31 10 1234123")
+        s.phony_formatted!(:normalize => :NL, :format => :international).should eql('+31 10 123 4123')
+        s.should eql("+31 10 123 4123")
       end
 
     end
@@ -36,26 +36,26 @@ describe PhonyRails do
     describe 'with normalize option' do
 
       it "should phony_format" do
-        "0101234123".phony_formatted(:normalize => :NL).should eql('010 1234123')
-        "0101234123".phony_formatted(:normalize => :NL, :format => :international).should eql('+31 10 1234123')
+        "101234123".phony_formatted(:normalize => :NL).should eql('010 123 4123')
+        "101234123".phony_formatted(:normalize => :NL, :format => :international).should eql('+31 10 123 4123')
       end
 
       it "should not change original String" do
         s = "0101234123"
-        s.phony_formatted(:normalize => :NL).should eql('010 1234123')
+        s.phony_formatted(:normalize => :NL).should eql('010 123 4123')
         s.should eql("0101234123")
       end
 
       it "should phony_format String with country code" do
-        "31101234123".phony_formatted(:normalize => :NL).should eql('010 1234123')
+        "31101234123".phony_formatted(:normalize => :NL).should eql('010 123 4123')
       end
 
       it "should phony_format String with country code" do
-        "31101234123".phony_formatted(:normalize => :NL).should eql('010 1234123')
+        "31101234123".phony_formatted(:normalize => :NL).should eql('010 123 4123')
       end
 
       it "should accept strings with non-digits in it" do
-        "+31-10-1234123".phony_formatted(:normalize => :NL, :format => :international, :spaces => '-').should eql('+31-10-1234123')
+        "+31-10-1234123".phony_formatted(:normalize => :NL, :format => :international, :spaces => '-').should eql('+31-10-123-4123')
       end
 
       it "should phony_format String with country code different than normalized value" do
@@ -75,16 +75,16 @@ describe PhonyRails do
 
     it "should not change original String" do
       s = "0101234123"
-      s.phony_formatted(:normalize => :NL).should eql('010 1234123')
+      s.phony_formatted(:normalize => :NL).should eql('010 123 4123')
       s.should eql("0101234123")
     end
 
     it "should phony_format a digits string with spaces String" do
-      "31 10 1234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-1234123')
+      "31 10 1234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-123-4123')
     end
 
     it "should phony_format a digits String" do
-      "31101234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-1234123')
+      "31101234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-123-4123')
     end
 
     it "returns nil if implausible phone" do
@@ -148,11 +148,11 @@ describe PhonyRails do
       PhonyRails.normalize_number('070-4157134', :country_code => 'NL').should eql('31704157134')
       PhonyRails.normalize_number('0031-70-4157134', :country_code => 'NL').should eql('31704157134')
       PhonyRails.normalize_number('+31-70-4157134', :country_code => 'NL').should eql('31704157134')
-      PhonyRails.normalize_number('0323-2269497', :country_code => 'BE').should eql('323232269497')
+      PhonyRails.normalize_number('0323-2269497', :country_code => 'BE').should eql('3232269497')
     end
 
-    it "should not normalize an implausible number" do
-      PhonyRails.normalize_number('01').should eql('01')
+    it "should normalize even an implausible number" do
+      PhonyRails.normalize_number('01').should eql('1')
     end
   end
 
@@ -225,9 +225,9 @@ describe PhonyRails do
       end
 
     # Following examples have incomplete number
-      it "should return nil if no country_code is known" do
+      it "should normalize even a unplausible number (no country code)" do
         model = model_klass.new(:phone_attribute => "(0)10-1234123")
-        model.normalized_phone_attribute.should eql('11234123') # This actually is an incorrect number! (FIXME?)
+        model.normalized_phone_attribute.should eql('101234123')
       end
 
       it "should use country_code option" do

data/spec/lib/validators/phony_validator_spec.rb

@@ -93,11 +93,11 @@ end
 #-----------------------------------------------------------------------------------------------------------------------
 
 I18n.locale = :en
-VALID_NUMBER = '1234567890'
+VALID_NUMBER = '1 555 555 5555'
 AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '61390133997'
 FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'
-FRENCH_NUMBER_WITH_COUNTRY_CODE = '330627899541'
-FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 0627899541'
+FRENCH_NUMBER_WITH_COUNTRY_CODE = '33627899541'
+FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE = '+33 627899541'
 INVALID_NUMBER = '123456789 123456789 123456789 123456789'
 
 #-----------------------------------------------------------------------------------------------------------------------
@@ -243,7 +243,7 @@ describe ActiveModel::Validations::HelperMethods do
       end
 
       it "should validate a well formatted valid number" do
-        @home.phone_number = "+33 #{VALID_NUMBER}"
+        @home.phone_number = "+#{VALID_NUMBER}"
         @home.should be_valid
       end
 
@@ -272,7 +272,7 @@ describe ActiveModel::Validations::HelperMethods do
       end
 
       it "should invalidate a bad formatted valid number" do
-        @home.phone_number =  "+33 #{VALID_NUMBER}"
+        @home.phone_number =  "+#{VALID_NUMBER}"
         @home.should_not be_valid
         @home.errors.messages.should include(:phone_number => ["is invalid"])
       end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Joost Hietbrink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-01-28 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.9.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,26 +121,27 @@ files:
 homepage: https://github.com/joost/phony_rails
 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: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: This Gem adds useful methods to your Rails app to validate, display and save
   phone numbers.
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!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=