locomotivecms 3.3.0.rc1 → 3.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa0ccc8361eb063596917d328170297cafd835e
-  data.tar.gz: a9bd9f70ef7a44687f0d42654e0672320a5df04c
+  metadata.gz: 0e9f4f8edfefcd83de371071e2fa02fd7d64e1b1
+  data.tar.gz: b8f8065113b1588275132a2dc46f7cf7bc878437
 SHA512:
-  metadata.gz: 81743c70c111b18756bf436b795dbace81d7b8556c5aad17107bf112f06da723c5440bf8d3d21b36bd8566b5a98abc115dd474b8f527d6759e3e0170a0bb303b
-  data.tar.gz: e5bb69b97e20cd06fcd02889d499514afab906d3752992959f3f273a620bc163045084330154ce068de9f52566342761e92a2f5e2587c4a3fd721186af283b40
+  metadata.gz: be0f754bc93350ecc01ab1bfdc312095b809a1ec02d9583c2c894165a213dc548c08fb5b23e07f6d095d8aef384112d528e3fc6a9cd38c3c328df957d27ce854
+  data.tar.gz: 1778764e6e160a64b4464afa58db5f93b97d2195d60c1af5b34ef67174a297b3809033d05e9ea71a0110037250196e7d2526309b2b3c93e35a641be34b592fc7

data/app/models/locomotive/editable_text.rb

@@ -14,10 +14,18 @@ module Locomotive
 
     ## methods ##
 
+    # Change the content of the editable element if the value is a new version.
+    # This method has been overridden for 2 reasons:
+    # - we have to register the current locale (localized site)
+    # - the default_content attribute has to be turned off
+    #
+    # Called by:
+    # - the API: page with a YAML header defining the initial content for this editable element
+    # - the UI: if the content is the same as the default one or the previous one, don't do anything.
     def content=(value)
       return if value == self.content
       self.add_current_locale
-      self.default_content = false unless self.new_record?
+      self.default_content = false
       super
     end
 

data/app/services/locomotive/page_parsing_service.rb

@@ -153,9 +153,19 @@ module Locomotive
 
     def add_or_modify_editable_element(page, attributes)
       if element = page.editable_elements.by_block_and_slug(attributes[:block], attributes[:slug]).first
+        # context: the editable element has been created from the page YAML header
+        existing_content = element._type.nil? && !element.content.blank?
+
         # FIXME: we don't want to deal here with the generic Locomotive::EditableElement class
         element = page.editable_elements.with_same_class!(element, "Locomotive::#{attributes[:type].to_s.classify}".constantize)
         element.attributes = attributes
+
+        # we know now this was an editable_text element. If it already had
+        # a content, then it shouldn't be flagged as default_content.
+        if element.respond_to?(:default_content?) && existing_content
+          element.default_content = false
+        end
+
         element
       else
         klass = "Locomotive::#{attributes[:type].to_s.classify}".constantize

data/lib/locomotive/carrierwave/asset.rb

@@ -34,7 +34,7 @@ module Locomotive
         def set_content_type_of_model(*args)
           content_type  = file.content_type
 
-          if content_type.blank? || content_type == 'application/octet-stream'
+          if content_type.blank? || ['application/octet-stream', 'text/x-csrc'].include?(content_type)
             content_type = File.mime_type?(original_filename)
           end
 

data/lib/locomotive/steam/middlewares/cache.rb

@@ -37,7 +37,8 @@ module Locomotive
         def marshal(response)
           code, headers, body = response
 
-          _headers = headers.dup.reject! { |key, val| key =~ /[^0-9A-Z_]/ || !val.respond_to?(:to_str) }
+          # only keep string value headers
+          _headers = headers.reject { |key, val| !val.respond_to?(:to_str) }
 
           Marshal.dump([code, _headers, body])
         end

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.3.0.rc1'
+  VERSION = '3.3.0.rc2'
 end

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -8,7 +8,7 @@ describe Locomotive::Steam::Middlewares::Cache do
   let(:page)        { instance_double('CachedPage', _id: '0042', cache_enabled: page_cache, redirect_url: nil) }
   let(:app)         { ->(env) { [200, env, 'app'] } }
   let(:middleware)  { described_class.new(app) }
-  let(:steam_env)   { { 'REQUEST_METHOD' => 'GET', 'steam.site' => site, 'steam.page' => page, 'steam.live_editing' => false, 'PATH_INFO' => 'foo', 'QUERY_STRING' => 'a=1&c=3' } }
+  let(:steam_env)   { { 'Content-Type' => 'text/html', 'REQUEST_METHOD' => 'GET', 'steam.site' => site, 'steam.page' => page, 'steam.live_editing' => false, 'PATH_INFO' => 'foo', 'QUERY_STRING' => 'a=1&c=3' } }
 
   describe '#call' do
 
@@ -29,6 +29,7 @@ describe Locomotive::Steam::Middlewares::Cache do
         middleware.call(env_for('foo', steam_env)) # warm up the cache
         expect(middleware.app).not_to receive(:call)
         expect(subject.first).to eq 200
+        expect(subject[1]['Content-Type']).to eq 'text/html'
       end
 
     end
@@ -39,7 +40,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq '93a2150e6ee016394b95f1a6944c1f69' }
+    it { expect(subject).to eq '6f10bd02e43a99e1bef1223da0e266ec' }
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc1
+  version: 3.3.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake