phony_rails 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.3.2)
+    phony_rails (0.4.1)
       activesupport (>= 3.0)
       countries (>= 0.8.2)
       phony (>= 1.7.7)
@@ -9,24 +9,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    countries (0.8.4)
+    countries (0.9.2)
       currencies (>= 0.4.0)
-    currencies (0.4.0)
+    currencies (0.4.2)
     diff-lcs (1.1.3)
-    ffi (1.1.0)
+    ffi (1.9.0)
     growl (1.0.3)
     guard (1.2.3)
       listen (>= 0.4.2)
@@ -34,38 +34,38 @@ GEM
     guard-bundler (1.0.0)
       bundler (~> 1.0)
       guard (~> 1.1)
-    guard-rspec (1.2.0)
+    guard-rspec (1.2.1)
       guard (>= 1.1)
-    i18n (0.6.1)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
+    i18n (0.6.5)
+    listen (1.3.0)
+      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.0)
-    multi_json (1.7.2)
+    moped (1.5.1)
+    multi_json (1.7.9)
     origin (1.1.0)
     phony (1.9.0)
-    rake (10.0.3)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
+    rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.1)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
       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.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    sqlite3 (1.3.6)
-    thor (0.15.4)
+    rspec-mocks (2.11.3)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
     tzinfo (0.3.37)
 
 PLATFORMS

data/README.md

@@ -2,7 +2,7 @@
 
 (In its early days :) called PhonyNumber)
 
-This Gem adds useful methods to your Rails app to validate, display and save phone numbers.
+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).
 
 ## Installation
@@ -84,6 +84,10 @@ so we can use:
 
 the i18n key is `:improbable_phone`
 
+You can also validate if a number has the correct country code:
+
+    validates_plausible_phone :phone_number, :country_code => '61'
+
 ### Display / Views
 
 In your views use:
@@ -94,12 +98,12 @@ In your views use:
 
 To first normalize the String to a certain country use:
 
-    <%= "010-12341234".phony_formatted(normalize => :NL, :format => :international, :spaces => '-') %>
+    <%= "010-12341234".phony_formatted(:normalize => :NL, :format => :international, :spaces => '-') %>
 
 You can also use the bang method (phony_formatted!):
 
     number = "010-12341234"
-    number.phony_formatted!(normalize => :NL, :format => :international)
+    number.phony_formatted!(:normalize => :NL, :format => :international)
     number # => "+31 10 12341234"
 
 ### Find by normalized number
@@ -110,15 +114,18 @@ Say you want to find a record by a phone number. Best is to normalize user input
 
 ## Changelog
 
+0.4.2
+* Added @fareastside validation for country_code.
+
 0.4.0/0.4.1
-* Better Mongoid support by @johnnyshields
+* 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
+* Better error handling by @k4nar.
 
 0.1.12
 * Further loosened gemspec dependencies.
@@ -175,4 +182,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
 
-Thanks to all contributors: ddidier, brutuscat, henning-koch.
+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.4.1"
+  VERSION = "0.4.2"
 end

data/lib/validators/phony_validator.rb

@@ -6,7 +6,7 @@ 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)
+    record.errors.add(attribute,  options[:message] || :improbable_phone) if not Phony.plausible?(value, cc: options[:country_code])
   end
 
 end

data/spec/lib/validators/phony_validator_spec.rb

@@ -34,6 +34,10 @@ ActiveRecord::Schema.define do
   create_table :big_helpful_homes do |table|
     table.column :phone_number, :string
   end
+
+  create_table :australian_helpful_homes do |table|
+    table.column :phone_number, :string
+  end
 end
 
 #--------------------
@@ -72,10 +76,16 @@ class NotFormattedHelpfulHome < ActiveRecord::Base
   validates_plausible_phone :phone_number, :without => /^\+\d+/
 end
 
+#--------------------
+class AustralianHelpfulHome < ActiveRecord::Base
+  attr_accessor :phone_number
+  validates_plausible_phone :phone_number, :country_code => "61"
+end
+
 #--------------------
 class BigHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
-  validates_plausible_phone :phone_number, :presence => true, :with => /^\+\d+/
+  validates_plausible_phone :phone_number, :presence => true, :with => /^\+\d+/, :country_code => "33"
 end
 
 #-----------------------------------------------------------------------------------------------------------------------
@@ -83,7 +93,11 @@ end
 #-----------------------------------------------------------------------------------------------------------------------
 
 I18n.locale = :en
-VALID_NUMBER = '123456789'
+VALID_NUMBER = '1234567890'
+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'
 INVALID_NUMBER = '123456789 123456789 123456789 123456789'
 
 #-----------------------------------------------------------------------------------------------------------------------
@@ -265,6 +279,71 @@ describe ActiveModel::Validations::HelperMethods do
 
     end
 
+    #--------------------
+    context 'when a number must include a specific country code' do
+
+      before(:each) do
+        @home = AustralianHelpfulHome.new
+      end
+
+      it "should validate an empty number" do
+        @home.should be_valid
+      end
+
+      it "should validate a valid number with the right country code" do
+        @home.phone_number = AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE
+        @home.should be_valid
+      end
+
+      it "should invalidate a valid number with the wrong country code" do
+        @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
+        @home.should_not be_valid
+        @home.errors.messages.should include(:phone_number => ["is an invalid number"])
+      end
+
+      it "should invalidate a valid number without a country code" do
+        @home.phone_number = VALID_NUMBER
+        @home.should_not be_valid
+        @home.errors.messages.should include(:phone_number => ["is an invalid number"])
+      end
+
+    end
+
+    context 'when lots of things are being validated simultaneously' do
+
+      before(:each) do
+        @home = BigHelpfulHome.new
+      end
+
+      it "should invalidate an empty number" do
+        @home.should_not be_valid
+      end
+
+      it "should invalidate an invalid number" do
+        @home.phone_number = INVALID_NUMBER
+        @home.should_not be_valid
+        @home.errors.messages[:phone_number].should include "is an invalid number"
+      end
+
+      it "should invalidate a badly formatted number with the right country code" do
+        @home.phone_number = FRENCH_NUMBER_WITH_COUNTRY_CODE
+        @home.should_not be_valid
+        @home.errors.messages[:phone_number].should include "is invalid"
+      end
+
+      it "should invalidate a properly formatted number with the wrong country code" do
+        @home.phone_number = FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE
+        @home.should_not be_valid
+        @home.errors.messages[:phone_number].should include "is an invalid number"
+      end
+
+      it "should validate a properly formatted number with the right country code" do
+        @home.phone_number = FORMATTED_FRENCH_NUMBER_WITH_COUNTRY_CODE
+        @home.should be_valid
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony