can_has_validations 0.2.0 → 0.2.1

data/README.md

@@ -18,7 +18,16 @@ All validators use the newer Rails 3 syntax:
 (That is, there's not a validates_email_of :some_attribute helper.)
 
 
-## Email ##
+## Installation ##
+
+Add it to your `Gemfile`:
+
+    gem 'can_has_validations'
+
+
+
+
+## Email validator ##
 
 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
@@ -27,7 +36,7 @@ TLD, so as to not fail as ICANN continues to add TLDs.
     validates :user_email, :email=>true
 
 
-## Grandparent ##
+## Grandparent validator ##
 
 Ensures two (or more) associations share a common parent value. 
 
@@ -77,7 +86,7 @@ or the database foreign key (`:user_id`). You can also use any other field. The
 test is merely that they match, not that they are associations.
 
 
-## Ordering ##
+## Ordering validators ##
 
 Ensures two attribute values maintain a relative order to one another. This is
 often useful when two date or range values. Validations can be written using
@@ -95,7 +104,7 @@ Always skips over nil values; use `:presence` to validate those.
     validates :finish_at, :after => {:values_of => [:start_at, :alt_start_at], :if=>... }
 
 
-## URL ##
+## URL validator ##
 
 Ensure an attribute is generally formatted as a URL. If `addressable/uri` is
 already loaded, it will be used to parse IDN's.
@@ -106,8 +115,12 @@ already loaded, it will be used to parse IDN's.
     require 'addressable/uri'
     validates :website, :url=>true
 
+    # Or, as part of your Gemfile:
+    gem 'addressable', :require=>'addressable/uri'
+    gem 'can_has_validations'
+
 
-## Write Once ##
+## Write Once validator ##
 
 Ensure that once a value is written, it becomes readonly. There are two uses
 for this. 

data/lib/can_has_validations/validators/email_validator.rb

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

data/lib/can_has_validations/validators/ordering_validator.rb

@@ -33,4 +33,26 @@ module ActiveModel::Validations
       end
     end
   end
+  # class OrderingValidator < ActiveModel::EachValidator
+  #   def validate_each(record, attribute, value)
+  #     Array(options[:before]).each do |attr_name|
+  #       greater = record.send attr_name
+  #       next unless value && greater
+  #       unless value < greater
+  #         attr2 = record.class.human_attribute_name attr_name
+  #         record.errors.add(attribute, :before, options.except(:before).merge!(:attribute2=>attr2))
+  #         # record.errors[attribute] << (options[:message] || :before"must be before #{record.class.human_attribute_name attr_name}")
+  #       end
+  #     end
+  #     Array(options[:after]).each do |attr_name|
+  #       lesser = record.send attr_name
+  #       next unless value && lesser
+  #       unless value > lesser
+  #         attr2 = record.class.human_attribute_name attr_name
+  #         record.errors.add(attribute, :after, options.except(:after).merge!(:attribute2=>attr2))
+  #         # record.errors[attribute] << (options[:message] || :after"must be after #{record.class.human_attribute_name attr_name}")
+  #       end
+  #     end
+  #   end
+  # end
 end

data/lib/can_has_validations/validators/safe_uniqueness_validator.rb

@@ -0,0 +1,15 @@
+# better behaved version of the uniqueness validator
+#   Difference is it doesn't puke if the foreign_key is an invalid type (for
+#   example, an invalid string being provided for UUID type key). Instead,
+#   returns an error about being unable to find the key value.
+# eg: validates :user_id, :safe_uniqueness=>true
+
+class SafeUniquenessValidator < ActiveRecord::Validations::UniquenessValidator
+  def validate_each(record, attribute, value)
+    record.transaction(:requires_new=>true) do
+      super
+    end
+  rescue ActiveRecord::StatementInvalid
+    record.errors.add(attribute, "%{attribute} %{value} not found", options.except(:case_sensitive, :scope).merge(:value=>value))
+  end  
+end

data/lib/can_has_validations/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_has_validations
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -21,7 +21,7 @@ dependencies:
         version: 3.2.0
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 3.2.0
     - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,7 @@ files:
 - lib/can_has_validations/validators/email_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
 - lib/can_has_validations/validators/url_validator.rb
 - lib/can_has_validations/validators/write_once_validator.rb
 - lib/can_has_validations/version.rb
@@ -110,12 +111,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 908909344838106920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 908909344838106920
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24