validates_formatting_of 0.3.7 → 0.4.0

data/README.markdown

@@ -30,7 +30,10 @@ You can still add the following options when using `validates_formatting_of`:
 
 * `:allow_nil`
 * `:allow_blank`
-* `:message` for custom validation messages
+* `:on`
+* `:if`
+* `:unless`
+* You also specify the `:message` option to use a custom validation message.
 
 # Available Formatting Validations
 

data/lib/validates_formatting_of/model_additions.rb

@@ -11,6 +11,13 @@ module ValidatesFormattingOf
     # This call will ensure that the user-provided email is a valid email. This way,
     # you will not need to find or write your own regex to validate. All of that
     # logic is contained within `validates_formatting_of`
+    # 
+    # You can also pass conditions and options for Rails to use
+    # * :if
+    # * :unless
+    # * :allow_nil
+    # * :allow_blank
+    # * :on
     def validates_formatting_of(attribute, opts={})
       regex_for_validation = opts[:regex] || validate_with(opts[:using])
       validation_message = opts[:message] || ValidationMessages.message(opts[:using])
@@ -20,8 +27,9 @@ module ValidatesFormattingOf
           :message => validation_message,
         }
       }
-      options.merge!(:allow_nil => opts[:allow_nil]) unless opts[:allow_nil].nil?
-      options.merge!(:allow_blank => opts[:allow_blank]) unless opts[:allow_blank].nil?
+      %w(allow_nil allow_blank if unless on).each do |opt|
+        options.merge!(opt.to_sym => opts[opt.to_sym]) if opts[opt.to_sym].present?
+      end
       validates(attribute, options)
     end
 

data/lib/validates_formatting_of/validating_methods.rb

@@ -3,7 +3,7 @@ module ValidatesFormattingOf
 
     # This method is very close to allowing what is specified in RFC 5322 and RFC 5321
     def email
-      /^[0-9A-Z!#$\%&'*+-\/=?^_`{|}~]+@[0-9A-Z\-.]+\.[A-Z]{2,4}$/i
+      /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
     end
 
     # Taken from Ryan Bates' screencast on extracting gems. Works extremely well. Thanks Ryan!
@@ -32,9 +32,16 @@ module ValidatesFormattingOf
       /^\d{5}(-\d{4})?$/
     end
 
-    # US Phone numbers. (###) ###-#### | (###)###-#### | ###-###-####
+    # US Phone numbers.
+    # Examples of valid formats:
+    # * ###.###.####
+    # * ###-###-####
+    # * (###) ###-####
+    # * (###)###-####
+    # * #########
+    # * ### ###-####
     def us_phone
-      /^([\(]{1}[0-9]{3}[\)]{1}[ |\-]{0,1}|^[0-9]{3}[\-| ])?[0-9]{3}(\-| ){1}[0-9]{4}$/
+      /^(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})$/
     end
 
     # IP Address validation

data/lib/validates_formatting_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesFormattingOf
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

data/spec/validates_formatting_of/model_additions_spec.rb

@@ -12,6 +12,8 @@ describe ValidatesFormattingOf::ModelAdditions do
       Email.new(:email => "mbridges.91@gmail.com").should be_valid
       Email.new(:email => "some-random%%%strangely-formatted-email@lots.of.subdomains.com").should be_valid
       Email.new(:email => "this__???{}|__should@be-valid.com").should be_valid
+      Email.new(:email => "visitorservices@vmfa.museum").should be_valid
+      Email.new(:email => "info@samoa.travel").should be_valid
     end
   end
 
@@ -72,8 +74,10 @@ describe ValidatesFormattingOf::ModelAdditions do
     it "validates that the phone number provided is valid" do
       USPhone.new(:phone_number => '(234) 234-3456').should be_valid
       USPhone.new(:phone_number => '123 123 3456').should be_valid
+      USPhone.new(:phone_number => '1231233456').should be_valid
+      USPhone.new(:phone_number => '123.123.3456').should be_valid
       USPhone.new(:phone_number => '(223)123-2347').should be_valid
-      USPhone.new(:phone_number => '2349870238').should_not be_valid
+      USPhone.new(:phone_number => '(223 123-2347').should_not be_valid
       USPhone.new(:phone_number => '12349870238').should_not be_valid
     end
   end
@@ -98,7 +102,7 @@ describe ValidatesFormattingOf::ModelAdditions do
     class Client < SuperModel::Base
       validates_formatting_of :cc, :using => :credit_card
     end
-    it "validates that the email provided is valid" do
+    it "validates that the credit card number provided is valid" do
       Client.new(:cc => '4264-2879-1230-0000').should be_valid # Visa style
       Client.new(:cc => '6011-1111-0000-2391').should be_valid # Discover style
       Client.new(:cc => '5422434400828888').should be_valid # Mastercard style
@@ -136,6 +140,35 @@ describe ValidatesFormattingOf::ModelAdditions do
       Color.new(:color => "sdfsdfsf").should_not be_valid
     end
   end
+  
+  describe "validation options" do
+    class Phony < SuperModel::Base
+      validates_formatting_of :phone, :using => :us_phone, :on => :create 
+    end
+    it "validates the phone formatting only on creation" do
+      option = Phony.create!(:phone => "(123) 234-4567")
+      option.phone = "123123123"
+      option.should be_valid
+    end
+    
+    class Iffy < SuperModel::Base
+      validates_presence_of :name
+      validates_formatting_of :phone, :using => :us_phone, :if => lambda { |iffy| iffy.name == "Matthew" }
+    end
+    it "validates the phone formatting only if a name is specified" do
+      Iffy.new(:phone => "(123 345-4567", :name => "Bill").should be_valid
+      Iffy.new(:phone => "(123 345-4567", :name => "Matthew").should_not be_valid
+    end
+    
+    class Unlessy < SuperModel::Base
+      validates_presence_of :name
+      validates_formatting_of :phone, :using => :us_phone, :unless => lambda { |unlessy| unlessy.name == "Matthew" }
+    end
+    it "validates the phone formatting only if a name is specified" do
+      Unlessy.new(:phone => "(123 345-4567", :name => "Bill").should_not be_valid
+      Unlessy.new(:phone => "(123 345-4567", :name => "Matthew").should be_valid
+    end
+  end
   describe "dollars" do
     class Money < SuperModel::Base
       validates_formatting_of :amount, :using => :dollars
@@ -172,7 +205,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       problems = Problems.new(:name => "sdfs12312dfsd")
       problems.should_not be_valid
       problems.errors.full_messages.first.should =~ /letters/i
-      email = Email.new(:email => "fake@email.address")
+      email = Email.new(:email => "not.an.email.address")
       email.should_not be_valid
       email.errors.full_messages.first.should =~ /email/i
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_formatting_of
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70125953379060 !ruby/object:Gem::Requirement
+  requirement: &70103698133420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125953379060
+  version_requirements: *70103698133420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70125953378380 !ruby/object:Gem::Requirement
+  requirement: &70103698132140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953378380
+  version_requirements: *70103698132140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70125953377680 !ruby/object:Gem::Requirement
+  requirement: &70103698131500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953377680
+  version_requirements: *70103698131500
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &70125953393220 !ruby/object:Gem::Requirement
+  requirement: &70103698130720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125953393220
+  version_requirements: *70103698130720
 description: Common Rails validations wrapped in a gem.
 email:
 - mbridges.91@gmail.com