locomotive_cms 2.5.0.rc2 → 2.5.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445a239a0a0d6b9f30fec36b880d297f837a81cc
-  data.tar.gz: 383dc6883e250d582c10ec52e8fe251f0db76717
+  metadata.gz: 2e4f6d7acbadf388d2cd5a4bf51352f19df782de
+  data.tar.gz: 1a008446466bed982993fd8f242044891bfe56cc
 SHA512:
-  metadata.gz: 77446b33a479d73220ec27e8925377074bad411ac2d10865dbd94ccedb2eb81aad5e3559aab2695390a1ec6fb2cb76b7a1e2e3c01a3ac735862e8466dfb4d085
-  data.tar.gz: c2885bd30892cf699bc6c75983232594e0289f0062f567c1322fce86f5cebffab10f8029e5742c7cab88efd16ad75163c161da30f389b7c1dacfd88809624139
+  metadata.gz: 6819e5333cb5dc37c123edce04128bef0f28159c156675eb399aaa2ba421305e61b784ec2a9057d749b9eab2a4527fd3ebb71b108f0b0fd8a5330cf6f8632eba
+  data.tar.gz: 049328daef7e2bdb06810408fee6dbbf8f340f4b3031532c6f15a85944dd576ceb9cde30c9b3ab8abec1c388942fce9b3b00aa1c51f50be4f663c40aad2444df

data/app/presenters/locomotive/base_presenter.rb

@@ -115,7 +115,7 @@ class Locomotive::BasePresenter
   def self.getters_to_hash
     {}.tap do |hash|
       self.getters.each do |name|
-        next if %w(_id screated_at updated_at).include?(name)
+        next if %w(_id created_at updated_at).include?(name)
         hash[name] = self.getters_or_setters_to_hash(name)
       end
 

data/lib/locomotive/render.rb

@@ -65,13 +65,25 @@ module Locomotive
       response.headers['Content-Type']  = "#{@page.response_type}; charset=utf-8"
       response.headers['Editable']      = 'true' unless self.editing_page? || current_locomotive_account.nil?
 
+      # Inputs which define the ETag for this response
+      etag_inputs = {
+        'page'    => @page,
+        'params'  => {
+          'page_path'   => params[:page_path],
+          'locale'      => params[:locale]
+        }
+      }
+
       if @page.with_cache?
-        fresh_when etag: @page, last_modified: @page.updated_at.utc, public: true
+        fresh_when etag: etag_inputs, last_modified: @page.updated_at.utc, public: true
 
         if @page.cache_strategy != 'simple' # varnish
           response.headers['Editable']      = ''
           response.cache_control[:max_age]  = @page.cache_strategy
         end
+      else
+        # Set the ETag on uncached responses otherwise Rails will set it based on content only
+        fresh_when etag: etag_inputs
       end
 
       render text: output, layout: false, status: page_status unless performed?
@@ -220,4 +232,4 @@ module Locomotive
     end
 
   end
-end
+end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.0.rc2'
+  VERSION = '2.5.0.rc3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0.rc2
+  version: 2.5.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake