association_validator 0.6.0 → 0.6.1

data/README.textile

@@ -7,14 +7,15 @@ validates :user_id, :presence => true, :association => true</code></pre>
 You can also set the message using the :message option:
 <pre><code>validates :user_id, :association => {:message => 'was unretrievable'}</code></pre>
 
-For polymorphic classes, pass your class_name option as a proc:
+For polymorphic classes, pass your class_name option as a proc or use the new polymorphic_class option
 <pre><code>class Item < ActiveRecord::Base
-  validates :owner_id, :presence => true, :association => {:class_name => Proc.new {|r| r.owner_type}}
-end
-# == Schema Information
-# Table name: items
-#  owner_id   :integer
-#  owner_type :string</code></pre>
+  # The new way to do polymorphic resource validation
+  validates :owner_id, :presence => true, :association => {:polymorphic_class => 'owner_type'}
+  # it calls record.send(:polymorphic_class)
+
+  # If for some odd reasson you need to use a proc:
+  validates :user_id, :presence => true, :association => {:class_name => Proc.new {|r| r.user_type || "User" }}
+end</code></pre>
 
 h1. How to install
 

data/README.txt

@@ -6,14 +6,15 @@ Validate that the id field is a saved record. It will ignore blank fields, so us
 You can also set the message using the :message option:
     validates :user_id, :association => {:message => 'was unretrievable'}
 	
-For polymorphic classes, pass your class_name option as a proc:
+For polymorphic classes, pass your class_name option as a proc or use the new polymorphic_class option
     class Item < ActiveRecord::Base
-      validates :owner_id, :presence => true, :association => {:class_name => Proc.new {|r| r.owner_type}}
+      # The new way to do polymorphic resource validation
+      validates :owner_id, :presence => true, :association => {:polymorphic_class => 'owner_type'}
+      # it calls record.send(:polymorphic_class)
+
+      # If for some odd reasson you need to use a proc:
+      validates :user_id, :presence => true, :association => {:class_name => Proc.new {|r| r.user_type || "User" }}
     end
-    # == Schema Information
-    # Table name: items
-    #  owner_id   :integer
-    #  owner_type :string
 
 === How to install
 Add the following line to your Gemfile and install.

data/Rakefile

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('association_validator', '0.6.0') do |p|
+Echoe.new('association_validator', '0.6.1') do |p|
   p.description    = "Rails 3 assocation validation for id fields"
-  p.url            = "http://github.com/TheEmpty"
+  p.url            = "http://rubygems.org/gems/association_validator"
   p.author         = "Mohammad El-Abid"
   p.email          = "mohammad {dot} elabid {at} gmail"
   p.ignore_pattern = []

data/association_validator.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{association_validator}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mohammad El-Abid"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-03-24}
   s.description = %q{Rails 3 assocation validation for id fields}
   s.email = %q{mohammad {dot} elabid {at} gmail}
   s.extra_rdoc_files = ["README.textile", "README.txt", "lib/association_validator.rb"]
   s.files = ["Manifest", "README.textile", "README.txt", "Rakefile", "association_validator.gemspec", "lib/association_validator.rb"]
-  s.homepage = %q{http://github.com/TheEmpty}
+  s.homepage = %q{http://rubygems.org/gems/association_validator}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Association_validator", "--main", "README.textile"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{association_validator}

data/lib/association_validator.rb

@@ -1,16 +1,25 @@
 class AssociationValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if record.send(attribute).blank? # return if value.blank? # use :presence => true if you want to confirm that something is there
+  def validate_each(record, attribute, record_id)
+    return if record.send(attribute).blank? # return if there is nothing to validate
+    # use :presence => true if you want to confirm that something is there
     
-	if options[:class_name].blank?
+    if not options[:polymorphic_class].blank?
+      attribute_string = record.send(options[:polymorphic_class])
+      return if attribute_string.blank?
+      
+    elsif options[:class_name].blank? # if class_name is not specified, assume that it's the attirbute without the last 3 characters which should be _id
       attribute_string = attribute.to_s
       attribute_string[-3,3] = ''
+      
     elsif options[:class_name].is_a?(String)
       attribute_string = options[:class_name]
-	elsif options[:class_name].is_a?(Proc)
-	  attribute_string = options[:class_name].yield(record)
-	else
-	  raise "Association Validator does not support a(n) #{options[:class_name].class.to_s.humanize} as a class_name option"
+      
+    elsif options[:class_name].is_a?(Proc)
+      attribute_string = options[:class_name].yield(record)
+      return if attribute_string.blank?
+      
+    else
+      raise "Association Validator does not support a(n) #{options[:class_name].class.to_s.humanize} as a class_name option"
     end
     
     c  = attribute_string.camelize.constantize # create a refrence to the class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: association_validator
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-23 00:00:00.000000000 -04:00
+date: 2011-03-24 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &30028020 !ruby/object:Gem::Requirement
+  requirement: &25441140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *30028020
+  version_requirements: *25441140
 description: Rails 3 assocation validation for id fields
 email: mohammad {dot} elabid {at} gmail
 executables: []
@@ -39,7 +39,7 @@ files:
 - association_validator.gemspec
 - lib/association_validator.rb
 has_rdoc: true
-homepage: http://github.com/TheEmpty
+homepage: http://rubygems.org/gems/association_validator
 licenses: []
 post_install_message: 
 rdoc_options: