2 files changed, 30 insertions, 36 deletions

diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 8575d30335..52f5a9727e 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -3,6 +3,7 @@ module ActionController
     extend ActiveSupport::Concern
 
     include RackConvenience
+    include Head
 
     # Sets the etag, last_modified, or both on the response and renders a
     # "304 Not Modified" response if the request is already fresh.
@@ -27,43 +28,9 @@ module ActionController
 
       response.etag          = options[:etag]          if options[:etag]
       response.last_modified = options[:last_modified] if options[:last_modified]
+      response.cache_control[:public] = true if options[:public]
 
-      if options[:public]
-        response.cache_control[:public] = true
-      end
-
-      if request.fresh?(response)
-        head :not_modified
-      end
-    end
-
-    # Return a response that has no content (merely headers). The options
-    # argument is interpreted to be a hash of header names and values.
-    # This allows you to easily return a response that consists only of
-    # significant headers:
-    #
-    #   head :created, :location => person_path(@person)
-    #
-    # It can also be used to return exceptional conditions:
-    #
-    #   return head(:method_not_allowed) unless request.post?
-    #   return head(:bad_request) unless valid_request?
-    #   render
-    def head(*args)
-      if args.length > 2
-        raise ArgumentError, "too many arguments to head"
-      elsif args.empty?
-        raise ArgumentError, "too few arguments to head"
-      end
-      options  = args.extract_options!
-      status   = args.shift || options.delete(:status) || :ok
-      location = options.delete(:location)
-
-      options.each do |key, value|
-        headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
-      end
-
-      render :nothing => true, :status => status, :location => location
+      head :not_modified if request.fresh?(response)
     end
 
     # Sets the etag and/or last_modified on the response and checks it against
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
new file mode 100644
index 0000000000..68fa0a0402
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -0,0 +1,27 @@
+module ActionController
+  module Head
+    # Return a response that has no content (merely headers). The options
+    # argument is interpreted to be a hash of header names and values.
+    # This allows you to easily return a response that consists only of
+    # significant headers:
+    #
+    #   head :created, :location => person_path(@person)
+    #
+    # It can also be used to return exceptional conditions:
+    #
+    #   return head(:method_not_allowed) unless request.post?
+    #   return head(:bad_request) unless valid_request?
+    #   render
+    def head(status, options = {})
+      options, status = status, nil if status.is_a?(Hash)
+      status ||= options.delete(:status) || :ok
+      location = options.delete(:location)
+
+      options.each do |key, value|
+        headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
+      end
+
+      render :nothing => true, :status => status, :location => location
+    end
+  end
+end
\ No newline at end of file