phony_rails 0.8.1 → 0.8.2

data/Gemfile

@@ -9,10 +9,10 @@ gemspec # Specify your gem's dependencies in phony_number.gemspec
 gem 'sqlite3'
 
 gem 'rake'
-gem 'rspec',          '~> 2.11.0'
-gem 'guard',          '~> 1.2.0'
-gem 'guard-bundler',  '~> 1.0.0'
-gem 'guard-rspec',    '~> 1.2.0'
+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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.8.1)
+    phony_rails (0.8.2)
       activesupport (>= 3.0)
       countries (>= 0.8.2)
       phony (~> 2.8.3)
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activesupport (4.1.6)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -27,54 +27,69 @@ GEM
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    connection_pool (2.0.0)
+    coderay (1.1.0)
+    connection_pool (2.1.0)
     countries (0.9.3)
       currencies (~> 0.4.2)
     currencies (0.4.2)
-    diff-lcs (1.1.3)
-    ffi (1.9.5)
+    diff-lcs (1.2.5)
+    ffi (1.9.6)
+    formatador (0.2.5)
     growl (1.0.3)
-    guard (1.2.3)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
+    guard (2.10.4)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-bundler (2.0.0)
       bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
+      guard (~> 2.2)
+    guard-rspec (4.2.10)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     hitimes (1.2.2)
     i18n (0.6.11)
     json (1.8.1)
-    listen (2.7.11)
+    listen (2.8.3)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    minitest (5.4.2)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    minitest (5.5.0)
     mongoid (4.0.0)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.0)
+    moped (2.0.2)
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
+    nenv (0.1.1)
     optionable (0.2.0)
     origin (2.1.1)
-    phony (2.8.3)
-    rake (10.3.2)
+    phony (2.8.9)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    sqlite3 (1.3.9)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    slop (3.6.0)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     timers (4.0.1)
@@ -89,12 +104,12 @@ DEPENDENCIES
   activerecord (>= 3.0)
   countries
   growl
-  guard (~> 1.2.0)
-  guard-bundler (~> 1.0.0)
-  guard-rspec (~> 1.2.0)
+  guard (~> 2.10.1)
+  guard-bundler (~> 2.0.0)
+  guard-rspec (~> 4.2.0)
   mongoid (>= 3.0)
   phony_rails!
   rake
   rb-fsevent
-  rspec (~> 2.11.0)
+  rspec (~> 2.14.0)
   sqlite3

data/Guardfile

@@ -5,7 +5,7 @@ guard 'bundler' do
   watch(/^.+\.gemspec/)
 end
 
-guard 'rspec', :version => 2 do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/README.md

@@ -1,7 +1,5 @@
 # PhonyRails
 
-(In its early days :) called PhonyNumber)
-
 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).
 
@@ -23,6 +21,8 @@ Or install it yourself as:
 
 ### Normalization / Model Usage
 
+#### ActiveRecord
+
 For **ActiveRecord**, in your model add:
 
     class SomeModel < ActiveRecord::Base
@@ -36,6 +36,8 @@ For **ActiveRecord**, in your model add:
       phony_normalized_method :fax_number
     end
 
+#### Mongoid
+
 For **Mongoid**, in keeping with Mongoid plug-in conventions you must include the `Mongoid::Phony` module:
 
     class SomeModel
@@ -45,6 +47,8 @@ For **Mongoid**, in keeping with Mongoid plug-in conventions you must include th
       # methods are same as ActiveRecord usage
     end
 
+#### General info
+
 The `:default_country_code` options is used to specify a country_code when normalizing.
 
 PhonyRails will also check your model for a country_code method to use when normalizing the number. So `'070-12341234'` with `country_code` 'NL' will get normalized to `'317012341234'`.
@@ -60,6 +64,8 @@ You can also do-it-yourself and call:
     PhonyRails.normalize_number('+4790909090', :country_code => 'SE') # => '464790909090' (forced to +46)
     PhonyRails.normalize_number('+4790909090', :default_country_code => 'SE') # => '4790909090' (still +47 so not changed)
 
+The country_code should always be a ISO 3166-1 alpha-2 (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).
+
 ### Validation
 
 In your model use the Phony.plausible method to validate an attribute:
@@ -118,6 +124,12 @@ You can also use the bang method (phony_formatted!):
     number.phony_formatted!(:normalize => :NL, :format => :international)
     number # => "+31 10 123 41234"
 
+You can also easily normalize a phone number String:
+
+    "+31 (0)30 1234 123".phony_normalized # => '31301234123'
+    "(0)30 1234 123".phony_normalized # => '301234123'
+    "(0)30 1234 123".phony_normalized(country_code: 'NL') # => '301234123'
+
 ### Find by normalized number
 
 Say you want to find a record by a phone number. Best is to normalize user input and compare to an attribute stored in the db.
@@ -126,74 +138,11 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## Changelog
 
-0.7.0
-* Gem update.
-* Pinned Phony to v2.3.0.
-* Fixed regex.
-
-0.6.0
-* Support for Phony 2.1 by @pjg.
-
-0.5.0
-* Added :strict option to String#phony_formatted.
-
-0.4.2
-* Added @fareastside validation for country_code.
-
-0.4.0/0.4.1
-* Better Mongoid support by @johnnyshields.
-
-0.3.0
-* Now ability to force change a country_code.
-  See: https://github.com/joost/phony_rails/pull/23#issuecomment-17480463
-
-0.2.1
-* Better error handling by @k4nar.
-
-0.1.12
-* Further loosened gemspec dependencies.
-
-0.1.11
-* Better gemspec dependency versions by @rjhaveri.
-
-0.1.10
-* Changes from henning-koch.
-* Some pending fixes.
-
-0.1.8
-* Improved validation methods by @ddidier.
-
-0.1.6
-* Added :as option to phony_normalize.
-
-0.1.5
-* some tests and a helper method by @ddidier.
-
-0.1.2
-* Using countries gem as suggested by @brutuscat.
-* Fixes bugs mentioned by @ddidier.
-
-0.1.0
-* Added specs.
-
-0.0.10
-* Same fix as 0.0.9 but for phony_formatted method.
-
-0.0.9
-* Fix for using same options Hash for all models.
-
-0.0.8
-* Improved number cleaning not to remove '+' and leading 0's. Now works with national numbers starting with 0 followed by country_code. Eg. 032 in BE.
-
-0.0.7
-* Fixed problem with '+' number
-
-0.0.6
-* Fixed problem with '070-4157134' being parsed as US number
+0.8.2
+* Added String#phony_normalized method
 
 ## 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.

data/lib/phony_rails/string_extensions.rb

@@ -1,5 +1,14 @@
   class String
 
+    # Usage:
+    #   "+31 (0)30 1234 123".phony_normalized # => '31301234123'
+    #   "(0)30 1234 123".phony_normalized # => '301234123'
+    #   "(0)30 1234 123".phony_normalized(country_code: 'NL') # => '301234123'
+    def phony_normalized(options = {})
+      normalize_country_code = options.delete(:country_code)
+      PhonyRails.normalize_number(self, :default_country_code => normalize_country_code.to_s)
+    end
+
     # Add a method to the String class so we can easily format phone numbers.
     # This enables:
     #   "31612341234".phony_formatted # => '06 12341234'

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/lib/phony_rails_spec.rb

@@ -7,37 +7,72 @@ describe PhonyRails do
 
   describe 'phony_format String extension' do
 
-    describe 'the bang method phony_formatted!' do
+    describe 'the phony_formatted method' do
+
+      describe 'with the bang!' do
+
+        it "should change the String using the bang method" do
+          s = "0101234123"
+          s.phony_formatted!(:normalize => :NL, :format => :international).should eql('+31 10 123 4123')
+          s.should eql("+31 10 123 4123")
+        end
 
-      it "should change the String using the bang method" do
-        s = "0101234123"
-        s.phony_formatted!(:normalize => :NL, :format => :international).should eql('+31 10 123 4123')
-        s.should eql("+31 10 123 4123")
       end
 
-    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
 
-    describe 'with strict option' do
+        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
 
-      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)
+      describe 'with normalize option' do
+
+        it "should phony_format" do
+          "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 123 4123')
+          s.should eql("0101234123")
+        end
+
+        it "should phony_format String with country code" do
+          "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 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-123-4123')
+        end
+
+        it "should phony_format String with country code different than normalized value" do
+          "+4790909090".phony_formatted(:normalize => :SE, :format => :international).should eql('+47 909 09 090')
+        end
+
       end
 
-    end
+      describe "specific tests from issues" do
 
-    describe 'with normalize option' 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
 
-      it "should phony_format" do
-        "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
@@ -46,54 +81,46 @@ describe PhonyRails do
         s.should eql("0101234123")
       end
 
-      it "should phony_format String with country code" do
-        "31101234123".phony_formatted(:normalize => :NL).should eql('010 123 4123')
+      it "should phony_format a digits string with spaces String" do
+        "31 10 1234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-123-4123')
       end
 
-      it "should phony_format String with country code" do
-        "31101234123".phony_formatted(:normalize => :NL).should eql('010 123 4123')
+      it "should phony_format a digits String" do
+        "31101234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-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-123-4123')
+      it "returns nil if implausible phone" do
+        "this is not a phone".phony_formatted.should be_nil
       end
 
-      it "should phony_format String with country code different than normalized value" do
-        "+4790909090".phony_formatted(:normalize => :SE, :format => :international).should eql('+47 909 09 090')
+      it "returns nil on blank string" do
+        "".phony_formatted.should be_nil
       end
 
     end
 
-    describe "specific tests from issues" do
+    describe 'the phony_normalized method' 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')
+      it "returns blank on blank string" do
+        "".phony_normalized.should be_nil
       end
 
-    end
-
-    it "should not change original String" do
-      s = "0101234123"
-      s.phony_formatted(:normalize => :NL).should eql('010 123 4123')
-      s.should eql("0101234123")
-    end
+      context "when String misses a country_code" do
+        it "should normalize with :country_code option" do
+          "010 1231234".phony_normalized(:country_code => :NL).should eql("31101231234")
+        end
 
-    it "should phony_format a digits string with spaces String" do
-      "31 10 1234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-123-4123')
-    end
+        it "should normalize without :country_code option" do
+          "010 1231234".phony_normalized.should eql("101231234")
+        end
+      end
 
-    it "should phony_format a digits String" do
-      "31101234123".phony_formatted(:format => :international, :spaces => '-').should eql('+31-10-123-4123')
-    end
+      it "should normalize a String" do
+        "+31 (0)10 1231234".phony_normalized.should eql("31101231234")
+      end
 
-    it "returns nil if implausible phone" do
-      "this is not a phone".phony_formatted.should be_nil
     end
 
-    it "returns nil on blank string" do
-      "".phony_formatted.should be_nil
-    end
   end
 
   describe 'PhonyRails#normalize_number' do
@@ -203,7 +230,7 @@ describe PhonyRails do
       it "should accept :as option with single existing attribute name" do
         lambda {
           model_klass.phony_normalize(:phone_number, :as => 'phone_number_as_normalized')
-        }.should_not raise_error(ArgumentError)
+        }.should_not raise_error
       end
 
       it "should accept a non existing attribute name" do

data/spec/spec_helper.rb

@@ -48,6 +48,8 @@ end
 class MongoidDummy < MongoidModel
 end
 
+I18n.config.enforce_available_locales = true
+
 RSpec.configure do |config|
   # some (optional) config here
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony