diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index a6747fca7c..1645400693 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -23,7 +23,7 @@ module ActionController # This will render the show template if the request isn't sending a matching etag or # If-Modified-Since header and just a <tt>304 Not Modified</tt> response if there's a match. # - # You can also just pass a record where last_modified will be set by calling last_modified and the etag by passing the object itself. Example: + # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example: # # def show # @article = Article.find(params[:id]) @@ -42,7 +42,7 @@ module ActionController options.assert_valid_keys(:etag, :last_modified, :public) else record = record_or_options - options = { :etag => record, :last_modified => record.try(:last_modified) }.merge(additional_options) + options = { :etag => record, :last_modified => record.try(:updated_at) }.merge(additional_options) end response.etag = options[:etag] if options[:etag] diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index e014d08ec9..243bad8749 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -51,7 +51,7 @@ class TestController < ActionController::Base end def conditional_hello_with_record - record = Struct.new(:last_modified, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123") + record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123") if stale?(record) render :action => 'hello_world' @@ -65,7 +65,7 @@ class TestController < ActionController::Base end def conditional_hello_with_public_header_with_record - record = Struct.new(:last_modified, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123") + record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123") if stale?(record, :public => true) render :action => 'hello_world' |