locomotivecms_steam 1.4.1 → 1.5.0.beta1

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

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Tags::SectionsDropzone do
+
+  let(:services)      { Locomotive::Steam::Services.build_instance(nil) }
+  let(:finder)        { services.section_finder }
+  let(:source)        { '{% sections_dropzone %}' }
+  let(:live_editing)  { true }
+  let(:page)          { liquid_instance_double('Page', sections_dropzone_content: content) }
+  let(:assigns)       { { 'page' => page } }
+  let(:registers)     { { services: services, live_editing: live_editing } }
+  let(:context)       { ::Liquid::Context.new(assigns, {}, registers) }
+
+  describe 'rendering' do
+
+    subject { render_template(source, context) }
+
+    context 'no sections' do
+
+      let(:content) { [] }
+
+      it 'renders an empty string' do
+        is_expected.to eq '<div class="locomotive-sections"></div>'
+      end
+
+    end
+
+    context 'with sections' do
+
+      let(:content) { [
+        {
+          type:     'hero',
+          settings: { title: 'Hello world' },
+          blocks:   []
+        }.deep_stringify_keys,
+        {
+          type:     'slideshow',
+          settings: {},
+          blocks:   [{ settings: { title: 'Slide 1' } }, { settings: { title: 'Slide 2' } }]
+        }.deep_stringify_keys
+      ] }
+
+      let(:hero_source) { %(<h1>{{ section.settings.title }}</h1>) }
+      let(:slideshow_source) { %({% for block in section.blocks %}<div {{ block.locomotive_attributes }}><p>{{ block.settings.title }}</p></div>{% endfor %}) }
+
+      let(:hero_section) {
+        instance_double('Hero',
+          slug: 'hero',
+          type: 'hero',
+          definition: { settings: [{ id: 'title', type: 'text' }], blocks: [] }.deep_stringify_keys,
+          liquid_source: hero_source)
+      }
+      let(:slideshow_section) {
+        instance_double('Slideshow',
+          slug: 'slideshow',
+          type: 'slideshow',
+          definition: {
+            settings: [],
+            blocks: [{ settings: [{ id: 'title', type: 'text' }] }]
+          }.deep_stringify_keys,
+          liquid_source: slideshow_source) }
+
+      before do
+        allow(finder).to receive(:find).with('hero').and_return(hero_section)
+        allow(finder).to receive(:find).with('slideshow').and_return(slideshow_section)
+      end
+
+      it 'renders the list of sections' do
+        is_expected.to eq <<-HTML
+          <div class="locomotive-sections">
+            <div id="locomotive-section-dropzone-0" class="locomotive-section" data-locomotive-section-type="hero">
+              <h1 data-locomotive-editor-setting="section-dropzone-0.title">Hello world</h1>
+            </div>
+            <div id="locomotive-section-dropzone-1" class="locomotive-section" data-locomotive-section-type="slideshow">
+              <div data-locomotive-block="section-dropzone-1-block-0"><p data-locomotive-editor-setting="section-dropzone-1-block.0.title">Slide 1</p></div>
+              <div data-locomotive-block="section-dropzone-1-block-1"><p data-locomotive-editor-setting="section-dropzone-1-block.1.title">Slide 2</p></div>
+            </div>
+          </div>
+        HTML
+        .strip.gsub(/\n\s+/, '')
+      end
+
+      context 'live editing is off' do
+
+        let(:live_editing) { false }
+
+        it 'renders the list of sections' do
+          is_expected.to eq <<-HTML
+            <div class="locomotive-sections">
+              <div id="locomotive-section-dropzone-0" class="locomotive-section" data-locomotive-section-type="hero">
+                <h1>Hello world</h1>
+              </div>
+              <div id="locomotive-section-dropzone-1" class="locomotive-section" data-locomotive-section-type="slideshow">
+                <div ><p>Slide 1</p></div>
+                <div ><p>Slide 2</p></div>
+              </div>
+            </div>
+          HTML
+          .strip.gsub(/\n\s+/, '')
+        end
+
+      end
+
+    end
+
+  end
+end

data/spec/unit/middlewares/auth_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
-require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/auth'
 
 describe Locomotive::Steam::Middlewares::Auth::AuthOptions do
@@ -16,7 +16,14 @@ describe Locomotive::Steam::Middlewares::Auth::AuthOptions do
 
     subject { options.smtp }
 
-    it { is_expected.to eq('address': '127.0.0.1', 'user_name': 'John', 'password': 'doe', 'port': 25) }
+    it { is_expected.to eq(
+        address: '127.0.0.1',
+        user_name: 'John',
+        password: 'doe',
+        port: 25,
+        authentication: 'plain',
+        enable_starttls_auto: false,
+    ) }
 
     context 'no smtp metafields' do
 

data/spec/unit/middlewares/encoded_link_redirection_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/encoded_link_redirection'
+
+describe Locomotive::Steam::Middlewares::EncodedLinkRedirection do
+
+  let(:url_finder)      { instance_double('UrlFinder') }
+  let(:services)        { instance_double('Services', url_finder: url_finder) }
+  let(:site)            { instance_double('Site') }
+  let(:url)             { 'http://models.example.com' }
+  let(:mounted_on)      { nil }
+  let(:locomotive_path) { nil }
+  let(:app)             { ->(env) { [200, env, 'app'] } }
+  let(:middleware)      { described_class.new(app) }
+
+  subject do
+    env = env_for(url, 'PATH_INFO' => locomotive_path, 'steam.site' => site)
+    env['steam.request']    = Rack::Request.new(env)
+    env['steam.mounted_on'] = mounted_on
+    env['steam.services']   = services
+    env['locomotive.path']  = locomotive_path
+    code, env = middleware.call(env)
+    [code, env['Location']]
+  end
+
+  describe 'no redirections' do
+
+    it { is_expected.to eq [200, nil] }
+
+  end
+
+  describe 'valid encoded link' do
+
+    let(:encoded_link) { 'eyJ0eXBlIjoiX2V4dGVybmFsIiwidmFsdWUiOiJodHRwczovL3d3dy5ub2NvZmZlZS5mciIsImxhYmVsIjpbImV4dGVybmFsIiwiaHR0cHM6Ly93d3cubm9jb2ZmZWUuZnIiXX0' }
+    let(:locomotive_path) { "/_locomotive-link/#{encoded_link}" }
+
+    context 'external url' do
+
+      it 'redirects (302) to the url stored in the encoded link' do
+        expect(url_finder).to receive(:decode_link).with('eyJ0eXBlIjoiX2V4dGVybmFsIiwidmFsdWUiOiJodHRwczovL3d3dy5ub2NvZmZlZS5mciIsImxhYmVsIjpbImV4dGVybmFsIiwiaHR0cHM6Ly93d3cubm9jb2ZmZWUuZnIiXX0').and_return({
+          'type'    => 'external',
+          'value'   => 'https://www.nocoffee.fr',
+          'locale'  => 'fr'
+        })
+        expect(services).to receive(:locale=).with('fr')
+        allow(url_finder).to receive(:url_for).and_return(['https://www.nocoffee.fr', false])
+        is_expected.to eq [302, 'https://www.nocoffee.fr']
+      end
+
+    end
+
+    context 'local page' do
+
+      let(:mounted_on) { '/my_app' }
+
+      it 'redirects (302) to the page stored in the encoded link' do
+        expect(url_finder).to receive(:decode_link).with('eyJ0eXBlIjoiX2V4dGVybmFsIiwidmFsdWUiOiJodHRwczovL3d3dy5ub2NvZmZlZS5mciIsImxhYmVsIjpbImV4dGVybmFsIiwiaHR0cHM6Ly93d3cubm9jb2ZmZWUuZnIiXX0').and_return({
+          'type'    => 'page',
+          'value'   => '42',
+          'locale'  => 'fr'
+        })
+        expect(services).to receive(:locale=).with('fr')
+        allow(url_finder).to receive(:url_for).and_return(['/about-us', false])
+        is_expected.to eq [302, '/my_app/about-us']
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/middlewares/entry_submission_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
-require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/entry_submission'
 
 describe Locomotive::Steam::Middlewares::EntrySubmission do

data/spec/unit/middlewares/helpers_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
 
-describe Locomotive::Steam::Middlewares::Helpers do
+describe Locomotive::Steam::Middlewares::Concerns::Helpers do
 
-  let(:middleware)  { Class.new { include Locomotive::Steam::Middlewares::Helpers } }
+  let(:middleware)  { Class.new { include Locomotive::Steam::Middlewares::Concerns::Helpers } }
   let(:instance)    { middleware.new }
 
   describe '#make_local_path' do
@@ -58,65 +58,4 @@ describe Locomotive::Steam::Middlewares::Helpers do
 
   end
 
-  describe '#params' do
-
-    let(:url)             { 'http://models.example.com' }
-    let(:app)             { ->(env) { [200, env, 'app'] } }
-    let(:options)         { {} }
-
-    before do
-      env = env_for(url, options)
-      env['steam.request'] = Rack::Request.new(env)
-      allow(instance).to receive(:app).and_return(app)
-      allow(instance).to receive(:env).and_return(env)
-    end
-
-    subject { instance.params }
-
-    context 'from a GET' do
-
-      let(:url) { 'http://models.example.com?foo=bar' }
-
-      it { is_expected.to eq('foo' => 'bar') }
-
-    end
-
-    context 'from a GET (JSON)' do
-
-      let(:url) { 'http://models.example.com/api.json?foo=bar' }
-
-      it { is_expected.to eq('foo' => 'bar') }
-
-    end
-
-    context 'from the body of JSON POST request' do
-
-      let(:input) { '{"foo": { "bar": 42 } }' }
-
-      let(:options) { {
-        method: 'POST',
-        input:  input,
-        'CONTENT_TYPE' => 'application/json'
-      } }
-
-      it { is_expected.to eq('foo' => { 'bar' => 42 }) }
-
-      it 'builds a hash with indifferent access' do
-        expect(subject[:foo][:bar]).to eq 42
-      end
-
-      context 'the JSON is invalid' do
-
-        let(:input) { '{ a: 2 }' }
-
-        it 'returns an empty hash' do
-          is_expected.to eq({})
-        end
-
-      end
-
-    end
-
-  end
-
 end

data/spec/unit/middlewares/locale_redirection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
-require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/locale_redirection'
 
 describe Locomotive::Steam::Middlewares::LocaleRedirection do
@@ -32,6 +32,17 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
       let(:locale_in_path)  { false }
       it { is_expected.to eq [200, nil] }
 
+      context 'the lang elected is not the default lang' do
+        let(:locale)          { 'fr' }
+        it { is_expected.to eq [302, '/fr'] }
+      end
+
+    end
+
+    describe 'locale is part of the path' do
+      let(:url) { 'http://models.example.com/fr' }
+      let(:locale)          { 'fr' }
+      it { is_expected.to eq [200, nil] }
     end
 
     describe 'for seo purpose redirect to the path without the locale' do
@@ -53,7 +64,7 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
 
       describe 'add default locale to root path' do
         let(:url) { 'http://models.example.com/' }
-        it { is_expected.to eq [301, '/de'] }
+        it { is_expected.to eq [302, '/de'] }
       end
 
       describe 'add default locale to long path' do

data/spec/unit/middlewares/locale_spec.rb

@@ -1,23 +1,67 @@
 require 'spec_helper'
 
 require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
-require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/locale'
 
 describe Locomotive::Steam::Middlewares::Locale do
 
-  let(:site)            { instance_double('Site', default_locale: :de, locales: %w(de fr)) }
+  let(:site)            { instance_double('Site', default_locale: :de, locales: [:de, :fr, :en]) }
   let(:url)             { 'http://models.example.com' }
   let(:app)             { ->(env) { [200, env, 'app'] } }
   let(:services)        { instance_double('Services', :locale= => 'en') }
   let(:middleware)      { Locomotive::Steam::Middlewares::Locale.new(app) }
+  let(:session)         { {} }
+  let(:accept_language) { '' }
 
   subject do
-    env = env_for(url, 'steam.site' => site)
+    env = env_for(
+        url,
+        'steam.site' => site,
+        'rack.session' => session,
+        'HTTP_ACCEPT_LANGUAGE' => accept_language)
     env['steam.request']  = Rack::Request.new(env)
     env['steam.services'] = services
     code, env = middleware.call(env)
-    env['steam.locale']
+    [env['steam.locale'], session['steam-locale']&.to_sym]
+  end
+
+  describe 'no locale defined in the path' do
+
+    describe 'first connexion' do
+
+      context 'without accept-language header' do
+
+        it { is_expected.to eq [:de, :de] }
+
+      end
+
+      context 'with accept-language header' do
+
+        let(:accept_language) { 'fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7' }
+
+        it { is_expected.to eq [:fr, :fr] }
+
+        context 'with url path' do
+
+          let(:url) { 'http://models.example.com/werkzeug' }
+
+          it { is_expected.to eq [:de, :de] }
+
+        end
+
+      end
+
+    end
+
+    context 'user with session, use it' do
+
+      let(:session) { {'steam-locale' => 'en'} }
+
+      it { is_expected.to eq [:en, :en] }
+
+    end
+
   end
 
   describe 'locale asked in the request params' do
@@ -26,15 +70,15 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       let(:url) { 'http://models.example.com?locale=' }
 
-      it { is_expected.to eq :de }
+      it { is_expected.to eq [:de, :de] }
 
     end
 
     context 'the locale exists' do
 
-      let(:url) { 'http://models.example.com?locale=fr' }
+      let(:url) { 'http://models.example.com?locale=en' }
 
-      it { is_expected.to eq 'fr' }
+      it { is_expected.to eq [:en, :en] }
 
     end
 
@@ -42,11 +86,9 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       let(:url) { 'http://models.example.com?locale=onload' }
 
-      it { is_expected.to eq :de }
+      it { is_expected.to eq [:de, :de] }
 
     end
 
-
   end
-
 end

data/spec/unit/middlewares/page_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require_relative '../../../lib/locomotive/steam/middlewares/thread_safe'
-require_relative '../../../lib/locomotive/steam/middlewares/helpers'
+require_relative '../../../lib/locomotive/steam/middlewares/concerns/helpers'
 require_relative '../../../lib/locomotive/steam/middlewares/page'
 
 describe Locomotive::Steam::Middlewares::Page do
@@ -11,20 +11,22 @@ describe Locomotive::Steam::Middlewares::Page do
   let(:page_not_found)  { instance_double('PageNotFound', not_found?: true) }
   let(:page)            { instance_double('Page', title: 'Hello world', fullpath: 'hello-world', not_found?: false, published?: published) }
   let(:pages)           { [page] }
-  let(:site)            { instance_double('Site', default_locale: 'en') }
+  let(:site)            { instance_double('Site', default_locale: 'en', routes: routes) }
   let(:service)         { instance_double('PageFinder', match: pages) }
+  let(:routes)          { {} }
   let(:url)             { 'http://models.example.com' }
+  let(:path)            { 'hello-world' }
   let(:app)             { ->(env) { [200, env, 'app'] } }
   let(:middleware)      { described_class.new(app) }
 
   subject do
     env = env_for(url, 'steam.site' => site)
-    env['steam.path']         = 'hello-world'
+    env['steam.path']         = path
     env['steam.locale']       = 'en'
-    env['steam.request']      = Rack::Request.new(env)
     env['steam.live_editing'] = live_editing
+    env['steam.request']      = Rack::Request.new(env)
     code, env = middleware.call(env)
-    env['steam.page']
+    [env['steam.page'], env['steam.request'].params]
   end
 
   before do
@@ -32,28 +34,67 @@ describe Locomotive::Steam::Middlewares::Page do
     allow(service).to receive(:find).with('404').and_return(page_not_found)
   end
 
-  it { is_expected.to eq page }
+  describe 'named route' do
+
+    let(:path)    { 'posts/2018/09' }
+    let(:routes)  { [{ 'route' => '/posts/:year', 'page_handle' => 'posts' }, { 'route' => '/posts/:year/:month', 'page_handle' => 'posts' }] }
+
+    it 'returns the page based on the handle returned by the routing hash' do
+      expect(service).to receive(:by_handle).with('posts', false).and_return(page)
+      is_expected.to eq([page, { 'year' => '2018', 'month' => '09' }])
+    end
+
+    describe 'wrong route syntax' do
 
-  context "page doesn't exist" do
+      let(:routes)  { [{ 'route' => '/posts/:_year/:month', 'page_handle' => 'posts' }] }
 
-    let(:pages) { [] }
+      it "doesn't match the route" do
+        is_expected.to eq([page, {}])
+      end
+
+    end
 
-    it { is_expected.to eq page_not_found }
+    describe 'path with a dash' do
+
+      let(:path)    { 'resources/hello-world' }
+      let(:routes)  { [{ 'route' => '/resources/:slug', 'page_handle' => 'resources' }] }
+
+      it 'returns the page based on the handle returned by the routing hash' do
+        expect(service).to receive(:by_handle).with('resources', false).and_return(page)
+        is_expected.to eq([page, { 'slug' => 'hello-world' }])
+      end
+
+
+    end
 
   end
 
-  context 'page is unpublished' do
+  describe 'a page outside the site routes' do
+
+    it { is_expected.to eq([page, {}]) }
+
+    context "page doesn't exist" do
+
+      let(:pages) { [] }
+
+      it { is_expected.to eq([page_not_found, {}]) }
+
+    end
+
+    context 'page is unpublished' do
+
+      let(:published) { false }
 
-    let(:published) { false }
+      it { is_expected.to eq([page_not_found, {}]) }
 
-    it { is_expected.to eq page_not_found }
+      context 'the live editing mode is on' do
 
-    context 'the live editing mode is on' do
+        let(:live_editing) { true }
 
-      let(:live_editing) { true }
+        it 'has to display it' do
+          is_expected.to eq([page, {}])
+        end
 
-      it 'has to display it' do
-        is_expected.to eq page
       end
 
     end