validates_formatting_of 0.3.6 → 0.3.7

data/.rspec

@@ -1 +1 @@
---color
+--color

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
   - ree
   - rbx
   - jruby
-  - ruby-head
+  - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.3.7
+
+* Bugfix in `:allow_nil` and `:allow_blank`
+
 ## v0.3.6
 
 * Added a small mention of how to suggest validation patterns
@@ -20,9 +24,9 @@
 
 ## v0.2.1 -- v0.2.3
 
-* Added several new methods and tests for validations. 
+* Added several new methods and tests for validations.
 * Fixed several spelling and English issues in the README.
 
 ## v0.2.0
 
-* initial release
+* initial release

data/LICENSE.txt

@@ -4,4 +4,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,4 +1,6 @@
-F# validates_formatting_of [![Build Status](https://secure.travis-ci.org/mattdbridges/validates_formatting_of.png)](http://travis-ci.org/mattdbridges/validates_formatting_of)
+# 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)
 
 The `validates_formatting_of` gem adds several convenient methods to validate things such as emails, urls, and phone numbers in a Rails application.
 
@@ -63,19 +65,19 @@ You can still add the following options when using `validates_formatting_of`:
     class Purchases < ActiveRecord::Base
       validates_formatting_of :cc, :using => :credit_card
     end
-    
+
 ### US Zipcodes
 
     class Location < ActiveRecord::Base
       validates_formatting_of :zipcode, :using => :us_zip
     end
-    
+
 ### US Phone numbers
 
     class Phones < ActiveRecord::Base
       validates_formatting_of :phone, :using => :us_phone
     end
-    
+
 ### IP Address
 
     class Location < ActiveRecord::Base
@@ -85,8 +87,8 @@ You can still add the following options when using `validates_formatting_of`:
 
     class User < ActiveRecord::Base
       validates_formatting_of :ssn, :using => :ssn
-    end 
-    
+    end
+
 ### Hex Colors
 
     class Color < ActiveRecord::Base
@@ -115,4 +117,4 @@ It is very easy to contribute to this gem. Full documentation to do so will be a
 # Have Ideas?
 
 Do you use a particular pattern on a regular basis that isn't here or you would like to contribute? For now, [create a new issue](https://github.com/mattdbridges/validates_formatting_of/issues/new) in the issue tracker. I would be more than happy to consider adding it to the project.
-    
+

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec

data/lib/validates_formatting_of/model_additions.rb

@@ -1,29 +1,28 @@
 module ValidatesFormattingOf
   module ModelAdditions
 
-    # Using validates_formatting_of is as simple as using Rails' built-in 
+    # 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 
+    #
+    # 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 = {})
-
+    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  =>  validation_message },
-                            :allow_nil => allow_nil,
-                            :allow_blank => allow_blank
+      options = {
+        :format => {
+          :with => regex_for_validation,
+          :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?
+      validates(attribute, options)
     end
 
   private
@@ -38,4 +37,4 @@ module ValidatesFormattingOf
       @formatting ||= ValidatingMethods.new
     end
   end
-end
+end

data/lib/validates_formatting_of/railtie.rb

@@ -7,4 +7,4 @@ module ValidatesFormattingOf
       end
     end
   end
-end
+end

data/lib/validates_formatting_of/validating_methods.rb

@@ -51,11 +51,11 @@ module ValidatesFormattingOf
     def hex_color
       /^([A-F0-9]{6}|[A-F0-9]{3})$/i
     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
 
   end
-end
+end

data/lib/validates_formatting_of/validation_messages.rb

@@ -2,7 +2,7 @@ module ValidatesFormattingOf
   module ValidationMessages
 
     class Messages
-      
+
       def self.hash
         {
           :email => "is not a valid email",
@@ -18,7 +18,7 @@ module ValidatesFormattingOf
           :dollars => "is not a valid dollar amount"
         }
       end
-       
+
     end
 
     extend self
@@ -28,4 +28,4 @@ module ValidatesFormattingOf
     end
 
   end
-end
+end

data/lib/validates_formatting_of/version.rb

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

data/spec/spec_helper.rb

@@ -4,4 +4,4 @@ require 'supermodel'
 class SuperModel::Base
   include ActiveModel::Validations::Callbacks
   extend ValidatesFormattingOf::ModelAdditions
-end
+end

data/spec/validates_formatting_of/model_additions_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe ValidatesFormattingOf::ModelAdditions do
 
   describe "email" do
-
     class Email < SuperModel::Base
       validates_formatting_of :email, :using => :email
     end
@@ -14,10 +13,9 @@ describe ValidatesFormattingOf::ModelAdditions do
       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
     end
-
   end
-  describe "url" do
 
+  describe "url" do
     class Webpage < SuperModel::Base
       validates_formatting_of :url, :using => :url
     end
@@ -28,10 +26,9 @@ describe ValidatesFormattingOf::ModelAdditions do
       Webpage.new(:url => 'http://username:password@something-else.com').should be_valid
       Webpage.new(:url => "something else").should_not be_valid
     end
-
   end
+
   describe "us_zip" do
-    
     class USZip < SuperModel::Base
       validates_formatting_of :zipcode, :using => :us_zip
     end
@@ -42,10 +39,9 @@ describe ValidatesFormattingOf::ModelAdditions do
       USZip.new(:zipcode => '23408234').should_not be_valid
       USZip.new(:zipcode => 'invalid').should_not be_valid
     end
-
   end
+
   describe "alpha" do
-    
     class Alpha < SuperModel::Base
       validates_formatting_of :letters, :using => :alpha
     end
@@ -55,10 +51,9 @@ describe ValidatesFormattingOf::ModelAdditions do
       Alpha.new(:letters => 'adsufasodfksadjfskjdfha98').should_not be_valid
       Alpha.new(:letters => 'asdf ausdpf98hasdfo alsdf ja8 sd').should_not be_valid
     end
-
   end
+
   describe "alphanum" do
-    
     class Alphanum < SuperModel::Base
       validates_formatting_of :letters_and_numbers, :using => :alphanum
     end
@@ -68,10 +63,9 @@ describe ValidatesFormattingOf::ModelAdditions do
       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 < SuperModel::Base
       validates_formatting_of :phone_number, :using => :us_phone
     end
@@ -82,10 +76,9 @@ describe ValidatesFormattingOf::ModelAdditions do
       USPhone.new(:phone_number => '2349870238').should_not be_valid
       USPhone.new(:phone_number => '12349870238').should_not be_valid
     end
-
   end
+
   describe "ip_address" do
-    
     class IPAddress < SuperModel::Base
       validates_formatting_of :ip, :using => :ip_address
     end
@@ -97,12 +90,11 @@ describe ValidatesFormattingOf::ModelAdditions do
       IPAddress.new(:ip => '127.0.0.1').should be_valid
       IPAddress.new(:ip => '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
       validates_formatting_of :cc, :using => :credit_card
     end
@@ -112,8 +104,8 @@ describe ValidatesFormattingOf::ModelAdditions do
       Client.new(:cc => '5422434400828888').should be_valid # Mastercard style
       Client.new(:cc => '1233444444444444').should_not be_valid # fake
     end
-
   end
+
   describe "ssn" do
     class AnotherPerson < SuperModel::Base
       validates_formatting_of :ssn, :using => :ssn
@@ -127,6 +119,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       AnotherPerson.new(:ssn => "23498.7234").should_not be_valid
     end
   end
+
   describe "hex_color" do
     class Color < SuperModel::Base
       validates_formatting_of :color, :using => :hex_color
@@ -160,50 +153,49 @@ describe ValidatesFormattingOf::ModelAdditions do
     end
   end
   describe "custom messages" do
-
     class Message < SuperModel::Base
       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
       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
 
+  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
+
+=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.last_name = ""
-  #     p.should_not be_valid
-  #   end
-  # end
-end
+
+  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
+    end
+  end
+=end
+
+end

metadata

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