removed deprecated methods, and related tests, from ActionPack

2 files changed, 1 insertions, 30 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).