locomotivecms_steam 1.5.3 → 1.6.0.beta1

data/spec/unit/liquid/drops/section_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Drops::Section do
 
-  let(:context)     { ::Liquid::Context.new({}, {}, { locale: 'en' }) }
-  let(:settings)    { [] }
-  let(:definition)  { instance_double('SectionDefinition', definition: { 'settings' => settings }) }
-  let(:drop)        { described_class.new(definition, content).tap { |d| d.context = context } }
+  let(:context)           { ::Liquid::Context.new({}, {}, { locale: 'en' }) }
+  let(:settings)          { [] }
+  let(:definition)        { instance_double('SectionDefinition', definition: { 'settings' => settings, 'blocks' => block_definitions }) }
+  let(:block_definitions) { [] }
+  let(:drop)              { described_class.new(definition, content).tap { |d| d.context = context } }
 
   describe 'text type setting' do
 
@@ -23,4 +24,30 @@ describe Locomotive::Steam::Liquid::Drops::Section do
 
   end
 
+  describe 'blocks_as_tree' do
+
+    let(:block_definitions) { [{ 'type' => 'page' }] }
+    let(:content) { { 'blocks' => [
+      { 'id' => '1', 'type' => 'page', 'settings' => { 'name' => 'Page 1' } },
+      { 'id' => '2', 'type' => 'page', 'settings' => { 'name' => 'Page 2' } },
+      { 'id' => '2.1', 'type' => 'page', 'depth' => 1, 'settings' => { 'name' => 'Page 2.1' } },
+      { 'id' => '2.2', 'type' => 'page', 'depth' => 1, 'settings' => { 'name' => 'Page 2.2' } },
+      { 'id' => '2.2.1', 'type' => 'page', 'depth' => 2, 'settings' => { 'name' => 'Page 2.2.1' } },
+      { 'id' => '2.2.2', 'type' => 'page', 'depth' => 2, 'settings' => { 'name' => 'Page 2.2.2' } },
+      { 'id' => '2.2.2.1', 'type' => 'page', 'depth' => 3, 'settings' => { 'name' => 'Page 2.2.2.1' } },
+      { 'id' => '2.3', 'type' => 'page', 'depth' => 1, 'settings' => { 'name' => 'Page 2.3' } },
+      { 'id' => '3', 'type' => 'page', 'depth' => 0, 'settings' => { 'name' => 'Page 3' } },
+    ] } }
+
+    subject { drop.blocks_as_tree }
+
+    it 'represents the blocks as a tree (node + leaves)' do
+      expect(subject.map { |drop| drop.id }).to eq(%w(1 2 3))
+      expect(subject[1].leaves.map { |drop| drop.id }).to eq(%w(2.1 2.2 2.3))
+      expect(subject[1].leaves[1].leaves.map { |drop| drop.id }).to eq(%w(2.2.1 2.2.2))
+      expect(subject[1].leaves[1].leaves[1].leaves.map { |drop| drop.id }).to eq(%w(2.2.2.1))
+    end
+
+  end
+
 end

data/spec/unit/liquid/tags/section_spec.rb

@@ -224,24 +224,23 @@ describe Locomotive::Steam::Liquid::Tags::Section do
             '</div>' }
         end
 
-        context 'with an id within the content' do
-          let(:source)      { 'Locomotive {% section header %}'}
+        context 'with an id within the content (section rendered by the section middleware)' do
+          let(:source)      { '{% section header %}'}
           let(:alt_content) {
             {
-              id: 'site-header',
-              settings: { brand: 'Locomotive' },
+              id: 'dropzone-42',
+              settings: { brand: 'NoCoffee' },
               blocks:   []
             }.deep_stringify_keys
           }
 
-          it { is_expected.to eq 'Locomotive '\
-            '<div id="locomotive-section-site-header" '\
+          it { is_expected.to eq '<div id="locomotive-section-dropzone-42" '\
             'class="locomotive-section my-awesome-header" '\
             'data-locomotive-section-type="header">'\
-              '<span id="site-header-section"></span>'\
+              '<span id="dropzone-42-section"></span>'\
               'built by '\
-              '<strong data-locomotive-editor-setting="section-site-header.brand">'\
-                'Locomotive'\
+              '<strong data-locomotive-editor-setting="section-dropzone-42.brand">'\
+                'NoCoffee'\
               '</strong>'\
             '</div>' }
 

data/spec/unit/middlewares/cache_spec.rb

@@ -55,11 +55,11 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       let(:response) { nil }
 
-      before { expect(cache).to receive(:read).with('2fae60bf8d7d9c0dce6cabcac8288267').and_return(response) }
+      before { expect(cache).to receive(:read).with('9c535e0c37793cf8134e8b88b2517197').and_return(response) }
 
       context 'the cache is empty' do
 
-        before { expect(cache).to receive(:write).with('2fae60bf8d7d9c0dce6cabcac8288267', Marshal.dump([200, {}, ["Hello world!"]])) }
+        before { expect(cache).to receive(:write).with('9c535e0c37793cf8134e8b88b2517197', Marshal.dump([200, {}, ["Hello world!"]])) }
 
         it 'tells the CDN to cache the page and also cache it internally' do
           is_expected.to eq ['max-age=0, s-maxage=3600, public, must-revalidate', 'Accept-Language']
@@ -69,7 +69,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
           subject { send_request[:env]['steam.cache_etag'] }
 
-          it { is_expected.to eq '2fae60bf8d7d9c0dce6cabcac8288267' }
+          it { is_expected.to eq '9c535e0c37793cf8134e8b88b2517197' }
 
         end
 
@@ -104,7 +104,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       context 'based on the ETag' do
 
-        let(:etag) { '2fae60bf8d7d9c0dce6cabcac8288267' }
+        let(:etag) { '9c535e0c37793cf8134e8b88b2517197' }
 
         it 'returns a 304 (Not modified) without no cache headers' do
           expect(subject.first).to eq 304

data/spec/unit/middlewares/section_spec.rb

@@ -47,7 +47,7 @@ describe Locomotive::Steam::Middlewares::Section do
     is_expected.to eq [
       200,
       { "Content-Type" => "text/html" },
-      [%(<div id="locomotive-section-page-header" class="locomotive-section" data-locomotive-section-type="header"><span id="page-header-section"></span>Here some </div>)]
+      [%(<div id="locomotive-section-header" class="locomotive-section" data-locomotive-section-type="header"><span id="header-section"></span>Here some </div>)]
     ]
   end
 
@@ -55,7 +55,7 @@ describe Locomotive::Steam::Middlewares::Section do
 
     before do
       allow(env['steam.request']).to receive(:body).and_return(StringIO.new(
-        %({ "section_content": { "id": "site-header", "settings": { "name": "modified HTML" } } })
+        %({ "section_content": { "id": "dropzone-42", "settings": { "name": "modified HTML" } } })
       ))
     end
 
@@ -63,7 +63,7 @@ describe Locomotive::Steam::Middlewares::Section do
       is_expected.to eq [
         200,
         { "Content-Type" => "text/html" },
-        [%(<div id="locomotive-section-site-header" class="locomotive-section" data-locomotive-section-type="header"><span id="site-header-section"></span>Here some modified HTML</div>)]
+        [%(<div id="locomotive-section-dropzone-42" class="locomotive-section" data-locomotive-section-type="header"><span id="dropzone-42-section"></span>Here some modified HTML</div>)]
       ]
     end
 

data/spec/unit/middlewares/site_spec.rb

@@ -14,12 +14,14 @@ describe Locomotive::Steam::Middlewares::Site do
   let(:app)             { ->(env) { [200, env, 'app'] } }
   let(:middleware)      { Locomotive::Steam::Middlewares::Site.new(app) }
   let(:is_default_host) { nil }
+  let(:live_editing)    { false }
 
   subject do
     env = env_for(url, 'steam.services' => services)
     env['steam.request']          = Rack::Request.new(env)
     env['steam.site']             = engine_site
     env['steam.is_default_host']  = is_default_host
+    env['steam.live_editing']     = live_editing
     code, env = middleware.call(env)
     [code, env['Location']]
   end
@@ -58,7 +60,7 @@ describe Locomotive::Steam::Middlewares::Site do
   describe 'redirection' do
 
     let(:redirect_to_first_domain)  { false }
-    let(:redirect_to_https)         { false }
+    let(:redirect_to_https)         { false }    
     let(:url)  { 'http://acme.com' }
     let(:site) { instance_double('SiteWithDomains', name: 'Acme', domains: ['www.acme.com', 'acme.com'], redirect_to_first_domain: redirect_to_first_domain, redirect_to_https: redirect_to_https) }
 
@@ -116,6 +118,14 @@ describe Locomotive::Steam::Middlewares::Site do
 
         end
 
+        context 'when editing the page in the editor' do
+
+          let(:url) { 'https://locomotive.local/editor/foo' }
+          let(:live_editing) { true }
+          it { is_expected.to eq [200, nil] }
+
+        end
+
       end
 
     end

data/spec/unit/services/url_finder_service_spec.rb

@@ -73,19 +73,33 @@ describe Locomotive::Steam::UrlFinderService do
 
       let(:entry) { instance_double('Product') }
       let(:page)  { instance_double('Page', :content_entry= => true, not_found?: false) }
-      let(:value) { {
-        'type' => 'content_entry',
-        'value' => { 'page_id' => 42, 'content_type_slug' => 'products', 'id' => 1 },
-        'new_window' => true
-      } }
-
-      before do
-        expect(page_finder).to receive(:find_by_id).with(42).and_return(page)
-        expect(content_entry_finder).to receive(:find).with('products', 1).and_return(entry)
-        expect(url_builder).to receive(:url_for).with(page).and_return('/my-product')
+
+      context 'the value is valid content entry' do
+        let(:value) { {
+          'type' => 'content_entry',
+          'value' => { 'page_id' => 42, 'content_type_slug' => 'products', 'id' => 1 },
+          'new_window' => true
+        } }
+
+        before do
+          expect(page_finder).to receive(:find_by_id).with(42).and_return(page)
+          expect(content_entry_finder).to receive(:find).with('products', 1).and_return(entry)
+          expect(url_builder).to receive(:url_for).with(page).and_return('/my-product')
+        end
+
+        it { is_expected.to eq(['/my-product', true]) }
       end
 
-      it { is_expected.to eq(['/my-product', true]) }
+      context 'the value is nil' do
+        let(:value) { nil }
+
+        before do
+          expect(page_finder).to receive(:find).with('404').and_return(page)
+          expect(url_builder).to receive(:url_for).with(page).and_return('/404')
+        end
+        
+        it { is_expected.to eq(['/404', false]) }
+      end
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0.beta1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.1
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: morphine
   requirement: !ruby/object:Gem::Requirement
@@ -145,14 +145,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -213,16 +213,22 @@ dependencies:
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +333,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -369,14 +375,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: duktape
   requirement: !ruby/object:Gem::Requirement
@@ -778,6 +784,7 @@ files:
 - spec/fixtures/mongodb/locomotive_translations.metadata.json
 - spec/integration/adapters/mongodb_spec.rb
 - spec/integration/integration_helper.rb
+- spec/integration/liquid/drops/content_types_spec.rb
 - spec/integration/liquid/drops/page_spec.rb
 - spec/integration/liquid/filters/translate_spec.rb
 - spec/integration/liquid/tags/paginate_spec.rb
@@ -852,6 +859,7 @@ files:
 - spec/unit/liquid/drops/metafields_spec.rb
 - spec/unit/liquid/drops/page_spec.rb
 - spec/unit/liquid/drops/params_spec.rb
+- spec/unit/liquid/drops/section_block_spec.rb
 - spec/unit/liquid/drops/section_content_proxy_spec.rb
 - spec/unit/liquid/drops/section_spec.rb
 - spec/unit/liquid/drops/session_proxy_spec.rb
@@ -964,14 +972,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine
@@ -1094,6 +1105,7 @@ test_files:
 - spec/fixtures/mongodb/locomotive_translations.metadata.json
 - spec/integration/adapters/mongodb_spec.rb
 - spec/integration/integration_helper.rb
+- spec/integration/liquid/drops/content_types_spec.rb
 - spec/integration/liquid/drops/page_spec.rb
 - spec/integration/liquid/filters/translate_spec.rb
 - spec/integration/liquid/tags/paginate_spec.rb
@@ -1168,6 +1180,7 @@ test_files:
 - spec/unit/liquid/drops/metafields_spec.rb
 - spec/unit/liquid/drops/page_spec.rb
 - spec/unit/liquid/drops/params_spec.rb
+- spec/unit/liquid/drops/section_block_spec.rb
 - spec/unit/liquid/drops/section_content_proxy_spec.rb
 - spec/unit/liquid/drops/section_spec.rb
 - spec/unit/liquid/drops/session_proxy_spec.rb