removed deprecated methods, and related tests, from ActionPack

actionpack/lib/action_dispatch/http/request.rb

@@ -2,7 +2,6 @@
 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 @@ class Request < Rack::Request
         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 @@ def fullpath
       @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

actionpack/lib/action_dispatch/http/response.rb

@@ -116,32 +116,9 @@ def body
 
     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).

actionpack/lib/action_dispatch/middleware/callbacks.rb

@@ -19,8 +19,7 @@ def self.after(*args, &block)
       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
 

actionpack/lib/action_dispatch/middleware/session/abstract_store.rb

@@ -73,13 +73,7 @@ class AbstractStore < Rack::Session::Abstract::ID
       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

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 @@ def segment_keys
         @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]

actionpack/lib/action_view/template/handlers.rb

@@ -41,12 +41,6 @@ def register_default_template_handler(extension, klass)
         @@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

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

actionpack/lib/action_view/test_case.rb

@@ -218,12 +218,6 @@ def view_assigns
         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

actionpack/test/controller/helper_test.rb

@@ -77,7 +77,7 @@ def setup
     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

actionpack/test/controller/render_test.rb

@@ -1023,11 +1023,6 @@ def test_rendering_nothing_on_layout
     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 @@ def test_template_with_locals
   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
 

actionpack/test/controller/view_paths_test.rb

@@ -32,17 +32,11 @@ def setup
     @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 C < ActionController::Base; end
     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

actionpack/test/template/number_helper_test.rb

@@ -19,15 +19,6 @@ def terabytes(number)
     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))

actionpack/test/template/test_case_test.rb

@@ -141,22 +141,6 @@ def render_from_helper
     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'