phony_rails 0.7.2 → 0.7.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phony_rails (0.7.0)
+    phony_rails (0.7.2)
       activesupport (>= 3.0)
       countries (>= 0.8.2)
       phony (~> 2.4.3)

data/README.md

@@ -91,6 +91,11 @@ or correct country code:
 
     validates_plausible_phone :phone_number, :country_code => 'AU'
 
+You can validate against the normalized input as opposed to the raw input:
+
+    phony_normalize :phone_number, as: :phone_number_normalized, :default_country_code => 'US'
+    validates_plausible_phone :phone_number, :normalized_country_code => 'US'
+
 ### Display / Views
 
 In your views use:

data/lib/phony_rails/version.rb

@@ -1,3 +1,3 @@
 module PhonyRails
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/lib/validators/phony_validator.rb

@@ -8,6 +8,8 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
     return if value.blank?
 
     @record = record
+
+    value = PhonyRails.normalize_number value, default_country_code: normalized_country_code if normalized_country_code
     @record.errors.add(attribute, error_message) if not Phony.plausible?(value, cc: country_number)
   end
 
@@ -37,6 +39,10 @@ class PhonyPlausibleValidator < ActiveModel::EachValidator
     @record.country_code if @record.respond_to?(:country_code)
   end
 
+  def normalized_country_code
+    options[:normalized_country_code]
+  end
+
 end
 
 module ActiveModel

data/spec/lib/validators/phony_validator_spec.rb

@@ -31,6 +31,10 @@ ActiveRecord::Schema.define do
     table.column :phone_number, :string
   end
 
+  create_table :normalizable_helpful_homes do |table|
+    table.column :phone_number, :string
+  end
+
   create_table :big_helpful_homes do |table|
     table.column :phone_number, :string
   end
@@ -80,6 +84,12 @@ class NotFormattedHelpfulHome < ActiveRecord::Base
   validates_plausible_phone :phone_number, :without => /\A\+\d+/
 end
 
+#--------------------
+class NormalizableHelpfulHome < ActiveRecord::Base
+  attr_accessor :phone_number
+  validates_plausible_phone :phone_number, :normalized_country_code => 'US'
+end
+
 #--------------------
 class AustralianHelpfulHome < ActiveRecord::Base
   attr_accessor :phone_number
@@ -104,6 +114,7 @@ end
 
 I18n.locale = :en
 VALID_NUMBER = '1 555 555 5555'
+NORMALIZABLE_NUMBER = '555 555 5555'
 AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '61390133997'
 POLISH_NUMBER_WITH_COUNTRY_CODE = '48600600600'
 FORMATTED_AUSTRALIAN_NUMBER_WITH_COUNTRY_CODE = '+61 390133997'
@@ -320,6 +331,35 @@ describe ActiveModel::Validations::HelperMethods do
 
     end
 
+    #--------------------
+    context 'when a number must be validated after normalization' do
+
+      before(:each) do
+        @home = NormalizableHelpfulHome.new
+      end
+
+      it "should validate an empty number" do
+        @home.should be_valid
+      end
+
+      it "should validate a valid number" do
+        @home.phone_number = VALID_NUMBER
+        @home.should be_valid
+      end
+
+      it "should validate a normalizable number" do
+        @home.phone_number = NORMALIZABLE_NUMBER
+        @home.should be_valid
+      end
+
+      it "should invalidate an invalid number" do
+        @home.phone_number = INVALID_NUMBER
+        @home.should_not be_valid
+        @home.errors.messages.should include(:phone_number => ["is an invalid number"])
+      end
+
+    end
+
     #--------------------
     context 'when a number must include a specific country code' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony_rails
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phony