validates_formatting_of 0.5.0 → 0.6.0

data/lib/validates_formatting_of.rb

@@ -1,5 +1,3 @@
-# This file does all of the preloading. Little to no actual code should go in this file.
-
 require "validates_formatting_of/version"
 require "validates_formatting_of/validation_messages"
 require "validates_formatting_of/validating_methods"

data/lib/validates_formatting_of/model_additions.rb

@@ -37,12 +37,7 @@ module ValidatesFormattingOf
 
     def validate_with(method)
       # Actually retrieve the regex to check against
-      formatting.send(method)
-    end
-
-    def formatting
-      # Grab the validating methods
-      @formatting ||= ValidatingMethods.new
+      ValidatingMethods.send(method)
     end
   end
 end

data/lib/validates_formatting_of/validating_methods.rb

@@ -1,68 +1,77 @@
 module ValidatesFormattingOf
   class ValidatingMethods
+    class << self
 
-    # This method is very close to allowing what is specified in RFC 5322 and RFC 5321
-    def email
-      /\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\Z/i
-    end
+      # 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
 
-    # 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
-      /^https?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?$/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
 
-    # No numbers of symbols. allows "-"
-    def alpha
-      /^([^\d\W]|[-])*$/
-    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
 
-    # Letters, numbers, and spaces
-    def alphanum
-      /^[A-Z0-9\s]+$/i
-    end
+      # No numbers of symbols. allows "-"
+      def alpha
+        %r{\A([^\d\W]|[-])*\Z}
+      end
 
-    # Visa, Mastercard, Discver, and American Express
-    def credit_card
-      /^((4\d{3})|(5[1-5]\d{2})|(6011))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13}$/
-    end
+      # Letters, numbers, and spaces
+      def alphanum
+        %r{\A[A-Z0-9\s]+\Z}i
+      end
 
-    # US Zip code. ##### or #####-####
-    def us_zip
-      /^\d{5}(-\d{4})?$/
-    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 Phone numbers.
-    # Examples of valid formats:
-    # * ###.###.####
-    # * ###-###-####
-    # * (###) ###-####
-    # * (###)###-####
-    # * #########
-    # * ### ###-####
-    def us_phone
-      /^(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})$/
-    end
+      # US Zip code. ##### or #####-####
+      def us_zip
+        %r{\A\d{5}(-\d{4})?\Z}
+      end
 
-    # IP Address validation
-    def ip_address
-      /^(\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])$/
-    end
+      # US Phone numbers.
+      # Examples of valid formats:
+      # * ###.###.####
+      # * ###-###-####
+      # * (###) ###-####
+      # * (###)###-####
+      # * #########
+      # * ### ###-####
+      def us_phone
+        %r{\A(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})\Z}
+      end
 
-    # Social Security Number pattern
-    def ssn
-      /^\d{3}([-.]){1}\d{2}([-.]){1}\d{4}$/
-    end
+      # IP Address validation
+      def 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}
+      end
 
-    # Matches CSS colors either in three or six digit formats
-    def hex_color
-      /^([A-F0-9]{6}|[A-F0-9]{3})$/i
-    end
+      # Social Security Number pattern
+      def ssn
+        %r{\A\d{3}([-.]){1}\d{2}([-.]){1}\d{4}\Z}
+      end
 
-    # Ensures that what value is passed is a dollar amount of some kind
-    def dollars
-      /^\$?(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/
-    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,30 +1,23 @@
 module ValidatesFormattingOf
-  module ValidationMessages
+  class ValidationMessages
 
-    class Messages
+    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.hash
-        {
-          :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"
-        }
-      end
-
-    end
-
-    extend self
-
-    def message(message)
-      Messages.hash[message.to_s.downcase.to_sym]
+    def self.message(message)
+      Messages.fetch(message.to_s.downcase.to_sym, "is not valid")
     end
 
   end

data/lib/validates_formatting_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesFormattingOf
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/validates_formatting_of/model_additions_spec.rb

@@ -20,6 +20,23 @@ describe ValidatesFormattingOf::ModelAdditions do
     end
   end
 
+  describe "simple email for 1.8.7 and javascript validations (such as with client_side_validations)" do
+    class SimpleEmail < SuperModel::Base
+      validates_formatting_of :email, :using => :simple_email
+    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
+    end
+  end
   describe "url" do
     class Webpage < SuperModel::Base
       validates_formatting_of :url, :using => :url

data/validates_formatting_of.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ValidatesFormattingOf::VERSION
 
-  gem.add_dependency "rails", "~> 3.0"
+  gem.add_dependency "activerecord", "~> 3.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_formatting_of
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70230387998560 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230387998560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70230387997920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230387997920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70230387997300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230387997300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &70230387996860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230387996860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common Rails validations wrapped in a gem.
 email:
 - mbridges.91@gmail.com
@@ -64,7 +84,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -94,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1332009593602573104
+      hash: -3727749513764569067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,10 +122,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1332009593602573104
+      hash: -3727749513764569067
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Adds several convenient methods to validate things such as emails, urls,

data/.rvmrc

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.3-p0@validates_formatting_of"
-
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    exit 1
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-# If you use bundler, this might be useful to you:
-# if command -v bundle && [[ -s Gemfile ]]
-# then
-#   bundle install
-# fi
-
-