can_has_validations 0.2.1 → 0.3.0

data/README.md

@@ -6,6 +6,7 @@ ActiveModel.
 Validations provided:
 
 * Email
+* Existence
 * Grandparent
 * Ordering
 * URL
@@ -13,7 +14,7 @@ Validations provided:
 
 All validators use the newer Rails 3 syntax:
 
-    validates :some_attribute, :email=>true
+    validates :some_attribute, email: true
 
 (That is, there's not a validates_email_of :some_attribute helper.)
 
@@ -33,14 +34,30 @@ Ensures an attribute is generally formatted as an email. It uses a basic regex
 that's designed to match something that looks like an email. It allows for any
 TLD, so as to not fail as ICANN continues to add TLDs.
 
-    validates :user_email, :email=>true
+    validates :user_email, email: true
+
+
+## Existence validator ##
+
+Rails 4 changed the default behavior of the Presence validator. In Rails 3.x,
+it always validated presence, even if `allow_nil: true` or `allow_blank: true`
+was set. The Rails 4 Presence validator now acts on `allow_nil` and
+`allow_blank`, which makes it semi-useless.
+
+The Existence validator restores the previous behavior (but with a new name to
+avoid any potential conflicts).
+
+Mongoid 3 and 4 also exhibit the same behavior as Rails 4, even under Rails 3,
+so this is useful with Mongoid as well.
+
+    validates :name, presence: true
 
 
 ## Grandparent validator ##
 
 Ensures two (or more) associations share a common parent value. 
 
-`:allow_nil=>true` will not only allow the attribute/association to be nil, but
+`allow_nil: true` will not only allow the attribute/association to be nil, but
 also any of the `:scope` values.
 
 Consider a model tree like this:
@@ -64,7 +81,7 @@ Consider a model tree like this:
       belongs_to :address
       belongs_to :phone
       
-      validates :phone, :grandparent=>{:scope=>:address, :parent=>:user}
+      validates :phone, grandparent: {scope: :address, parent: :user}
     end
 
 For any `Order`, this ensures that both `:address` and `:phone` belong to the same
@@ -72,7 +89,7 @@ For any `Order`, this ensures that both `:address` and `:phone` belong to the sa
 
 Basically it starts with the attribute being validated (`:phone` in this case)
 and the scoped attributes (just `:address` in this case, but you can supply an
-array if needed, eg: `:scope=>[:billing_address, :mailing_address]` ). 
+array if needed, eg: `scope: [:billing_address, :mailing_address]` ). 
 
 Then, it looks for the attribute that is the common parent (`:user` in the above
 example). So, it's looking for `phone.user` and `address.user`. 
@@ -95,13 +112,13 @@ either `:before` or `:after` to make them readable.
 Always skips over nil values; use `:presence` to validate those.
 
     # Short versions:
-    validates :start_at, :before => :finish_at
-    validates :finish_at, :after => [:start_at, :alt_start_at]
-    validates :start_at, :presence => true, :before => :finish_at
+    validates :start_at, before: :finish_at
+    validates :finish_at, after: [:start_at, :alt_start_at]
+    validates :start_at, presence: true, before: :finish_at
     
     # Long versions, if you need to add extra validation options:
-    validates :start_at, :before => {:value_of => :finish_at, :message=>"..." }
-    validates :finish_at, :after => {:values_of => [:start_at, :alt_start_at], :if=>... }
+    validates :start_at, before: {value_of: :finish_at, message: "..." }
+    validates :finish_at, after: {values_of: [:start_at, :alt_start_at], if: ... }
 
 
 ## URL validator ##
@@ -109,14 +126,14 @@ Always skips over nil values; use `:presence` to validate those.
 Ensure an attribute is generally formatted as a URL. If `addressable/uri` is
 already loaded, it will be used to parse IDN's.
 
-    validates :website, :url=>true
+    validates :website, url: true
 
     # With IDN parsing:
     require 'addressable/uri'
-    validates :website, :url=>true
+    validates :website, url: true
 
     # Or, as part of your Gemfile:
-    gem 'addressable', :require=>'addressable/uri'
+    gem 'addressable', require: 'addressable/uri'
     gem 'can_has_validations'
 
 
@@ -129,14 +146,14 @@ The first is as an equivalent to `attr_readonly :user_id` except that it also
 produces a validation error instead of silently ignoring the change as
 `attr_readonly` does.
 
-    validates :user_id, :presence=>true, :write_once=>true
+    validates :user_id, presence: true, write_once: true
 
 The second use is to allow an attribute to be nil when the record is first
 created and allow it to be set once at some arbitrary point in the future, but
 once set, still make it immutable. A WORM (write once, read many) attribute of
 sorts.
 
-    validates :user_id, :write_once=>true
+    validates :user_id, write_once: true
 
 
 ## Error messages

data/lib/can_has_validations.rb

@@ -1,4 +1,4 @@
-%w(email grandparent ordering url write_once).each do |validator|
+%w(email existence grandparent ordering url write_once).each do |validator|
   require "can_has_validations/validators/#{validator}_validator"
 end
 

data/lib/can_has_validations/validators/email_validator.rb

@@ -4,7 +4,7 @@
 module ActiveModel::Validations
   class EmailValidator < ActiveModel::EachValidator
 
-    EMAIL_REGEXP = /\A([a-z0-9._+-]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+    EMAIL_REGEXP = /\A([a-z0-9._+-]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
 
     def validate_each(record, attribute, value)
       unless value =~ EMAIL_REGEXP

data/lib/can_has_validations/validators/existence_validator.rb

@@ -0,0 +1,14 @@
+# Just like `presence` except that it properly ignores allow_nil / allow_blank.
+# This is how Rails 3.2 worked, but was changed in Rails 4. Mongoid 3 and 4 both
+#   act like Rails 4, so this is useful there too.
+
+module ActiveModel::Validations
+  class ExistenceValidator < ActiveModel::Validations::PresenceValidator
+    def validate(record)
+      attributes.each do |attribute|
+        value = record.read_attribute_for_validation(attribute)
+        validate_each(record, attribute, value)
+      end
+    end
+  end  
+end

data/lib/can_has_validations/version.rb

@@ -1,3 +1,3 @@
 module CanHasValidations
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.0'
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -49,7 +49,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Assorted Rails 3 validators.
+description: Assorted Rails 3.x-4.x validators.
 email:
 - tm@iprog.com
 executables: []
@@ -58,6 +58,7 @@ extra_rdoc_files: []
 files:
 - lib/can_has_validations/locale/en.yml
 - lib/can_has_validations/validators/email_validator.rb
+- lib/can_has_validations/validators/existence_validator.rb
 - lib/can_has_validations/validators/grandparent_validator.rb
 - lib/can_has_validations/validators/ordering_validator.rb
 - lib/can_has_validations/validators/safe_uniqueness_validator.rb
@@ -113,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 908909344838106920
+      hash: 3102458666723632577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,13 +123,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 908909344838106920
+      hash: 3102458666723632577
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Assorted Rails 3 validators
+summary: Assorted Rails 3.x-4.x validators
 test_files:
 - test/can_has_validations_test.rb
 - test/dummy/app/assets/javascripts/application.js