From 531034196a25003b85cfd0da8d21c9b74e28a146 Mon Sep 17 00:00:00 2001 From: Max Barnash Date: Wed, 3 Apr 2013 04:39:42 +0700 Subject: [PATCH] Class name should be a string, not class --- README.md | 2 +- lib/client_side_validations/active_record/uniqueness.rb | 2 +- test/active_record/cases/test_uniqueness_validator.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1a35546d4..b4a6e9bc0 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ class UserForm include ActiveRecord::Validations attr_accessor :email validates_uniqueness_of :email, :client_validations => { :class => - User } + 'User' } end ... <% form_for(UserForm.new, :as => :user) do %> diff --git a/lib/client_side_validations/active_record/uniqueness.rb b/lib/client_side_validations/active_record/uniqueness.rb index 5bc708d21..00dfe5161 100644 --- a/lib/client_side_validations/active_record/uniqueness.rb +++ b/lib/client_side_validations/active_record/uniqueness.rb @@ -8,7 +8,7 @@ def client_side_hash(model, attribute, force = nil) hash[:allow_blank] = true if options[:allow_blank] if options.key?(:client_validations) && options[:client_validations].key?(:class) - hash[:class] = options[:client_validations][:class].name.underscore + hash[:class] = options[:client_validations][:class].underscore elsif model.class.name.demodulize != model.class.name hash[:class] = model.class.name.underscore end diff --git a/test/active_record/cases/test_uniqueness_validator.rb b/test/active_record/cases/test_uniqueness_validator.rb index 019664318..b07f949c5 100644 --- a/test/active_record/cases/test_uniqueness_validator.rb +++ b/test/active_record/cases/test_uniqueness_validator.rb @@ -55,7 +55,7 @@ def test_uniqueness_client_side_hash_when_nested_module def test_uniqueness_client_side_hash_with_class_from_options @user = UserForm.new expected_hash = { :message => "has already been taken", :case_sensitive => true, :class => 'user' } - assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name], :client_validations => { :class => User } ).client_side_hash(@user, :name) + assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name], :client_validations => { :class => 'User' } ).client_side_hash(@user, :name) end end