From 6ec09f9307c4fdc0c2cbed40230dd1e0909e57cb Mon Sep 17 00:00:00 2001 From: August Lilleaas Date: Fri, 1 May 2009 22:24:38 +0200 Subject: [PATCH] Renaming LiveValidations::Adapter to LiveValidations::AdapterBase. It just makes more sense that way. --- .../{adapter.rb => adapter_base.rb} | 2 +- .../validation_hook.rb | 2 +- .../validation_response.rb | 2 +- .../adapters/jquery_validations.rb | 2 +- .../adapters/livevalidation_dot_com.rb | 2 +- lib/live_validations/adapters/validatious.rb | 2 +- test/general_adapter_test.rb | 24 +++++++++---------- 7 files changed, 18 insertions(+), 18 deletions(-) rename lib/live_validations/{adapter.rb => adapter_base.rb} (99%) rename lib/live_validations/{adapter => adapter_base}/validation_hook.rb (98%) rename lib/live_validations/{adapter => adapter_base}/validation_response.rb (92%) diff --git a/lib/live_validations/adapter.rb b/lib/live_validations/adapter_base.rb similarity index 99% rename from lib/live_validations/adapter.rb rename to lib/live_validations/adapter_base.rb index 0981b93..e5243cb 100644 --- a/lib/live_validations/adapter.rb +++ b/lib/live_validations/adapter_base.rb @@ -1,6 +1,6 @@ module LiveValidations # The base class of an adapter. - class Adapter + class AdapterBase attr_reader :data, :active_record_instance, :rendered_attributes def initialize(active_record_instance) diff --git a/lib/live_validations/adapter/validation_hook.rb b/lib/live_validations/adapter_base/validation_hook.rb similarity index 98% rename from lib/live_validations/adapter/validation_hook.rb rename to lib/live_validations/adapter_base/validation_hook.rb index dc3e755..9741d85 100644 --- a/lib/live_validations/adapter/validation_hook.rb +++ b/lib/live_validations/adapter_base/validation_hook.rb @@ -1,5 +1,5 @@ module LiveValidations - class Adapter + class AdapterBase # The internal representation of each of the 'validates' blocks in the adapter implementation. class ValidationHook attr_reader :data, :callback, :prefix, :adapter_instance diff --git a/lib/live_validations/adapter/validation_response.rb b/lib/live_validations/adapter_base/validation_response.rb similarity index 92% rename from lib/live_validations/adapter/validation_response.rb rename to lib/live_validations/adapter_base/validation_response.rb index 4ae7cd5..f1c06e6 100644 --- a/lib/live_validations/adapter/validation_response.rb +++ b/lib/live_validations/adapter_base/validation_response.rb @@ -1,5 +1,5 @@ module LiveValidations - class Adapter + class AdapterBase class ValidationResponse attr_reader :params def initialize(&block) diff --git a/lib/live_validations/adapters/jquery_validations.rb b/lib/live_validations/adapters/jquery_validations.rb index 1d9f2ec..3cff9c8 100644 --- a/lib/live_validations/adapters/jquery_validations.rb +++ b/lib/live_validations/adapters/jquery_validations.rb @@ -1,7 +1,7 @@ module LiveValidations module Adapters # Adapter for http://bassistance.de/jquery-plugins/jquery-plugin-validation/ - class JqueryValidations < LiveValidations::Adapter + class JqueryValidations < LiveValidations::AdapterBase setup do |v| v[:validators] = Hash.new {|hash, key| hash[key] = {} } v[:messages] = Hash.new {|hash, key| hash[key] = {} } diff --git a/lib/live_validations/adapters/livevalidation_dot_com.rb b/lib/live_validations/adapters/livevalidation_dot_com.rb index 7cb91a8..08407be 100644 --- a/lib/live_validations/adapters/livevalidation_dot_com.rb +++ b/lib/live_validations/adapters/livevalidation_dot_com.rb @@ -1,7 +1,7 @@ module LiveValidations module Adapters # Adapter for http://www.livevalidation.com/ (d'oh) - class LivevalidationDotCom < LiveValidations::Adapter + class LivevalidationDotCom < LiveValidations::AdapterBase setup do |v| v[:validators] = Hash.new {|hash, key| hash[key] = {} } end diff --git a/lib/live_validations/adapters/validatious.rb b/lib/live_validations/adapters/validatious.rb index d2ff081..9bed6e8 100644 --- a/lib/live_validations/adapters/validatious.rb +++ b/lib/live_validations/adapters/validatious.rb @@ -1,7 +1,7 @@ module LiveValidations module Adapters # Adapter for http://www.validatious.org/ - class Validatious < LiveValidations::Adapter + class Validatious < LiveValidations::AdapterBase def alters_tag_attributes? true end diff --git a/test/general_adapter_test.rb b/test/general_adapter_test.rb index 4188000..95b9984 100644 --- a/test/general_adapter_test.rb +++ b/test/general_adapter_test.rb @@ -5,7 +5,7 @@ def setup reset_database reset_callbacks Post @post = Post.new - @hook = LiveValidations::Adapter::ValidationHook.new + @hook = LiveValidations::AdapterBase::ValidationHook.new end def teardown @@ -32,29 +32,29 @@ def test_message_for_without_custom_message end def test_utilizes_inline_javascript_with_data_and_proc - LiveValidations::Adapter.expects(:setup_proc).returns(Proc.new {}) - LiveValidations::Adapter.expects(:inline_javascript_proc).returns(Proc.new {}) + LiveValidations::AdapterBase.expects(:setup_proc).returns(Proc.new {}) + LiveValidations::AdapterBase.expects(:inline_javascript_proc).returns(Proc.new {}) - adapter = LiveValidations::Adapter.new(@post) + adapter = LiveValidations::AdapterBase.new(@post) adapter.expects(:data).returns({:not => "blank"}) assert adapter.utilizes_inline_javascript? end def test_utilizes_inline_javascript_with_blank_data_and_proc - LiveValidations::Adapter.expects(:setup_proc).returns(Proc.new {}) - LiveValidations::Adapter.expects(:inline_javascript_proc).returns(Proc.new {}) + LiveValidations::AdapterBase.expects(:setup_proc).returns(Proc.new {}) + LiveValidations::AdapterBase.expects(:inline_javascript_proc).returns(Proc.new {}) - adapter = LiveValidations::Adapter.new(@post) + adapter = LiveValidations::AdapterBase.new(@post) adapter.expects(:data).returns({}) assert !adapter.utilizes_inline_javascript? end def test_utilizes_inline_javascript_without_json_proc - LiveValidations::Adapter.expects(:setup_proc).returns(Proc.new {}) - LiveValidations::Adapter.expects(:inline_javascript_proc).returns(nil) + LiveValidations::AdapterBase.expects(:setup_proc).returns(Proc.new {}) + LiveValidations::AdapterBase.expects(:inline_javascript_proc).returns(nil) # No point in mocking .json or .data, because it'll never get called anyway. - adapter = LiveValidations::Adapter.new(@post) + adapter = LiveValidations::AdapterBase.new(@post) assert !adapter.utilizes_inline_javascript? end @@ -97,8 +97,8 @@ def test_specifying_invalid_adapter_as_symbol def test_with_validation_that_has_no_attribute Post.validate {|r| } - LiveValidations::Adapter.expects(:setup_proc).returns(Proc.new {}) - adapter = LiveValidations::Adapter.new(@post) + LiveValidations::AdapterBase.expects(:setup_proc).returns(Proc.new {}) + adapter = LiveValidations::AdapterBase.new(@post) # This test should probably be improved. The plugin used to raise an error when # the model had attribute-less validations, which is what this tests tries to