Changeset 6165

Timestamp:

02/19/07 00:27:19 (1 year ago)

Author:

david

Message:

Move etagging down to response, so renders with layouts dont screw it up [DHH]

Files:

• trunk/actionpack/lib/action_controller/base.rb (modified) (3 diffs)
• trunk/actionpack/lib/action_controller/cgi_process.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/response.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/render_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/base.rb

@@ -8 +8 @@
-require 'drb'
-require 'set'
-require 'digest/md5'
-
-module ActionController #:nodoc:
@@ -475 +474 @@
-
-        assign_default_content_type_and_charset
+
+        response.request = request
+        response.prepare!
-        response
-      ensure
@@ -877 +879 @@
-        else
-          response.body = text
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      end
-

trunk/actionpack/lib/action_controller/cgi_process.rb

@@ -185 +185 @@
-
-    def out(output = $stdout)
-      convert_content_type!
-      set_content_length!
-
-      output.binmode      if output.respond_to?(:binmode)
-      output.sync = false if output.respond_to?(:sync=)
@@ -210 +207 @@
-      end
-    end
-
-    private
-      def convert_content_type!
-        if content_type = @headers.delete("Content-Type")
-          @headers["type"] = content_type
-        end
-        if content_type = @headers.delete("Content-type")
-          @headers["type"] = content_type
-        end
-        if content_type = @headers.delete("content-type")
-          @headers["type"] = content_type
-        end
-      end
-      
-      # Don't set the Content-Length for block-based bodies as that would mean reading it all into memory. Not nice
-      # for, say, a 2GB streaming file.
-      def set_content_length!
-        @headers["Content-Length"] = @body.size unless @body.respond_to?(:call)
-      end
-  end
-end

trunk/actionpack/lib/action_controller/response.rb

@@ +1 @@
+require 'digest/md5'
+
-module ActionController
-  class AbstractResponse #:nodoc:
-    DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
+    attr_accessor :request
-    attr_accessor :body, :headers, :session, :cookies, :assigns, :template, :redirected_to, :redirected_to_method_params, :layout
-
@@ -9 +12 @@
-
-    def content_type=(mime_type)
-@
+self.
-    end
-    
-    def content_type
-@headers["Content-T
+headers["Content-Type"] || headers["t
-      content_type.blank? ? nil : content_type
-    end
-    
-    def charset=(encoding)
-@
+self.
-    end
-    
-    def charset
-@headers["Content-T
+headers["Content-Type"] || headers["t
-      charset.blank? ? nil : charset.strip.split("=")[1]
-    end
-
-    def redirect(to_url, permanently = false)
-@headers["Status"]   = "302 Found" unless @
-@
+self.headers["Status"]   = "302 Found" unless 
+self.
-
-@
+self.
-    end
+
+    def prepare!
+      handle_conditional_get!
+      convert_content_type!
+      set_content_length!
+    end
+
+    private
+      def handle_conditional_get!
+        if body.is_a?(String) && headers['Status'][0..2] == '200' && !body.empty?
+          self.headers['Etag'] ||= %("#{Digest::MD5.hexdigest(body)}")
+
+          if request.headers['HTTP_IF_NONE_MATCH'] == headers['Etag']
+            self.headers['Status'] = '304 Not Modified'
+            self.body = ''
+          end
+        end
+      end
+
+      def convert_content_type!
+        if content_type = headers.delete("Content-Type")
+          self.headers["type"] = content_type
+        end
+        if content_type = headers.delete("Content-type")
+          self.headers["type"] = content_type
+        end
+        if content_type = headers.delete("content-type")
+          self.headers["type"] = content_type
+        end
+      end
+    
+      # Don't set the Content-Length for block-based bodies as that would mean reading it all into memory. Not nice
+      # for, say, a 2GB streaming file.
+      def set_content_length!
+        self.headers["Content-Length"] = body.size unless body.respond_to?(:call)
+      end
-  end
-end

trunk/actionpack/test/controller/render_test.rb

@@ -338 +338 @@
-  def test_etag_should_govern_renders_with_layouts_too
-    get :builder_layout_test
+    assert_equal "<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n", @response.body
-    assert_equal etag_for("<wrapper>\n<html>\n  <p>Hello </p>\n<p>This is grand!</p>\n</html>\n</wrapper>\n"), @response.headers['Etag']
-  end