validates_formatting_of 0.3.3 → 0.3.4

data/lib/validates_formatting_of.rb

@@ -1,6 +1,7 @@
 # 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"
 require "validates_formatting_of/model_additions"
 require "validates_formatting_of/railtie" if defined? Rails

data/lib/validates_formatting_of/model_additions.rb

@@ -1,24 +1,27 @@
 module ValidatesFormattingOf
   module ModelAdditions
-    def validates_formatting_of(attribute, opts = {})
 
-      # Here is where the input is formatted before it is validated.
-      # Not yet implemented.
-      # 
-      # unless opts[:preformat].nil?
-      #   before_validation do
-      #     # add formatting changes here
-      #   end
-      # end
+    # Using validates_formatting_of is as simple as using Rails' built-in 
+    # validation methods in models.
+    # 
+    # class User < ActiveRecord::Base
+    #   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`
+    def validates_formatting_of(attribute, opts = {})
 
       regex_for_validation = opts[:regex] || validate_with(opts[:using])
 
       # Add :allow_nil and :allow_blank options. Both are false by default.
       allow_nil = opts[:allow_nil] || false
       allow_blank = opts[:allow_blank] || false
+      validation_message = opts[:message] || ValidationMessages.message(opts[:using])
 
-      validates attribute,  :format => {  :with     => regex_for_validation,
-                                          :message  => opts[:message] },
+      validates attribute,  :format => {  :with     =>  regex_for_validation,
+                                          :message  =>  validation_message },
                             :allow_nil => allow_nil,
                             :allow_blank => allow_blank
     end

data/lib/validates_formatting_of/validating_methods.rb

@@ -37,6 +37,7 @@ module ValidatesFormattingOf
       /^([\(]{1}[0-9]{3}[\)]{1}[ |\-]{0,1}|^[0-9]{3}[\-| ])?[0-9]{3}(\-| ){1}[0-9]{4}$/
     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

data/lib/validates_formatting_of/validation_messages.rb

@@ -0,0 +1,30 @@
+module ValidatesFormattingOf
+  module ValidationMessages
+
+    class Messages
+      
+      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"
+        }
+      end
+       
+    end
+
+    extend self
+
+    def message(message)
+      Messages.hash[message.downcase.to_sym]
+    end
+
+  end
+end

data/lib/validates_formatting_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesFormattingOf
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/validates_formatting_of/model_additions_spec.rb

@@ -131,7 +131,7 @@ describe ValidatesFormattingOf::ModelAdditions do
     class Color < SuperModel::Base
       validates_formatting_of :color, :using => :hex_color
     end
-    it "validates that the social security number provided is valid" do
+    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
@@ -156,6 +156,23 @@ describe ValidatesFormattingOf::ModelAdditions do
       message.errors.full_messages.first.should =~ /is not a valid first name/
     end
 
+  end
+  describe "default error messages" do
+
+    class Problems < SuperModel::Base
+      validates_formatting_of :name, :using => :alpha
+    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 => "fake@email.address")
+      email.should_not be_valid
+      email.errors.full_messages.first.should =~ /email/i
+    end
+
   end
   # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_formatting_of
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70102167212440 !ruby/object:Gem::Requirement
+  requirement: &70245176231800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102167212440
+  version_requirements: *70245176231800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70102167210840 !ruby/object:Gem::Requirement
+  requirement: &70245176230180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102167210840
+  version_requirements: *70245176230180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102167209720 !ruby/object:Gem::Requirement
+  requirement: &70245176228780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102167209720
+  version_requirements: *70245176228780
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &70102167208440 !ruby/object:Gem::Requirement
+  requirement: &70245176228020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102167208440
+  version_requirements: *70245176228020
 description: Common Rails validations wrapped in a gem.
 email:
 - mbridges.91@gmail.com
@@ -75,6 +75,7 @@ files:
 - 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/version.rb
 - spec/spec_helper.rb
 - spec/validates_formatting_of/model_additions_spec.rb