validates_existence 0.5.3 → 0.5.4

data/lib/rails2.rb

@@ -0,0 +1,41 @@
+module Perfectline
+  module ValidatesExistence
+
+    module Rails2
+      def validates_existence_of(*attribute_names)
+        options = attribute_names.extract_options!.symbolize_keys
+        options[:message] ||= :existence
+        options[:both]    = true unless options.has_key?(:both)
+
+        validates_each(attribute_names, options) do |record, attribute, value|
+          normalized  = attribute.to_s.sub(/_id$/, "").to_sym
+          association = record.class.reflect_on_association(normalized)
+
+          if association.nil? or !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))
+            target_class = foreign_type.constantize unless foreign_type.nil?
+          else
+            target_class = association.klass
+          end
+
+          if target_class.nil? or !target_class.exists?(value)
+            record.errors.add(attribute, options[:message], :default => "does not exist")
+
+            # add the error on both :relation and :relation_id
+            if options[:both]
+              normalized = attribute.to_s.ends_with?("_id") ? normalized : "#{attribute}_id"
+              record.errors.add(normalized, options[:message], :default => "does not exist")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails3.rb

@@ -0,0 +1,57 @@
+require 'active_support/concern'
+require 'active_model'
+
+module Perfectline
+  module ValidatesExistence
+
+    module Rails3
+      extend ActiveSupport::Concern
+
+      class ExistenceValidator < ActiveModel::EachValidator
+
+        def initialize(options)
+          # set the default message if its unspecified
+          options[:message] ||= :existence
+          options[:both]    = true unless options.has_key?(:both)
+          super(options)
+        end
+
+        def validate_each(record, attribute, value)
+          normalized = attribute.to_s.sub(/_id$/, "").to_sym
+          association = record.class.reflect_on_association(normalized)
+
+          if association.nil? or !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))
+            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)
+            record.errors.add(attribute, options[:message], :message => "does not exist")
+
+            # add the error on both :relation and :relation_id
+            if options[:both]
+              normalized = attribute.to_s.ends_with?("_id") ? normalized : "#{attribute}_id"
+              record.errors.add(normalized, options[:message], :message => "does not exist")
+            end
+          end
+        end
+      end
+
+      module ClassMethods
+        def validates_existence_of(*attr_names)
+          validates_with ExistenceValidator, _merge_attributes(attr_names)
+        end
+      end
+
+    end
+  end
+end

data/lib/validates_existence.rb

@@ -1,97 +1,7 @@
-module Perfectline
-  module ValidatesExistence
-
-    module Rails2
-      def validates_existence_of(*attribute_names)
-        options = attribute_names.extract_options!.symbolize_keys
-        options[:message] ||= :existence
-        options[:both]    = true unless options.has_key?(:both)
-
-        validates_each(attribute_names, options) do |record, attribute, value|
-          normalized  = attribute.to_s.sub(/_id$/, "").to_sym
-          association = record.class.reflect_on_association(normalized)
-
-          if association.nil? or !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))
-            target_class = foreign_type.constantize unless foreign_type.nil?
-          else
-            target_class = association.klass
-          end
-
-          if target_class.nil? or !target_class.exists?(value)
-            record.errors.add(attribute, options[:message], :default => "does not exist")
-
-            # add the error on both :relation and :relation_id
-            if options[:both]
-              normalized = attribute.to_s.ends_with?("_id") ? normalized : "#{attribute}_id"
-              record.errors.add(normalized, options[:message], :default => "does not exist")
-            end
-          end
-        end
-      end
-    end
-
-    module Rails3
-      extend ActiveSupport::Concern
-
-      class ExistenceValidator < ActiveModel::EachValidator
-
-        def initialize(options)
-          # set the default message if its unspecified
-          options[:message] ||= :existence
-          options[:both]    ||= true
-          super(options)
-        end
-
-        def validate_each(record, attribute, value)
-          normalized = attribute.to_s.sub(/_id$/, "").to_sym
-          association = record.class.reflect_on_association(normalized)
-
-          if association.nil? or !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))
-            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)
-            record.errors.add(attribute, options[:message], :default => "does not exist")
-
-            # add the error on both :relation and :relation_id
-            if options[:both]
-              normalized = attribute.to_s.ends_with?("_id") ? normalized : "#{attribute}_id"
-              record.errors.add(normalized, options[:message], :default => "does not exist")
-            end
-          end
-        end
-      end
-
-      module ClassMethods
-        def validates_existence_of(*attr_names)
-          validates_with ExistenceValidator, _merge_attributes(attr_names)
-        end
-      end
-
-    end
-  end
-end
-
 if Rails::VERSION::MAJOR >= 3
+  require 'rails3'
   ActiveRecord::Base.send(:include, Perfectline::ValidatesExistence::Rails3)
 else
+  require 'rails2'
   ActiveRecord::Base.send(:extend,  Perfectline::ValidatesExistence::Rails2)
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Tanel Suurhans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 +03:00
+date: 2010-10-02 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -32,17 +32,19 @@ extra_rdoc_files:
 files: 
 - README.markdown
 - install.rb
+- lib/rails2.rb
+- lib/rails3.rb
 - lib/validates_existence.rb
 - rails/init.rb
-- test/models/user_with_poly.rb
 - test/models/name.rb
+- test/models/user.rb
 - test/models/user_with_allow_nil.rb
+- test/models/user_with_both.rb
 - test/models/user_with_has_many.rb
+- test/models/user_with_poly.rb
 - test/models/user_with_poly_allow_nil.rb
-- test/models/user_with_both.rb
-- test/models/user.rb
-- test/validates_existence_test.rb
 - test/test_helper.rb
+- test/validates_existence_test.rb
 has_rdoc: true
 homepage: http://github.com/perfectline/validates_existence/tree/master
 licenses: []
@@ -76,12 +78,12 @@ signing_key:
 specification_version: 3
 summary: Validates Rails model belongs_to association existence.
 test_files: 
-- test/models/user_with_poly.rb
 - test/models/name.rb
+- test/models/user.rb
 - test/models/user_with_allow_nil.rb
+- test/models/user_with_both.rb
 - test/models/user_with_has_many.rb
+- test/models/user_with_poly.rb
 - test/models/user_with_poly_allow_nil.rb
-- test/models/user_with_both.rb
-- test/models/user.rb
-- test/validates_existence_test.rb
 - test/test_helper.rb
+- test/validates_existence_test.rb