validates_existence 0.5.5 → 0.6.0

data/lib/rails2.rb

@@ -5,7 +5,7 @@ module Perfectline
       def validates_existence_of(*attribute_names)
         options = attribute_names.extract_options!.symbolize_keys
         options[:message] ||= :existence
-        options[:both]    = true unless options.has_key?(:both)
+        options[:both]    = true unless options.key?(:both)
 
         validates_each(attribute_names, options) do |record, attribute, value|
           normalized  = attribute.to_s.sub(/_id$/, "").to_sym
@@ -30,11 +30,11 @@ module Perfectline
 
             # add the error on both :relation and :relation_id
             if options[:both]
-              normalized = attribute.to_s.ends_with?("_id") ? normalized : "#{attribute}_id"
-              errors.push(normalized) unless errors.include? attribute
+              errors.push(attribute.to_s.ends_with?("_id") ? normalized : association.primary_key_name)
             end
-            errors.each do | error |
-              record.errors.add(normalized, options[:message], :default => "does not exist")
+
+            errors.each do |error|
+              record.errors.add(error, options[:message], :default => "does not exist")
             end
           end
         end

data/lib/rails3.rb

@@ -12,7 +12,7 @@ module Perfectline
         def initialize(options)
           # set the default message if its unspecified
           options[:message] ||= :existence
-          options[:both]    = true unless options.has_key?(:both)
+          options[:both]    = true unless options.key?(:both)
           super(options)
         end
 
@@ -35,15 +35,14 @@ module Perfectline
           end
 
           if value.nil? or target_class.nil? or !target_class.exists?(value)
-             errors = [attribute]
+            errors = [attribute]
 
             # add the error on both :relation and :relation_id
             if options[:both]
-              normalized = attribute.to_s.ends_with?("_id") ? normalized : "#{attribute}_id"
-              errors.push(normalized) unless errors.include? attribute
+              errors.push(attribute.to_s.ends_with?("_id") ? normalized : association.primary_key_name)
             end
-            errors.each do | error |
-              record.errors.add(normalized, options[:message], :default => "does not exist")
+            errors.each do |error|
+              record.errors.add(error, options[:message], :message => "does not exist")
             end
           end
         end

data/test/{models → rails2/models}/user.rb

@@ -2,6 +2,6 @@ class User < ActiveRecord::Base
 
   belongs_to :name
 
-  validates_existence_of :name, :both => false
+  validates_existence_of :name
 
 end

data/test/rails2/models/user_with_fk.rb

@@ -0,0 +1,9 @@
+class UserWithFk < ActiveRecord::Base
+
+  self.table_name = "users2"
+
+  belongs_to :name, :foreign_key => :custom_id
+
+  validates_existence_of :name
+
+end

data/test/{test_helper.rb → rails2/test_helper.rb}

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'activerecord', '~> 2'
+gem 'rails', '2.3.8'
 
 require 'sqlite3'
 require 'test/unit'
@@ -13,7 +13,9 @@ ActiveRecord::Base.establish_connection(
         "database" => ":memory:"
 )
 
-require File.join(File.dirname(__FILE__), '..', 'rails', 'init.rb')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'rails2.rb')
+
+ActiveRecord::Base.send(:extend,  Perfectline::ValidatesExistence::Rails2)
 
 autoload :Name,                 File.join(File.dirname(__FILE__), 'models', 'name.rb')
 autoload :User,                 File.join(File.dirname(__FILE__), 'models', 'user.rb')
@@ -21,4 +23,5 @@ autoload :UserWithAllowNil,     File.join(File.dirname(__FILE__), 'models', 'use
 autoload :UserWithPoly,         File.join(File.dirname(__FILE__), 'models', 'user_with_poly.rb')
 autoload :UserWithPolyAllowNil, File.join(File.dirname(__FILE__), 'models', 'user_with_poly_allow_nil.rb')
 autoload :UserWithHasMany,      File.join(File.dirname(__FILE__), 'models', 'user_with_has_many.rb')
-autoload :UserWithBoth,         File.join(File.dirname(__FILE__), 'models', 'user_with_both.rb')
+autoload :UserWithBoth,         File.join(File.dirname(__FILE__), 'models', 'user_with_both.rb')
+autoload :UserWithFk,           File.join(File.dirname(__FILE__), 'models', 'user_with_fk.rb')

data/test/{validates_existence_test.rb → rails2/validates_existence_test.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper.rb')
+require 'test_helper.rb'
 
 class TestValidatesExistence < Test::Unit::TestCase
 
@@ -14,6 +14,10 @@ class TestValidatesExistence < Test::Unit::TestCase
         t.references :relation, :polymorphic => true
       end
 
+      create_table :users2, :force => true do |t|
+        t.column :custom_id, :integer
+      end
+
     end
   end
 
@@ -26,7 +30,7 @@ class TestValidatesExistence < Test::Unit::TestCase
     user = User.new
     assert_equal    user.save, false
     assert_not_nil  user.errors.on(:name)
-    assert_not_nil  user.errors.on(:name)
+    assert_not_nil  user.errors.on(:name_id)
   end
 
   def test_save_with_relation
@@ -64,10 +68,29 @@ class TestValidatesExistence < Test::Unit::TestCase
   def test_errors_on_one_field
     user = UserWithBoth.new
     user.save
+
     assert_not_nil  user.errors.on(:name)
     assert_nil      user.errors.on(:name_id)
   end
 
+  def test_save_with_new_record
+    name = Name.create(:name => "foobar")
+    user = User.create(:name => name)
+
+    user.name = Name.new
+    user.save
+
+    assert_not_nil user.errors.on(:name)
+  end
+
+  def test_save_with_custom_fk
+    user = UserWithFk.new
+    user.save
+
+    assert_not_nil user.errors.on(:name)
+    assert_not_nil user.errors.on(:custom_id)
+  end
+
 end
 
 

data/test/rails3/models/name.rb

@@ -0,0 +1,3 @@
+class Name < ActiveRecord::Base
+
+end

data/test/rails3/models/user.rb

@@ -0,0 +1,7 @@
+class User < ActiveRecord::Base
+
+  belongs_to :name
+
+  validates :name, :existence => true
+
+end

data/test/rails3/models/user_with_allow_nil.rb

@@ -0,0 +1,9 @@
+class UserWithAllowNil < ActiveRecord::Base
+
+  self.table_name = "users"
+
+  belongs_to :name
+
+  validates :name, :existence => true, :allow_nil => true
+
+end

data/test/rails3/models/user_with_both.rb

@@ -0,0 +1,7 @@
+class UserWithBoth < ActiveRecord::Base
+  self.table_name = "users"
+
+  belongs_to :name
+
+  validates :name, :existence => {:both => false}
+end

data/test/rails3/models/user_with_fk.rb

@@ -0,0 +1,9 @@
+class UserWithFk < ActiveRecord::Base
+
+  self.table_name = "users2"
+
+  belongs_to :name, :foreign_key => :custom_id
+
+  validates :name, :existence => true
+
+end

data/test/rails3/models/user_with_has_many.rb

@@ -0,0 +1,7 @@
+class UserWithHasMany < ActiveRecord::Base
+  self.table_name = "users"
+
+  has_many :names
+
+  validates :names, :existence => true
+end

data/test/rails3/models/user_with_poly.rb

@@ -0,0 +1,9 @@
+class UserWithPoly < ActiveRecord::Base
+
+  self.table_name = "users"
+
+  belongs_to :relation, :polymorphic => true
+
+  validates :relation, :existence => true
+
+end

data/test/rails3/models/user_with_poly_allow_nil.rb

@@ -0,0 +1,9 @@
+class UserWithPolyAllowNil < ActiveRecord::Base
+
+  self.table_name = "users"
+
+  belongs_to :relation, :polymorphic => true
+
+  validates :relation, :existence => true, :allow_nil => true
+
+end

data/test/rails3/test_helper.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+
+gem 'rails', '3.0.5'
+
+require 'sqlite3'
+require 'test/unit'
+require 'active_record'
+require 'active_record/base'
+
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.establish_connection(
+        "adapter" =>  "sqlite3",
+        "database" => ":memory:"
+)
+
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'rails3.rb')
+
+ActiveRecord::Base.send(:include,  Perfectline::ValidatesExistence::Rails3)
+
+autoload :Name,                 File.join(File.dirname(__FILE__), 'models', 'name.rb')
+autoload :User,                 File.join(File.dirname(__FILE__), 'models', 'user.rb')
+autoload :UserWithAllowNil,     File.join(File.dirname(__FILE__), 'models', 'user_with_allow_nil.rb')
+autoload :UserWithPoly,         File.join(File.dirname(__FILE__), 'models', 'user_with_poly.rb')
+autoload :UserWithPolyAllowNil, File.join(File.dirname(__FILE__), 'models', 'user_with_poly_allow_nil.rb')
+autoload :UserWithHasMany,      File.join(File.dirname(__FILE__), 'models', 'user_with_has_many.rb')
+autoload :UserWithBoth,         File.join(File.dirname(__FILE__), 'models', 'user_with_both.rb')
+autoload :UserWithFk,           File.join(File.dirname(__FILE__), 'models', 'user_with_fk.rb')

data/test/rails3/validates_existence_test.rb

@@ -0,0 +1,96 @@
+require 'test_helper.rb'
+
+class TestValidatesExistence < Test::Unit::TestCase
+
+  def setup
+    ActiveRecord::Schema.define(:version => 1) do
+
+      create_table :names, :force => true do |t|
+        t.column :name, :string
+      end
+
+      create_table :users, :force => true do |t|
+        t.references :name
+        t.references :relation, :polymorphic => true
+      end
+
+      create_table :users2, :force => true do |t|
+        t.column :custom_id, :integer
+      end
+
+    end
+  end
+
+  def teardown
+    ActiveRecord::Base.connection.drop_table(:users)
+    ActiveRecord::Base.connection.drop_table(:names)
+  end
+
+  def test_save_with_no_relation
+    user = User.new
+    assert_equal    user.save, false
+    assert_not_nil  user.errors[:name]
+    assert_not_nil  user.errors[:name_id]
+  end
+
+  def test_save_with_relation
+    name = Name.create(:name => "foo")
+    assert_equal User.new(:name => name).save, true
+  end
+
+  def test_save_with_bogus_id
+    assert_equal User.new(:name_id => 100).save, false
+  end
+
+  def test_allow_nil
+    assert_equal UserWithAllowNil.new.save, true
+  end
+
+  def test_poly_relation
+    assert_equal UserWithPoly.new.save, false
+  end
+
+  def test_poly_relation_with_name
+    name = Name.create(:name => "bar")
+    assert_equal UserWithPoly.new(:relation => name).save, true
+  end
+
+  def test_poly_relation_with_allow_nil
+    assert_equal UserWithPolyAllowNil.new.save, true
+  end
+
+  def test_argument_error
+    assert_raise ArgumentError do
+      UserWithHasMany.new.save
+    end
+  end
+
+  def test_errors_on_one_field
+    user = UserWithBoth.new
+    user.save
+
+    assert_not_nil  user.errors[:name]
+    assert_empty    user.errors[:name_id]
+  end
+
+  def test_save_with_new_record
+    name = Name.create(:name => "foobar")
+    user = User.create(:name => name)
+
+    user.name = Name.new
+    user.save
+
+    assert_not_nil user.errors[:name]
+  end
+
+  def test_save_with_custom_fk
+    user = UserWithFk.new
+    user.save
+
+    assert_not_nil user.errors[:name]
+    assert_not_nil user.errors[:custom_id]
+  end
+
+end
+
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Tanel Suurhans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +02:00
+date: 2011-03-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -36,22 +36,33 @@ files:
 - lib/rails3.rb
 - lib/validates_existence.rb
 - rails/init.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/test_helper.rb
-- test/validates_existence_test.rb
+- test/rails2/models/name.rb
+- test/rails2/models/user.rb
+- test/rails2/models/user_with_allow_nil.rb
+- test/rails2/models/user_with_both.rb
+- test/rails2/models/user_with_fk.rb
+- test/rails2/models/user_with_has_many.rb
+- test/rails2/models/user_with_poly.rb
+- test/rails2/models/user_with_poly_allow_nil.rb
+- test/rails2/test_helper.rb
+- test/rails2/validates_existence_test.rb
+- test/rails3/models/name.rb
+- test/rails3/models/user.rb
+- test/rails3/models/user_with_allow_nil.rb
+- test/rails3/models/user_with_both.rb
+- test/rails3/models/user_with_fk.rb
+- test/rails3/models/user_with_has_many.rb
+- test/rails3/models/user_with_poly.rb
+- test/rails3/models/user_with_poly_allow_nil.rb
+- test/rails3/test_helper.rb
+- test/rails3/validates_existence_test.rb
 has_rdoc: true
 homepage: http://github.com/perfectline/validates_existence/tree/master
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -78,12 +89,23 @@ signing_key:
 specification_version: 3
 summary: Validates Rails model belongs_to association existence.
 test_files: 
-- 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/test_helper.rb
-- test/validates_existence_test.rb
+- test/rails2/models/name.rb
+- test/rails2/models/user.rb
+- test/rails2/models/user_with_allow_nil.rb
+- test/rails2/models/user_with_both.rb
+- test/rails2/models/user_with_fk.rb
+- test/rails2/models/user_with_has_many.rb
+- test/rails2/models/user_with_poly.rb
+- test/rails2/models/user_with_poly_allow_nil.rb
+- test/rails2/test_helper.rb
+- test/rails2/validates_existence_test.rb
+- test/rails3/models/name.rb
+- test/rails3/models/user.rb
+- test/rails3/models/user_with_allow_nil.rb
+- test/rails3/models/user_with_both.rb
+- test/rails3/models/user_with_fk.rb
+- test/rails3/models/user_with_has_many.rb
+- test/rails3/models/user_with_poly.rb
+- test/rails3/models/user_with_poly_allow_nil.rb
+- test/rails3/test_helper.rb
+- test/rails3/validates_existence_test.rb