validates_existence 0.6.2 → 0.7.0

data/lib/rails3.rb

@@ -20,27 +20,34 @@ module Perfectline
           normalized = attribute.to_s.sub(/_id$/, "").to_sym
           association = record.class.reflect_on_association(normalized)
 
-          if association.nil? or !association.belongs_to?
+          if association.nil? || !association.belongs_to?
             raise ArgumentError, "Cannot validate existence on #{normalized}, not a :belongs_to association"
           end
 
           target_class = nil
 
           # dealing with polymorphic belongs_to
-          if association.options.has_key?(:foreign_type)
-            foreign_type = record.send(association.options.fetch(:foreign_type))
+          if association.options[:polymorphic]
+            foreign_type = record.send(association.options[:foreign_type] || association.foreign_type)
             target_class = foreign_type.constantize unless foreign_type.nil?
           else
             target_class = association.klass
           end
 
-          if value.nil? or target_class.nil? or !target_class.exists?(value)
+          if value.nil? || target_class.nil? || !target_class.exists?(value)
             errors = [attribute]
 
             # add the error on both :relation and :relation_id
             if options[:both]
-              errors.push(attribute.to_s.ends_with?("_id") ? normalized : association.primary_key_name)
+              if Rails::VERSION::MINOR >= 1
+                foreign_key = association.foreign_key
+              else
+                foreign_key = association.primary_key_name
+              end
+
+              errors << (attribute.to_s.ends_with?("_id") ? normalized : foreign_key)
             end
+
             errors.each do |error|
               record.errors.add(error, options[:message], :message => "does not exist")
             end

metadata

@@ -2,7 +2,7 @@
 name: validates_existence
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tanel Suurhans
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 Z
+date: 2011-06-15 00:00:00 Z
 dependencies: []
 
 description: A library for validating model association existence.