validates_formatting_of 0.6.2 → 0.6.9

data/.rspec

@@ -1 +1,2 @@
 --color
+--order rand

data/lib/validates_formatting_of.rb

@@ -1,5 +1,4 @@
 require "validates_formatting_of/version"
-require "validates_formatting_of/validation_messages"
-require "validates_formatting_of/validating_methods"
+require "validates_formatting_of/method"
 require "validates_formatting_of/model_additions"
 require "validates_formatting_of/railtie" if defined? Rails

data/lib/validates_formatting_of/method.rb

@@ -0,0 +1,60 @@
+require 'validates_formatting_of/validation'
+require 'validates_formatting_of/validation_addition'
+
+module ValidatesFormattingOf
+
+  class MissingValidation < StandardError; end
+
+  module Method
+
+    extend ValidationAddition
+
+    # This method is very close to allowing what is specified in RFC 5322 and RFC 5321
+    add :email, %r{\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\Z}i, "is not a valid email"
+
+    # Thie version of the email exists to support common validation libraries (such
+    # as client_side_validations) that require access to Rails' validation. Look-behinds
+    # are not supported in javascript.
+    add :simple_email, %r{\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\Z}i, "is not a valid email"
+
+    # Taken from Ryan Bates' screencast on extracting gems. Works extremely well. Thanks Ryan!
+    # (slightly revised to work on MRI 1.8.7 and ree)
+    add :url, %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\Z}i, "is not a valid URL"
+
+    # No numbers of symbols. allows "-"
+    add :alpha, %r{\A([^\d\W]|[-])*\Z}, "must be only letters or dashes"
+
+    # Letters, numbers, and spaces
+    add :alphanum, %r{\A[A-Z0-9\s]+\Z}i, "must be letters, numbers"
+
+    # Visa, Mastercard, Discver, and American Express
+    add :credit_card, %r{\A((4\d{3})|(5[1-5]\d{2})|(6011))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13}\Z}, "is not a valid credit card number"
+
+    # US Zip code. ##### or #####-####
+    add :us_zip, %r{\A\d{5}(-\d{4})?\Z}, "is not a valid zipcode"
+
+    # US Phone numbers.
+    # Examples of valid formats:
+    # * ###.###.####
+    # * ###-###-####
+    # * (###) ###-####
+    # * (###)###-####
+    # * #########
+    # * ### ###-####
+    add :us_phone, %r{\A(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})\Z}, "is not a valid phone number"
+
+    # IP Address validation
+    add :ip_address, %r{\A(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\Z}, "is not a valid IPv4 address"
+    add :ip_address_v4, %r{\A(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\Z}, "is not a valid IPv4 address"
+
+    # Social Security Number pattern
+    add :ssn, %r{\A\d{3}([-.]){1}\d{2}([-.]){1}\d{4}\Z}, "is not a valid social security number"
+
+    # Matches CSS colors either in three or six digit formats
+    add :hex_color, %r{\A([A-F0-9]{6}|[A-F0-9]{3})\Z}i, "is not a valid hex color"
+
+    # Ensures that what value is passed is a dollar amount of some kind
+    add :dollars, %r{\A\$?(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?\Z}, "is not a valid dollar amount"
+
+  end
+end

data/lib/validates_formatting_of/model_additions.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/reverse_merge'
+
 module ValidatesFormattingOf
   module ModelAdditions
 
@@ -8,36 +10,25 @@ module ValidatesFormattingOf
     #   validates_formatting_of :email, :using => :email
     # end
     #
-    # 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`
-    # 
+    # If your column name is idencital to any of the built-in methods, you
+    # may leave off the `:using` option and validates_formatting_of will
+    # automatically use the validation with the matching name.
+    #
+    # class User < ActiveRecord::Base
+    #   validates_formatting_of :email
+    # end
+    #
     # 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])
-      options = {
-        :format => {
-          :with => regex_for_validation,
-          :message => validation_message,
-        }
-      }
-      %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)
+    def validates_formatting_of(attribute, options = {})
+      validation = Method.find(attribute, options)
+      options.reverse_merge!(:with => validation.regex, :message => validation.message)
+      self.validates_format_of(attribute, options)
     end
 
-  private
-
-    def validate_with(method)
-      # Actually retrieve the regex to check against
-      ValidatingMethods.send(method)
-    end
   end
 end

data/lib/validates_formatting_of/validation.rb

@@ -0,0 +1,24 @@
+module ValidatesFormattingOf
+
+  class InvalidRegularExpression < StandardError; end
+
+  class Validation
+    attr_reader :name, :regex, :message
+
+    def initialize(name, regexp, message = "is not correctly formatted")
+      callable = regexp.respond_to? :call
+      if !callable && regexp.class.to_s != "Regexp"
+        raise InvalidRegularExpression, "You must specify a Regexp, a proc, or a lambda for the #{name.inspect} validation."
+      end
+      @name, @regex, @message = name, regexp, message
+    end
+
+    def inspect
+      "#<Validation name: #{name.inspect}, regex: #{regex.inspect}, message: #{message}>"
+    end
+
+    def to_s
+      "<Validation::#{name.to_s}>"
+    end
+  end
+end

data/lib/validates_formatting_of/validation_addition.rb

@@ -0,0 +1,25 @@
+module ValidatesFormattingOf
+  module ValidationAddition
+    attr_reader :validations
+
+    def add(name, regex, message = nil)
+      @validations ||= {}
+      @validations[name.to_sym] = Validation.new(name.to_sym, regex, message)
+    end
+
+    def find(attribute, opts = {})
+      method = opts[:using].nil? ? attribute : opts[:using]
+      if !exists? method
+        raise MissingValidation, "The validation method #{method.to_sym.inspect} has not been defined."
+      end
+      if method.to_sym == :ip_address
+        warn "[DEPRECATION] The :ip_address validation for `validates_formatting_of` is DEPRECATED. Please update your model validations to use :ip_address_v4. This method will be removed by version 0.7.0."
+      end
+      @validations[method.to_sym]
+    end
+
+    def exists?(name)
+      !@validations[name.to_sym].nil?
+    end
+  end
+end

data/lib/validates_formatting_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesFormattingOf
-  VERSION = "0.6.2"
+  VERSION = "0.6.9"
 end

data/spec/spec_helper.rb

@@ -1,7 +1,28 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'validates_formatting_of'
-require 'supermodel'
+require 'active_model'
+
+class TestActiveRecord
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
 
-class SuperModel::Base
-  include ActiveModel::Validations::Callbacks
   extend ValidatesFormattingOf::ModelAdditions
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+    @persisted = false
+  end
+
+  def save
+    @persisted = true
+  end
+
+  def persisted?
+    @persisted ||= false
+  end
+
 end

data/spec/validates_formatting_of/model_additions_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 describe ValidatesFormattingOf::ModelAdditions do
 
   describe "email" do
-    class Email < SuperModel::Base
-      validates_formatting_of :email, :using => :email
+    class Email < TestActiveRecord
+      attr_accessor :email
+      validates_formatting_of :email
     end
     it "validates that the email provided is valid" do
       Email.new(:email => "example@example.com").should be_valid
@@ -21,7 +22,8 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "simple email for 1.8.7 and javascript validations (such as with client_side_validations)" do
-    class SimpleEmail < SuperModel::Base
+    class SimpleEmail < TestActiveRecord
+      attr_accessor :email
       validates_formatting_of :email, :using => :simple_email
     end
     it "validates that the email provided is valid" do
@@ -38,8 +40,9 @@ describe ValidatesFormattingOf::ModelAdditions do
     end
   end
   describe "url" do
-    class Webpage < SuperModel::Base
-      validates_formatting_of :url, :using => :url
+    class Webpage < TestActiveRecord
+      attr_accessor :url
+      validates_formatting_of :url
     end
     it "validates that the url provided is valid" do
       Webpage.new(:url => 'http://something.com').should be_valid
@@ -51,7 +54,8 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "us_zip" do
-    class USZip < SuperModel::Base
+    class USZip < TestActiveRecord
+      attr_accessor :zipcode
       validates_formatting_of :zipcode, :using => :us_zip
     end
     it "validates that the zipcode provided is valid" do
@@ -64,19 +68,21 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "alpha" do
-    class Alpha < SuperModel::Base
-      validates_formatting_of :letters, :using => :alpha
+    class Alpha < TestActiveRecord
+      attr_accessor :alpha
+      validates_formatting_of :alpha
     end
     it "validates that the letters provided is valid" do
-      Alpha.new(:letters => 'abscdsofjsdpfahdsofkajlsdfaspdhjfads').should be_valid
-      Alpha.new(:letters => 'asdfalskdfjhas-dlfhasdksdfaldhfadsfasdfa').should be_valid
-      Alpha.new(:letters => 'adsufasodfksadjfskjdfha98').should_not be_valid
-      Alpha.new(:letters => 'asdf ausdpf98hasdfo alsdf ja8 sd').should_not be_valid
+      Alpha.new(:alpha => 'abscdsofjsdpfahdsofkajlsdfaspdhjfads').should be_valid
+      Alpha.new(:alpha => 'asdfalskdfjhas-dlfhasdksdfaldhfadsfasdfa').should be_valid
+      Alpha.new(:alpha => 'adsufasodfksadjfskjdfha98').should_not be_valid
+      Alpha.new(:alpha => 'asdf ausdpf98hasdfo alsdf ja8 sd').should_not be_valid
     end
   end
 
   describe "alphanum" do
-    class Alphanum < SuperModel::Base
+    class Alphanum < TestActiveRecord
+      attr_accessor :letters_and_numbers
       validates_formatting_of :letters_and_numbers, :using => :alphanum
     end
     it "validates that the letters provided is valid" do
@@ -88,7 +94,8 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "us_phone" do
-    class USPhone < SuperModel::Base
+    class USPhone < TestActiveRecord
+      attr_accessor :phone_number
       validates_formatting_of :phone_number, :using => :us_phone
     end
     it "validates that the phone number provided is valid" do
@@ -103,7 +110,8 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "ip_address" do
-    class IPAddress < SuperModel::Base
+    class IPAddress < TestActiveRecord
+      attr_accessor :ip
       validates_formatting_of :ip, :using => :ip_address
     end
     it "validates that the IP address provided is valid" do
@@ -117,23 +125,25 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "ip_address_v4" do
-    class IPAddress < SuperModel::Base
-      validates_formatting_of :ip, :using => :ip_address_v4
+    class IPAddress2 < TestActiveRecord
+      attr_accessor :ipv4
+      validates_formatting_of :ipv4, :using => :ip_address_v4
     end
     it "validates that the IP address provided is valid" do
-      IPAddress.new(:ip => '10.10.10').should_not be_valid
-      IPAddress.new(:ip => '999.10.10.20').should_not be_valid
-      IPAddress.new(:ip => '2222.22.22.22').should_not be_valid
-      IPAddress.new(:ip => '22.2222.22.2').should_not be_valid
-      IPAddress.new(:ip => '127.0.0.1').should be_valid
-      IPAddress.new(:ip => '132.254.111.10').should be_valid
+      IPAddress2.new(:ipv4 => '10.10.10').should_not be_valid
+      IPAddress2.new(:ipv4 => '999.10.10.20').should_not be_valid
+      IPAddress2.new(:ipv4 => '2222.22.22.22').should_not be_valid
+      IPAddress2.new(:ipv4 => '22.2222.22.2').should_not be_valid
+      IPAddress2.new(:ipv4 => '127.0.0.1').should be_valid
+      IPAddress2.new(:ipv4 => '132.254.111.10').should be_valid
     end
   end
 
   # For clarification, NONE of the following numbers are real credit card numbers.
   # They only match the pattern. These were randomly made for testing.
   describe "credit_card" do
-    class Client < SuperModel::Base
+    class Client < TestActiveRecord
+      attr_accessor :cc
       validates_formatting_of :cc, :using => :credit_card
     end
     it "validates that the credit card number provided is valid" do
@@ -145,8 +155,9 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "ssn" do
-    class AnotherPerson < SuperModel::Base
-      validates_formatting_of :ssn, :using => :ssn
+    class AnotherPerson < TestActiveRecord
+      attr_accessor :ssn
+      validates_formatting_of :ssn
     end
     it "validates that the social security number provided is valid" do
       AnotherPerson.new(:ssn => "145.47.0191").should be_valid
@@ -159,7 +170,8 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "hex_color" do
-    class Color < SuperModel::Base
+    class Color < TestActiveRecord
+      attr_accessor :color
       validates_formatting_of :color, :using => :hex_color
     end
     it "validates that the hex color value provided is valid" do
@@ -174,18 +186,22 @@ 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 
+    class Phony < TestActiveRecord
+      attr_accessor :phone, :phone2
+      validates_formatting_of :phone, :using => :us_phone, :on => :create
+      validates_formatting_of :phone2, :using => :us_phone, :on => :update
     end
     it "validates the phone formatting only on creation" do
-      option = Phony.create!(:phone => "(123) 234-4567")
+      option = Phony.new(:phone => "(123) 234-4567")
+      option.should be_valid
       option.phone = "123123123"
       option.should be_valid
     end
-    
-    class Iffy < SuperModel::Base
+
+    class Iffy < TestActiveRecord
+      attr_accessor :name, :phone
       validates_presence_of :name
       validates_formatting_of :phone, :using => :us_phone, :if => lambda { |iffy| iffy.name == "Matthew" }
     end
@@ -193,8 +209,9 @@ describe ValidatesFormattingOf::ModelAdditions 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
+
+    class Unlessy < TestActiveRecord
+      attr_accessor :name, :phone
       validates_presence_of :name
       validates_formatting_of :phone, :using => :us_phone, :unless => lambda { |unlessy| unlessy.name == "Matthew" }
     end
@@ -204,7 +221,8 @@ describe ValidatesFormattingOf::ModelAdditions do
     end
   end
   describe "dollars" do
-    class Money < SuperModel::Base
+    class Money < TestActiveRecord
+      attr_accessor :amount
       validates_formatting_of :amount, :using => :dollars
     end
     it "validates that the dollars amount provided is valid" do
@@ -220,7 +238,8 @@ describe ValidatesFormattingOf::ModelAdditions do
     end
   end
   describe "custom messages" do
-    class Message < SuperModel::Base
+    class Message < TestActiveRecord
+      attr_accessor :first_name
       validates_formatting_of :first_name, :using => :alpha, :message => "is not a valid first name"
     end
     it "are allowed and can be used in displaying error messages" do
@@ -232,7 +251,8 @@ describe ValidatesFormattingOf::ModelAdditions do
   end
 
   describe "default error messages" do
-    class Problems < SuperModel::Base
+    class Problems < TestActiveRecord
+      attr_accessor :name
       validates_formatting_of :name, :using => :alpha
     end
     it "set a default error" do
@@ -245,24 +265,24 @@ describe ValidatesFormattingOf::ModelAdditions do
     end
   end
 
-=begin
-  # Currently, SuperModel's validations do not detect allow_blank or allow_nil
-  # This functionality has been tested separately in an empty Rails app with perfect
-  # results.
-
   describe "nil and blank values" do
-    class People < SuperModel::Base
-      validates_formatting_of :last_name, :using => :alpha, :allow_blank => true
-    end
-    it "are allowed" do
-      p = People.new(:last_name => "something")
-      p.should be_valid
-      p.save!
-      p.reload
-      p.last_name = ""
-      p.should_not be_valid
+    class PeopleTest < TestActiveRecord
+      attr_accessor :email, :email2, :email3
+      validates_formatting_of :email, :allow_nil => true
+      validates_formatting_of :email2, :using => :email, :allow_blank => true
+      validates_formatting_of :email3, :using => :email
+    end
+    let(:people) { PeopleTest.new(:email => "mbridges.91@gmail.com", :email2 => "mbridges.91@gmail.com", :email3 => "mbridges.91@gmail.com") }
+    it "should test nil and blank values correctly" do
+      people.email = nil
+      people.should be_valid
+      people.email = "mbridges.91@gmail.com"
+      people.email2 = ""
+      people.should be_valid
+      people.email2 = "mbridges.91@gmail.com"
+      people.email3 = nil
+      people.should_not be_valid
     end
   end
-=end
 
 end

data/spec/validates_formatting_of/validation_addition_spec.rb

@@ -0,0 +1,35 @@
+require 'validates_formatting_of/validation_addition'
+
+module ValidatesFormattingOf
+
+  class TestAdding
+    extend ValidationAddition
+  end
+
+  describe ValidationAddition do
+    before do
+      TestAdding.add :email, /email/i
+    end
+    it "should be able to add new validations" do
+      TestAdding.add :another, /another/i
+      TestAdding.validations.count.should == 2
+      TestAdding.validations[:email].should be_instance_of Validation
+      TestAdding.validations[:another].should be_instance_of Validation
+    end
+    it "should be able to smartly determine the method to use" do
+      validation = TestAdding.find(:email)
+      validation.name.should == :email
+      validation.regex.should == /email/i
+      validation = TestAdding.find(:non_existent_validation, :using => :email)
+      validation.name.should == :email
+      validation.regex.should == /email/i
+    end
+    it "should raise an error if the method does not exist" do
+      expect { TestAdding.find(:fake) }.to raise_error MissingValidation
+    end
+    it "should be able to determine if the method exists" do
+      TestAdding.exists?(:email).should be_true
+      TestAdding.exists?(:non_existent).should be_false
+    end
+  end
+end

data/spec/validates_formatting_of/validation_spec.rb

@@ -0,0 +1,36 @@
+require 'validates_formatting_of/validation'
+
+module ValidatesFormattingOf
+
+  describe Validation do
+    context "valid validation creation" do
+      let(:validation) { Validation.new(:name, /something/i, "is an invalid value") }
+      it "should receive the right parameters" do
+        validation.name.should == :name
+        validation.regex.should == %r{something}i
+        validation.message.should == 'is an invalid value'
+      end
+      it "should print properly" do
+        validation.to_s.should == "<Validation::name>"
+      end
+      it "should be inspected properly" do
+        validation.inspect.should =~ /Validation/
+        validation.inspect.should =~ /\/something\/i/
+        validation.inspect.should =~ /\:name/
+      end
+    end
+    context "invalid validation creation" do
+      it "should raise an error if the specified regex is not a Regexp objct" do
+        expect { Validation.new(:name, 123, "is an invalid value") }.to raise_error InvalidRegularExpression
+      end
+      it "should not raise an error if the specified regex is a proc or a lambda" do
+        expect { Validation.new(:name, lambda { "my record" }, "is an invalid value") }.not_to raise_error InvalidRegularExpression
+        expect { Validation.new(:name, proc { "my record" }, "is an invalid value") }.not_to raise_error InvalidRegularExpression
+      end
+      it "should not raise an error if the regex if valid" do
+        expect { Validation.new(:name, /something/i, "is an invalid value") }.not_to raise_error InvalidRegularExpression
+      end
+    end
+  end
+
+end

data/validates_formatting_of.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "supermodel"
+  gem.add_development_dependency "simplecov"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_formatting_of
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: supermodel
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,13 +91,16 @@ files:
 - README.markdown
 - Rakefile
 - lib/validates_formatting_of.rb
+- lib/validates_formatting_of/method.rb
 - lib/validates_formatting_of/model_additions.rb
 - lib/validates_formatting_of/railtie.rb
-- lib/validates_formatting_of/validating_methods.rb
-- lib/validates_formatting_of/validation_messages.rb
+- lib/validates_formatting_of/validation.rb
+- lib/validates_formatting_of/validation_addition.rb
 - lib/validates_formatting_of/version.rb
 - spec/spec_helper.rb
 - spec/validates_formatting_of/model_additions_spec.rb
+- spec/validates_formatting_of/validation_addition_spec.rb
+- spec/validates_formatting_of/validation_spec.rb
 - validates_formatting_of.gemspec
 homepage: https://github.com/mattdbridges/validates_formatting_of
 licenses: []
@@ -127,3 +130,5 @@ summary: Adds several convenient methods to validate things such as emails, urls
 test_files:
 - spec/spec_helper.rb
 - spec/validates_formatting_of/model_additions_spec.rb
+- spec/validates_formatting_of/validation_addition_spec.rb
+- spec/validates_formatting_of/validation_spec.rb

data/lib/validates_formatting_of/validating_methods.rb

@@ -1,82 +0,0 @@
-module ValidatesFormattingOf
-  class ValidatingMethods
-    class << self
-
-      # This method is very close to allowing what is specified in RFC 5322 and RFC 5321
-      def email
-        %r{\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\Z}i
-      end
-
-      # Thie version of the email exists to support common validation libraries (such
-      # as client_side_validations) that require access to Rails' validation. Look-behinds
-      # are not supported in javascript.
-      def simple_email
-        %r{\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\Z}i
-      end
-
-      # Taken from Ryan Bates' screencast on extracting gems. Works extremely well. Thanks Ryan!
-      # (slightly revised to work on MRI 1.8.7 and ree)
-      def url
-        %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\Z}i
-      end
-
-      # No numbers of symbols. allows "-"
-      def alpha
-        %r{\A([^\d\W]|[-])*\Z}
-      end
-
-      # Letters, numbers, and spaces
-      def alphanum
-        %r{\A[A-Z0-9\s]+\Z}i
-      end
-
-      # Visa, Mastercard, Discver, and American Express
-      def credit_card
-        %r{\A((4\d{3})|(5[1-5]\d{2})|(6011))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13}\Z}
-      end
-
-      # US Zip code. ##### or #####-####
-      def us_zip
-        %r{\A\d{5}(-\d{4})?\Z}
-      end
-
-      # US Phone numbers.
-      # Examples of valid formats:
-      # * ###.###.####
-      # * ###-###-####
-      # * (###) ###-####
-      # * (###)###-####
-      # * #########
-      # * ### ###-####
-      def us_phone
-        %r{\A(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})\Z}
-      end
-
-      # IP Address validation
-      def ip_address
-        warn "[DEPRECATION] The :ip_address validation for `valdiates_formatting_of` is DEPRECATED. Please update your model validations to use :ip_address_v4. This method will be removed by version 0.7.0."
-        ip_address_v4
-      end
-
-      def ip_address_v4
-        %r{\A(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\Z}
-      end
-
-      # Social Security Number pattern
-      def ssn
-        %r{\A\d{3}([-.]){1}\d{2}([-.]){1}\d{4}\Z}
-      end
-
-      # Matches CSS colors either in three or six digit formats
-      def hex_color
-        %r{\A([A-F0-9]{6}|[A-F0-9]{3})\Z}i
-      end
-
-      # Ensures that what value is passed is a dollar amount of some kind
-      def dollars
-        %r{\A\$?(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?\Z}
-      end
-
-    end
-  end
-end

data/lib/validates_formatting_of/validation_messages.rb

@@ -1,24 +0,0 @@
-module ValidatesFormattingOf
-  class ValidationMessages
-
-    Messages = {
-      :email => "is not a valid email",
-      :simple_email => "is not a valid email",
-      :url => "is not a valid URL",
-      :alpha => "must be only letters or dashes",
-      :alphanum => "must be letters, numbers",
-      :credit_card => "is not a valid credit card number",
-      :us_zip => "is not a valid zipcode",
-      :us_phone => "is not a valid phone number",
-      :ip_address => "is not a valid IP address",
-      :ssn => "is not a valid social security number",
-      :hex_color => "is not a valid hex color",
-      :dollars => "is not a valid dollar amount"
-    }
-
-    def self.message(message)
-      Messages.fetch(message.to_s.downcase.to_sym, "is not valid")
-    end
-
-  end
-end