removed deprecated methods, and related tests, from ActionPack

17 files changed, 6 insertions, 213 deletions

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index ccb866f4f7..f3e94df4b9 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -2,7 +2,6 @@ require 'tempfile'
 require 'stringio'
 require 'strscan'
 
-require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/access'
 require 'active_support/inflector'
@@ -26,7 +25,7 @@ module ActionDispatch
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
         HTTP_NEGOTIATE HTTP_PRAGMA ].freeze
-      
+
     ENV_METHODS.each do |env|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{env.sub(/^HTTP_/n, '').downcase}
@@ -134,11 +133,6 @@ module ActionDispatch
       @fullpath ||= super
     end
 
-    def forgery_whitelisted?
-      get?
-    end
-    deprecate :forgery_whitelisted? => "it is just an alias for 'get?' now, update your code"
-
     def media_type
       content_mime_type.to_s
     end
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 76d0857b93..f1e85559a3 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -116,32 +116,9 @@ module ActionDispatch # :nodoc:
 
     EMPTY = " "
 
-    class BodyBuster #:nodoc:
-      def initialize(response)
-        @response = response
-        @body = ""
-      end
-
-      def bust(body)
-        body.call(@response, self)
-        body.close if body.respond_to?(:close)
-        @body
-      end
-
-      def write(string)
-        @body << string.to_s
-      end
-    end
-
     def body=(body)
       @blank = true if body == EMPTY
 
-      if body.respond_to?(:call)
-        ActiveSupport::Deprecation.warn "Setting a Proc or an object that responds to call " \
-          "in response_body is no longer supported", caller
-        body = BodyBuster.new(self).bust(body)
-      end
-
       # Explicitly check for strings. This is *wrong* theoretically
       # but if we don't check this, the performance on string bodies
       # is bad on Ruby 1.8 (because strings responds to each then).
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 1bb2ad7f67..8c0f4052ec 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -19,8 +19,7 @@ module ActionDispatch
       set_callback(:call, :after, *args, &block)
     end
 
-    def initialize(app, unused = nil)
-      ActiveSupport::Deprecation.warn "Passing a second argument to ActionDispatch::Callbacks.new is deprecated." unless unused.nil?
+    def initialize(app)
       @app = app
     end
 
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 8ad1ad1f2f..a70d814749 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -73,13 +73,7 @@ module ActionDispatch
       include StaleSessionCheck
 
       def destroy_session(env, sid, options)
-        ActiveSupport::Deprecation.warn "Implementing #destroy in session stores is deprecated. " <<
-          "Please implement destroy_session(env, session_id, options) instead."
-        destroy(env)
-      end
-
-      def destroy(env)
-        raise '#destroy needs to be implemented.'
+        raise '#destroy_session needs to be implemented.'
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/routing/route.rb b/actionpack/lib/action_dispatch/routing/route.rb
index a049510182..10b3d38346 100644
--- a/actionpack/lib/action_dispatch/routing/route.rb
+++ b/actionpack/lib/action_dispatch/routing/route.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/module/deprecation'
-
 module ActionDispatch
   module Routing
     class Route #:nodoc:
@@ -47,11 +45,6 @@ module ActionDispatch
         @segment_keys ||= conditions[:path_info].names.compact.map { |key| key.to_sym }
       end
 
-      def to_a
-        [@app, @conditions, @defaults, @name]
-      end
-      deprecate :to_a
-
       def to_s
         @to_s ||= begin
           "%-6s %-40s %s" % [(verb || :any).to_s.upcase, path, requirements.inspect]
diff --git a/actionpack/lib/action_view/template/handler.rb b/actionpack/lib/action_view/template/handler.rb
deleted file mode 100644
index 636f3ebbad..0000000000
--- a/actionpack/lib/action_view/template/handler.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute'
-
-# Legacy TemplateHandler stub
-module ActionView
-  class Template
-    module Handlers #:nodoc:
-      module Compilable
-        def self.included(base)
-          ActiveSupport::Deprecation.warn "Including Compilable in your template handler is deprecated. " <<
-            "Since Rails 3, all the API your template handler needs to implement is to respond to #call."
-          base.extend(ClassMethods)
-        end
-
-        module ClassMethods
-          def call(template)
-            new.compile(template)
-          end
-        end
-
-        def compile(template)
-          raise "Need to implement #{self.class.name}#compile(template)"
-        end
-      end
-    end
-
-    class Template::Handler
-      class_attribute :default_format
-      self.default_format = Mime::HTML
-
-      def self.inherited(base)
-        ActiveSupport::Deprecation.warn "Inheriting from ActionView::Template::Handler is deprecated. " <<
-          "Since Rails 3, all the API your template handler needs to implement is to respond to #call."
-        super
-      end
-
-      def self.call(template)
-        raise "Need to implement #{self.class.name}#call(template)"
-      end
-
-      def render(template, local_assigns)
-        raise "Need to implement #{self.class.name}#render(template, local_assigns)"
-      end
-    end
-  end
-
-  TemplateHandlers = Template::Handlers
-  TemplateHandler = Template::Handler
-end
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index 959afa734e..aa693335e3 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -41,12 +41,6 @@ module ActionView #:nodoc:
         @@default_template_handlers = klass
       end
 
-      def handler_class_for_extension(extension)
-        ActiveSupport::Deprecation.warn "handler_class_for_extension is deprecated. " <<
-          "Please use handler_for_extension instead", caller
-        handler_for_extension(extension)
-      end
-
       def handler_for_extension(extension)
         registered_template_handler(extension) || @@default_template_handlers
       end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index a1e3fd7768..05171528d7 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/class/attribute_accessors'
-require 'action_view/template/handler'
 require 'erubis'
 
 module ActionView
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index d0317a148b..2cc85a9f69 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -218,12 +218,6 @@ module ActionView
         end]
       end
 
-      def _assigns
-        ActiveSupport::Deprecation.warn "ActionView::TestCase#_assigns is deprecated and will be removed in future versions. " <<
-          "Please use view_assigns instead."
-        view_assigns
-      end
-
       def _routes
         @controller._routes if @controller.respond_to?(:_routes)
       end
diff --git a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb b/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
deleted file mode 100644
index 0c02afea36..0000000000
--- a/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'abstract_unit'
-
-class DeprecatedBaseMethodsTest < ActionController::TestCase
-  class Target < ActionController::Base
-    def home_url(greeting)
-      "http://example.com/#{greeting}"
-    end
-
-    def raises_name_error
-      this_method_doesnt_exist
-    end
-
-    def rescue_action(e) raise e end
-  end
-
-  tests Target
-
-  if defined? Test::Unit::Error
-    def test_assertion_failed_error_silences_deprecation_warnings
-      get :raises_name_error
-    rescue => e
-      error = Test::Unit::Error.new('testing ur doodz', e)
-      assert_not_deprecated { error.message }
-    end
-  end
-end
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 9f0670ffdf..584d73668a 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -77,7 +77,7 @@ class HelperTest < ActiveSupport::TestCase
     self.test_helper = LocalAbcHelper
   end
 
-  def test_deprecated_helper
+  def test_helper
     assert_equal expected_helper_methods, missing_methods
     assert_nothing_raised { @controller_class.helper TestHelper }
     assert_equal [], missing_methods
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index e62f3155c5..be59da9105 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1023,11 +1023,6 @@ class RenderTest < ActionController::TestCase
     assert_equal " ", @response.body
   end
 
-  def test_render_to_string_not_deprecated
-    assert_not_deprecated { get :hello_in_a_string }
-    assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
-  end
-
   def test_render_to_string_doesnt_break_assigns
     get :render_to_string_with_assigns
     assert_equal "i'm before the render", assigns(:before)
@@ -1106,7 +1101,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_yield_content_for
-    assert_not_deprecated { get :yield_content_for }
+    get :yield_content_for
     assert_equal "<title>Putting stuff in the title!</title>\nGreat stuff!\n", @response.body
   end
 
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 3de1849db8..f5ac886c20 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -32,17 +32,11 @@ class ViewLoadPathsTest < ActionController::TestCase
     @controller.send :assign_shortcuts, @request, @response
     @controller.send :initialize_template_class, @response
 
-    # Track the last warning.
-    @old_behavior = ActiveSupport::Deprecation.behavior
-    @last_message = nil
-    ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
-
     @paths = TestController.view_paths
   end
 
   def teardown
     TestController.view_paths = @paths
-    ActiveSupport::Deprecation.behavior = @old_behavior
   end
 
   def expand(array)
@@ -179,7 +173,7 @@ class ViewLoadPathsTest < ActionController::TestCase
     assert_nothing_raised { C.append_view_path 'c/path' }
     assert_paths C, "c/path"
   end
-  
+
   def test_lookup_context_accessor
     assert_equal ["test"], TestController.new.lookup_context.prefixes
   end
diff --git a/actionpack/test/dispatch/response_body_is_proc_test.rb b/actionpack/test/dispatch/response_body_is_proc_test.rb
deleted file mode 100644
index fd94832624..0000000000
--- a/actionpack/test/dispatch/response_body_is_proc_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'abstract_unit'
-
-class ResponseBodyIsProcTest < ActionDispatch::IntegrationTest
-  class TestController < ActionController::Base
-    def test
-      self.response_body = proc { |response, output|
-        output.write 'Hello'
-      }
-    end
-  end
-
-  def test_simple_get
-    with_test_route_set do
-      assert_deprecated do
-        get '/test'
-      end
-      assert_response :success
-      assert_equal 'Hello', response.body
-    end
-  end
-
-  private
-
-    def with_test_route_set(options = {})
-      with_routing do |set|
-        set.draw do
-          match ':action', :to => ::ResponseBodyIsProcTest::TestController
-        end
-
-        @app = self.class.build_app(set) do |middleware|
-          middleware.delete "ActionDispatch::ShowExceptions"
-        end
-
-        yield
-      end
-    end
-end
diff --git a/actionpack/test/fixtures/test/deprecated_nested_layout.erb b/actionpack/test/fixtures/test/deprecated_nested_layout.erb
deleted file mode 100644
index 7b6dcbb6c7..0000000000
--- a/actionpack/test/fixtures/test/deprecated_nested_layout.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% content_for :title, "title" -%>
-<% content_for :column do -%>column<% end -%>
-<% render :layout => 'layouts/column' do -%>content<% end -%>
\ No newline at end of file
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 63b92aadf4..0104c20bc7 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -19,15 +19,6 @@ class NumberHelperTest < ActionView::TestCase
     gigabytes(number) * 1024
   end
 
-  def silence_deprecation_warnings
-    @old_deprecatios_silenced = ActiveSupport::Deprecation.silenced
-    ActiveSupport::Deprecation.silenced  = true
-  end
-
-  def restore_deprecation_warnings
-    ActiveSupport::Deprecation.silenced  = @old_deprecatios_silenced
-  end
-
   def test_number_to_phone
     assert_equal("555-1234", number_to_phone(5551234))
     assert_equal("800-555-1212", number_to_phone(8005551212))
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index cd4618a505..f463675a2e 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -141,22 +141,6 @@ module ActionView
     end
   end
 
-  class AssignsTest < ActionView::TestCase
-    setup do
-      ActiveSupport::Deprecation.stubs(:warn)
-    end
-
-    test "_assigns delegates to user_defined_ivars" do
-      self.expects(:view_assigns)
-      _assigns
-    end
-
-    test "_assigns is deprecated" do
-      ActiveSupport::Deprecation.expects(:warn)
-      _assigns
-    end
-  end
-
   class ViewAssignsTest < ActionView::TestCase
     test "view_assigns returns a Hash of user defined ivars" do
       @a = 'b'