phony_rails 0.6.2 → 0.7.0

data/Gemfile.lock

@@ -1,32 +1,38 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.6.1)
+    phony_rails (0.7.0)
       activesupport (>= 3.0)
       countries (>= 0.8.2)
-      phony (~> 2.1)
+      phony (~> 2.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    countries (0.9.2)
-      currencies (>= 0.4.0)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    bson (2.3.0)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    connection_pool (2.0.0)
+    countries (0.9.3)
+      currencies (~> 0.4.2)
     currencies (0.4.2)
     diff-lcs (1.1.3)
-    ffi (1.9.0)
+    ffi (1.9.5)
     growl (1.0.3)
     guard (1.2.3)
       listen (>= 0.4.2)
@@ -36,25 +42,29 @@ GEM
       guard (~> 1.1)
     guard-rspec (1.2.1)
       guard (>= 1.1)
-    i18n (0.6.5)
-    listen (1.3.0)
+    hitimes (1.2.2)
+    i18n (0.6.11)
+    json (1.8.1)
+    listen (2.7.11)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    mongoid (3.1.4)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    moped (1.5.1)
-    multi_json (1.7.9)
-    origin (1.1.0)
-    phony (2.1.3)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    minitest (5.4.2)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.0)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    optionable (0.2.0)
+    origin (2.1.1)
+    phony (2.3.0)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -64,9 +74,13 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
-    sqlite3 (1.3.8)
-    thor (0.18.1)
-    tzinfo (0.3.37)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -121,6 +121,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.
 

data/lib/phony_rails.rb

@@ -25,12 +25,11 @@ module PhonyRails
     return if number.blank?
     if country_number = options[:country_number] || country_number_for(options[:country_code])
       # (Force) add country_number if missing
-      number = "#{country_number}#{number}" if not number =~ /^(00|\+)?#{country_number}/
+      number = "#{country_number}#{number}" if not number =~ /\A(00|\+)?#{country_number}/
     elsif default_country_number = options[:default_country_number] || country_number_for(options[:default_country_code])
       # Add default_country_number if missing
-      number = "#{default_country_number}#{number}" if not number =~ /^(00|\+|#{default_country_number})/
+      number = "#{default_country_number}#{number}" if not number =~ /\A(00|\+|#{default_country_number})/
     end
-
     Phony.normalize(number)
   rescue
     number # If all goes wrong .. we still return the original input.

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 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", "~> 2.1"
+  gem.add_dependency "phony", "~> 2.3.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

@@ -148,7 +148,8 @@ 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('3232269497')
+      PhonyRails.normalize_number('0322-69497', :country_code => 'BE').should eql('3232269497')
+      PhonyRails.normalize_number('+32 3 226 94 97', :country_code => 'BE').should eql('3232269497')
     end
 
     it "should normalize even an implausible number" do

data/spec/lib/validators/phony_validator_spec.rb

@@ -71,13 +71,13 @@ end
 #--------------------
 class FormattedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :with => /^\+\d+/
+  validates_plausible_phone :phone_number, :with => /\A\+\d+/
 end
 
 #--------------------
 class NotFormattedHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :without => /^\+\d+/
+  validates_plausible_phone :phone_number, :without => /\A\+\d+/
 end
 
 #--------------------
@@ -95,7 +95,7 @@ end
 #--------------------
 class BigHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :presence => true, :with => /^\+\d+/, :country_number => "33"
+  validates_plausible_phone :phone_number, :presence => true, :with => /\A\+\d+/, :country_number => "33"
 end
 
 #-----------------------------------------------------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement