From 1def3f0073d94564ab46a02a6c567a6c091a4e96 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 13 Mar 2007 05:24:10 +0000 Subject: [PATCH] Deprecation: remove deprecated update_element_function, start_form_tag, and end_form_tag. Use RJS and form_tag instead. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6409 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 +- .../action_view/helpers/deprecated_helper.rb | 34 ------------------ .../action_view/helpers/form_tag_helper.rb | 8 ----- actionpack/test/controller/capture_test.rb | 17 ++------- .../test/template/deprecated_helper_test.rb | 36 ------------------- .../test/template/form_tag_helper_test.rb | 29 --------------- 6 files changed, 4 insertions(+), 122 deletions(-) delete mode 100644 actionpack/lib/action_view/helpers/deprecated_helper.rb delete mode 100644 actionpack/test/template/deprecated_helper_test.rb diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c02f4e345b..b9bfb8ccd6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,6 +1,6 @@ *SVN* -* Deprecation: remove deprecated request, redirect, and dependency methods. Remove deprecated instance variables. Remove uses_component_template_root for toplevel components directory. Privatize deprecated render_partial and render_partial_collection view methods. Remove deprecated link_to_image and link_image_to helper methods. Remove deprecated human_size helper alias. [Jeremy Kemper] +* Deprecation: remove deprecated request, redirect, and dependency methods. Remove deprecated instance variables. Remove uses_component_template_root for toplevel components directory. Privatize deprecated render_partial and render_partial_collection view methods. Remove deprecated link_to_image, link_image_to, update_element_function, start_form_tag, and end_form_tag helper methods. Remove deprecated human_size helper alias. [Jeremy Kemper] * Consistent public/protected/private visibility for chained methods. #7813 [Dan Manges] diff --git a/actionpack/lib/action_view/helpers/deprecated_helper.rb b/actionpack/lib/action_view/helpers/deprecated_helper.rb deleted file mode 100644 index 04392f5b04..0000000000 --- a/actionpack/lib/action_view/helpers/deprecated_helper.rb +++ /dev/null @@ -1,34 +0,0 @@ -module ActionView - module Helpers - module PrototypeHelper - - def update_element_function(element_id, options = {}, &block) - content = escape_javascript(options[:content] || '') - content = escape_javascript(capture(&block)) if block - - javascript_function = case (options[:action] || :update) - when :update - if options[:position] - "new Insertion.#{options[:position].to_s.camelize}('#{element_id}','#{content}')" - else - "$('#{element_id}').innerHTML = '#{content}'" - end - - when :empty - "$('#{element_id}').innerHTML = ''" - - when :remove - "Element.remove('#{element_id}')" - - else - raise ArgumentError, "Invalid action, choose one of :update, :remove, :empty" - end - - javascript_function << ";\n" - options[:binding] ? concat(javascript_function, options[:binding]) : javascript_function - end - deprecate :update_element_function => "use RJS instead" - - end - end -end \ No newline at end of file diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index fa610215a4..417b0fd4b7 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -39,14 +39,6 @@ module ActionView end end - alias_method :start_form_tag, :form_tag - - # Outputs "" - def end_form_tag - "" - end - - deprecate :end_form_tag, :start_form_tag => :form_tag # Creates a dropdown selection box, or if the :multiple option is set to true, a multiple # choice selection box. diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb index 300bdc3a84..42ec2568da 100644 --- a/actionpack/test/controller/capture_test.rb +++ b/actionpack/test/controller/capture_test.rb @@ -64,19 +64,8 @@ class CaptureTest < Test::Unit::TestCase assert_equal expected_content_for_output, @response.body end - def test_update_element_with_capture - assert_deprecated 'update_element_function' do - get :update_element_with_capture - end - assert_equal( - "" + - "\n\n$('status').innerHTML = '\\n You bought something!\\n';", - @response.body.strip - ) - end - private - def expected_content_for_output - "Putting stuff in the title!\n\nGreat stuff!" - end + def expected_content_for_output + "Putting stuff in the title!\n\nGreat stuff!" + end end diff --git a/actionpack/test/template/deprecated_helper_test.rb b/actionpack/test/template/deprecated_helper_test.rb deleted file mode 100644 index 1d4f7624f7..0000000000 --- a/actionpack/test/template/deprecated_helper_test.rb +++ /dev/null @@ -1,36 +0,0 @@ -require "#{File.dirname(__FILE__)}/../abstract_unit" - -class DeprecatedHelperTest < Test::Unit::TestCase - include ActionView::Helpers::JavaScriptHelper - include ActionView::Helpers::CaptureHelper - - def test_update_element_function - assert_deprecated 'update_element_function' do - - assert_equal %($('myelement').innerHTML = 'blub';\n), - update_element_function('myelement', :content => 'blub') - assert_equal %($('myelement').innerHTML = 'blub';\n), - update_element_function('myelement', :action => :update, :content => 'blub') - assert_equal %($('myelement').innerHTML = '';\n), - update_element_function('myelement', :action => :empty) - assert_equal %(Element.remove('myelement');\n), - update_element_function('myelement', :action => :remove) - - assert_equal %(new Insertion.Bottom('myelement','blub');\n), - update_element_function('myelement', :position => 'bottom', :content => 'blub') - assert_equal %(new Insertion.Bottom('myelement','blub');\n), - update_element_function('myelement', :action => :update, :position => :bottom, :content => 'blub') - - _erbout = "" - assert_equal %($('myelement').innerHTML = 'test';\n), - update_element_function('myelement') { _erbout << "test" } - - _erbout = "" - assert_equal %($('myelement').innerHTML = 'blockstuff';\n), - update_element_function('myelement', :content => 'paramstuff') { _erbout << "blockstuff" } - - end - end - -end - diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb index b7db62993a..7750f41bd1 100644 --- a/actionpack/test/template/form_tag_helper_test.rb +++ b/actionpack/test/template/form_tag_helper_test.rb @@ -147,32 +147,3 @@ class FormTagHelperTest < Test::Unit::TestCase assert_equal 1, 1 end end - -class DeprecatedFormTagHelperTest < Test::Unit::TestCase - include ActionView::Helpers::UrlHelper - include ActionView::Helpers::TagHelper - include ActionView::Helpers::FormTagHelper - include ActionView::Helpers::TextHelper - include ActionView::Helpers::CaptureHelper - - def setup - @controller = Class.new do - def url_for(options, *parameters_for_method_reference) - "http://www.example.com" - end - end - @controller = @controller.new - end - - def test_start_form_tag_deprecation - assert_deprecated /start_form_tag/ do - start_form_tag - end - end - - def test_end_form_tag_deprecation - assert_deprecated /end_form_tag/ do - end_form_tag - end - end -end