validates_formatting_of 0.7.2 → 0.8.0

data/CHANGELOG.md

@@ -1,6 +1,16 @@
+## v0.8.0
+
+* Added Rails 'sexy' validation. *hbakhiyor*
+
+```ruby
+class User < ActiveRecord::Base
+  validates :email, :email => true
+end
+```
+
 ## v0.7.2
 
-* Bugfix: Changed \Z to \z anchor and added some test assertions. Not valid with newline in some formats
+* Bugfix: Changed \Z to \z anchor and added some test assertions. Not valid with newline in some formats *hbakhiyor*
 
 ## v0.7.1
 

data/README.markdown

@@ -1,9 +1,8 @@
-# Validates Formatting Of
-
 [![Build Status](https://secure.travis-ci.org/mattdbridges/validates_formatting_of.png)](http://travis-ci.org/mattdbridges/validates_formatting_of)
 [![Dependency Status](https://gemnasium.com/mattdbridges/validates_formatting_of.png?travis)](https://gemnasium.com/mattdbridges/validates_formatting_of)
+[![Code Climate](https://codeclimate.com/github/mattdbridges/validates_formatting_of.png)](https://codeclimate.com/github/mattdbridges/validates_formatting_of)
 
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/mattdbridges/validates_formatting_of)
+# Validates Formatting Of
 
 The `validates_formatting_of` gem adds several convenient methods to validate things such as emails, urls, and phone numbers in a Rails application.
 

data/lib/validates_formatting_of.rb

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

data/lib/validates_formatting_of/railtie.rb

@@ -6,5 +6,11 @@ module ValidatesFormattingOf
         extend ModelAdditions
       end
     end
+
+    initializer 'validates_formatting_of.validations' do
+      ActiveSupport.on_load :active_record do
+        include Validations
+      end
+    end
   end
-end
+end

data/lib/validates_formatting_of/validator.rb

@@ -0,0 +1,26 @@
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_model/validations'
+
+module ValidatesFormattingOf
+  module Validations
+    class Validator < ActiveModel::Validations::FormatValidator
+      def initialize(options = {}, format = nil)
+        return if format.blank?
+
+        validation = Method.find(nil, :using => format)
+        options.reverse_merge!(:with => validation.regex, :message => validation.message)
+        super options
+      end
+    end
+
+    Method.validations.each do |key, value|
+      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+        class #{key.to_s.camelize}Validator < Validator
+          def initialize(options = {})
+            super options, #{key.to_sym.inspect}
+          end
+        end
+      RUBY_EVAL
+    end
+  end
+end

data/lib/validates_formatting_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesFormattingOf
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'active_model'
 class TestActiveRecord
 
   include ActiveModel::Validations
+  include ValidatesFormattingOf::Validations
   extend ValidatesFormattingOf::ModelAdditions
 
   def initialize(attributes = {})

data/spec/validates_formatting_of/validator_spec.rb

@@ -0,0 +1,284 @@
+require 'spec_helper'
+
+describe ValidatesFormattingOf::Validations do
+
+  describe "with 'sexy' validation style" do
+    describe "email" do
+      class Email < TestActiveRecord
+        attr_accessor :email
+        validates :email, :email => true
+      end
+
+      it "validates that the email provided is valid" do
+        Email.new(:email => "example@example.com").should be_valid
+        Email.new(:email => "badexample.com").should_not be_valid
+        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
+        Email.new(:email => "info@-samoa.travel").should_not be_valid
+        Email.new(:email => "info@samoa-.travel").should_not be_valid
+        Email.new(:email => "info@123-samoa.travel").should be_valid
+        Email.new(:email => "info@123-samoa.travel\n").should_not be_valid
+      end
+    end
+
+    describe "simple email for 1.8.7 and javascript validations (such as with client_side_validations)" do
+      class SimpleEmail < TestActiveRecord
+        attr_accessor :email
+        validates :email, :simple_email => true
+      end
+      it "validates that the email provided is valid" do
+        SimpleEmail.new(:email => "example@example.com").should be_valid
+        SimpleEmail.new(:email => "badexample.com").should_not be_valid
+        SimpleEmail.new(:email => "mbridges.91@gmail.com").should be_valid
+        SimpleEmail.new(:email => "some-random%%%strangely-formatted-email@lots.of.subdomains.com").should be_valid
+        SimpleEmail.new(:email => "this__???{}|__should@be-valid.com").should be_valid
+        SimpleEmail.new(:email => "visitorservices@vmfa.museum").should be_valid
+        SimpleEmail.new(:email => "info@samoa.travel").should be_valid
+        SimpleEmail.new(:email => "info@-samoa.travel").should be_valid
+        SimpleEmail.new(:email => "info@samoa-.travel").should be_valid
+        SimpleEmail.new(:email => "info@123-samoa.travel").should be_valid
+        SimpleEmail.new(:email => "info@123-samoa.travel\n").should_not be_valid
+      end
+    end
+    describe "url" do
+      class Webpage < TestActiveRecord
+        attr_accessor :url
+        validates :url, :url => true
+      end
+      it "validates that the url provided is valid" do
+        Webpage.new(:url => 'http://something.com').should be_valid
+        Webpage.new(:url => 'http://something-else.com').should be_valid
+        Webpage.new(:url => 'http://sub.domains.something-else.com').should be_valid
+        Webpage.new(:url => 'http://username:password@something-else.com').should be_valid
+        Webpage.new(:url => "http://username:password@something-else.com\n").should_not be_valid
+        Webpage.new(:url => "something else").should_not be_valid
+      end
+    end
+
+    describe "us_zip" do
+      class USZip < TestActiveRecord
+        attr_accessor :zipcode
+        validates :zipcode, :us_zip => true
+      end
+      it "validates that the zipcode provided is valid" do
+        USZip.new(:zipcode => '92348').should be_valid
+        USZip.new(:zipcode => '23434-2348').should be_valid
+        USZip.new(:zipcode => "23434-2348\n").should_not be_valid
+        USZip.new(:zipcode => '234').should_not be_valid
+        USZip.new(:zipcode => '23408234').should_not be_valid
+        USZip.new(:zipcode => 'invalid').should_not be_valid
+      end
+    end
+
+    describe "alpha" do
+      class Alpha < TestActiveRecord
+        attr_accessor :alpha
+        validates :alpha, :alpha => true
+      end
+      it "validates that the letters provided is valid" do
+        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 < TestActiveRecord
+        attr_accessor :letters_and_numbers
+        validates :letters_and_numbers, :alphanum => true
+      end
+      it "validates that the letters provided is valid" do
+        Alphanum.new(:letters_and_numbers => 'numbersandlettersarevalid1234567890').should be_valid
+        Alphanum.new(:letters_and_numbers => 'justletters').should be_valid
+        Alphanum.new(:letters_and_numbers => 'letters and numbers 123 with spaces').should be_valid
+        Alphanum.new(:letters_and_numbers => 'adding ; some special ** chars').should_not be_valid
+      end
+    end
+
+    describe "us_phone" do
+      class USPhone < TestActiveRecord
+        attr_accessor :phone_number
+        validates :phone_number, :us_phone => true
+      end
+      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 => "(223)123-2347\n").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
+
+    describe "ip_address_v4" do
+      class IPAddress < TestActiveRecord
+        attr_accessor :ipv4
+        validates :ipv4, :ip_address_v4 => true
+      end
+      it "validates that the IP address provided is valid" do
+        IPAddress.new(:ipv4 => '10.10.10').should_not be_valid
+        IPAddress.new(:ipv4 => '999.10.10.20').should_not be_valid
+        IPAddress.new(:ipv4 => '2222.22.22.22').should_not be_valid
+        IPAddress.new(:ipv4 => '22.2222.22.2').should_not be_valid
+        IPAddress.new(:ipv4 => '127.0.0.1').should be_valid
+        IPAddress.new(:ipv4 => '132.254.111.10').should be_valid
+        IPAddress.new(:ipv4 => "132.254.111.10\n").should_not 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 < TestActiveRecord
+        attr_accessor :cc
+        validates :cc, :credit_card => true
+      end
+      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
+        Client.new(:cc => "5422434400828889\n").should_not be_valid # Mastercard style
+        Client.new(:cc => '1233444444444444').should_not be_valid # fake
+      end
+    end
+
+    describe "ssn" do
+      class AnotherPerson < TestActiveRecord
+        attr_accessor :ssn
+        validates :ssn, :ssn => true
+      end
+      it "validates that the social security number provided is valid" do
+        AnotherPerson.new(:ssn => "145.47.0191").should be_valid
+        AnotherPerson.new(:ssn => "223-43-2343").should be_valid
+        AnotherPerson.new(:ssn => "999.55.8888").should be_valid
+        AnotherPerson.new(:ssn => "999.55.8888\n").should_not be_valid
+        AnotherPerson.new(:ssn => "28934").should_not be_valid
+        AnotherPerson.new(:ssn => "228934828934934").should_not be_valid
+        AnotherPerson.new(:ssn => "23498.7234").should_not be_valid
+      end
+    end
+
+    describe "hex_color" do
+      class Color < TestActiveRecord
+        attr_accessor :color
+        validates :color, :hex_color => true
+      end
+      it "validates that the hex color value provided is valid" do
+        Color.new(:color => "efefef").should be_valid
+        Color.new(:color => "98de89").should be_valid
+        Color.new(:color => "000011").should be_valid
+        Color.new(:color => "132").should be_valid
+        Color.new(:color => "eef").should be_valid
+        Color.new(:color => "eef\n").should_not be_valid
+        Color.new(:color => "efefe").should_not be_valid
+        Color.new(:color => "zsdfsd").should_not be_valid
+        Color.new(:color => "p98hul;").should_not be_valid
+        Color.new(:color => "sdfsdfsf").should_not be_valid
+      end
+    end
+
+    describe "validation options" do
+      class Phony < TestActiveRecord
+        attr_accessor :phone, :phone2
+        validates :phone, :us_phone => true, :on => :create
+        validates :phone2, :us_phone => true, :on => :update
+      end
+      it "validates the phone formatting only on creation" do
+        option = Phony.new(:phone => "(123) 234-4567")
+        option.should be_valid
+        option.phone = "123123123"
+        option.should be_valid
+      end
+
+      class Iffy < TestActiveRecord
+        attr_accessor :name, :phone
+        validates_presence_of :name
+        validates :phone, :us_phone => true, :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 < TestActiveRecord
+        attr_accessor :name, :phone
+        validates_presence_of :name
+        validates :phone, :us_phone => true, :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 < TestActiveRecord
+        attr_accessor :amount
+        validates :amount, :dollars => true
+      end
+      it "validates that the dollars amount provided is valid" do
+        Money.new(:amount => "$100.00").should be_valid
+        Money.new(:amount => "100.00").should be_valid
+        Money.new(:amount => "12,234,343").should be_valid
+        Money.new(:amount => "$12.34").should be_valid
+        Money.new(:amount => "120,123,232.32").should be_valid
+        Money.new(:amount => "$$1111111100").should_not be_valid
+        Money.new(:amount => "100;00").should_not be_valid
+        Money.new(:amount => "238,3423,42..99").should_not be_valid
+        Money.new(:amount => "$-233").should_not be_valid
+      end
+    end
+    describe "custom messages" do
+      class Message < TestActiveRecord
+        attr_accessor :first_name
+        validates :first_name, :alpha => { :message => "is not a valid first name" }
+      end
+      it "are allowed and can be used in displaying error messages" do
+        message = Message.new(:first_name => "invalid-first-name-123")
+        message.should_not be_valid
+        message.errors.keys.class.should eq Array
+        message.errors.full_messages.first.should =~ /is not a valid first name/
+      end
+    end
+
+    describe "default error messages" do
+      class Problems < TestActiveRecord
+        attr_accessor :name
+        validates :name, :alpha => true
+      end
+      it "set a default error" do
+        problems = Problems.new(:name => "sdfs12312dfsd")
+        problems.should_not be_valid
+        problems.errors.full_messages.first.should =~ /letters/i
+        email = Email.new(:email => "not.an.email.address")
+        email.should_not be_valid
+        email.errors.full_messages.first.should =~ /email/i
+      end
+    end
+
+    describe "nil and blank values" do
+      class PeopleTest < TestActiveRecord
+        attr_accessor :email, :email2, :email3
+        validates :email, :email => true, :allow_nil => true
+        validates :email2, :email => true, :allow_blank => true
+        validates :email3, :email => true
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_formatting_of
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -96,11 +96,13 @@ files:
 - lib/validates_formatting_of/railtie.rb
 - lib/validates_formatting_of/validation.rb
 - lib/validates_formatting_of/validation_addition.rb
+- lib/validates_formatting_of/validator.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
+- spec/validates_formatting_of/validator_spec.rb
 - validates_formatting_of.gemspec
 homepage: https://github.com/mattdbridges/validates_formatting_of
 licenses: []
@@ -132,3 +134,4 @@ test_files:
 - spec/validates_formatting_of/model_additions_spec.rb
 - spec/validates_formatting_of/validation_addition_spec.rb
 - spec/validates_formatting_of/validation_spec.rb
+- spec/validates_formatting_of/validator_spec.rb