locomotivecms_steam 1.4.1 → 1.5.0.beta1

data/spec/unit/middlewares/private_access_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/private_access'
 
 describe Locomotive::Steam::Middlewares::PrivateAccess do

data/spec/unit/middlewares/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/redirection'
 
 describe Locomotive::Steam::Middlewares::Redirection do

data/spec/unit/middlewares/renderer_spec.rb

@@ -1,7 +1,8 @@
 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/concerns/liquid_context'
 require_relative '../../../lib/locomotive/steam/middlewares/renderer'
 
 describe Locomotive::Steam::Middlewares::Renderer do

data/spec/unit/middlewares/section_spec.rb

@@ -0,0 +1,70 @@
+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/concerns/liquid_context'
+require_relative '../../../lib/locomotive/steam/middlewares/section'
+
+describe Locomotive::Steam::Middlewares::Section do
+
+  let(:app)             { ->(env) { [200, env, 'app'] }}
+  let(:url)             { 'http://example.com/foo/bar' }
+  let(:env)             { env_for(url, 'steam.site' => site) }
+
+  let(:site_drop)       { liquid_instance_double('SiteDrop', sections_content: { 'header' => { 'settings' => { 'name' => 'this should not be rendered in middleware' } } }) }
+  let(:page_drop)       { liquid_instance_double('PageDrop', sections_content: { 'header' => { 'settings' => { 'name' => 'this should not be rendered in middleware' } } }) }
+  let(:site)            { instance_double('Site', default_locale: 'en', locales: ['en'], to_liquid: site_drop) }
+  let(:page)            { instance_double('Page', default_locale: 'en', locales: ['en'], to_liquid: page_drop) }
+  let(:section)         { instance_double('Section', type: 'header', definition: {}, liquid_source: 'Here some {{ section.settings.name }}') }
+  let(:section_finder)  { instance_double('SectionFinderService') }
+  let(:repositories)    { instance_double('Repositories')}
+
+  let(:services)        { instance_double(
+                          'Services',
+                          section_finder: section_finder,
+                          repositories: repositories,
+                          locale: 'en')
+                        }
+
+  before do
+    env['steam.page']           = page
+    env['steam.services']       = services
+    env['steam.locale']         = :en
+    env['steam.liquid_assigns'] = {}
+    env['steam.request']        = Rack::Request.new(env)
+    env['steam.request'].add_header('HTTP_LOCOMOTIVE_SECTION_TYPE', 'header')
+    allow(section_finder).to receive(:find).with('header').and_return(section)
+  end
+
+  subject do
+    middleware = described_class.new(app)
+    middleware.call(env)
+  end
+
+  it 'renders the HTML code related to the 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">Here some </div>)]
+    ]
+  end
+
+  context "the content of the section is in the request body" do
+
+    before do
+      allow(env['steam.request']).to receive(:body).and_return(StringIO.new(
+        %({ "section_content": { "id": "site-header", "settings": { "name": "modified HTML" } } })
+      ))
+    end
+
+    it 'renders the HTML code related to the 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">Here some modified HTML</div>)]
+      ]
+    end
+
+  end
+
+end

data/spec/unit/middlewares/site_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/site'
 
 describe Locomotive::Steam::Middlewares::Site do

data/spec/unit/middlewares/sitemap_spec.rb

@@ -1,14 +1,14 @@
 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/sitemap'
 
 describe Locomotive::Steam::Middlewares::Sitemap do
 
   let(:site)            { instance_double('Site', locales: ['en', 'fr'], default_locale: 'en') }
   let(:pages)           { [] }
-  let(:page_repository) { instance_double('PageRepository', published: pages) }
+  let(:page_repository) { instance_double('PageRepository', published: pages, :locale= => 'en') }
   let(:app)             { ->(env) { [200, env, 'app'] }}
   let(:middleware)      { described_class.new(app) }
 
@@ -26,7 +26,7 @@ describe Locomotive::Steam::Middlewares::Sitemap do
     describe 'no pages' do
 
       it 'renders a blank sitemap' do
-        is_expected.to eq [200, { "Content-Type"=>"text/plain" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n  <url>\n    <loc>http://localhost/</loc>\n    <priority>1.0</priority>\n  </url>\n\n</urlset>\n"]]
+        is_expected.to eq [200, { "Content-Type"=>"text/plain" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n\n</urlset>\n"]]
       end
 
     end
@@ -36,45 +36,7 @@ describe Locomotive::Steam::Middlewares::Sitemap do
       let(:pages) { [instance_double('Page', index?: false, not_found?: false, layout?: true)] }
 
       it 'renders a blank sitemap' do
-        is_expected.to eq [200, { "Content-Type"=>"text/plain" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n  <url>\n    <loc>http://localhost/</loc>\n    <priority>1.0</priority>\n  </url>\n\n</urlset>\n"]]
-      end
-
-    end
-
-    describe '#build_templatized_page_xml?' do
-
-      let(:localized)     { true }
-      let(:source)        { '<h1>{{ post.title }}</h1>' }
-      let(:page)          { instance_double('TemplatePage', source: source) }
-      let(:content_type)  { instance_double('Post', localized?: localized) }
-      let(:locale)        { 'fr' }
-
-      subject { middleware.send(:build_templatized_page_xml?, page, content_type, locale) }
-
-      it { is_expected.to eq true }
-
-      context 'current locale is equals to the site default locale' do
-
-        let(:locale) { 'en' }
-
-        it { is_expected.to eq true }
-
-      end
-
-      context 'the content type is not localized' do
-
-        let(:localized) { false }
-
-        it { is_expected.to eq true }
-
-        context 'the page has the same liquid template in all the locales' do
-
-          let(:source) { '' }
-
-          it { is_expected.to eq false }
-
-        end
-
+        is_expected.to eq [200, { "Content-Type"=>"text/plain" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n\n</urlset>\n"]]
       end
 
     end

data/spec/unit/middlewares/url_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/url_redirection'
 
 describe Locomotive::Steam::Middlewares::UrlRedirection do

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -240,35 +240,35 @@ describe Locomotive::Steam::ContentEntryRepository do
       let(:fields) do
         {
           title:    instance_double('TitleField', name: :title, type: :string),
-          category: instance_double('SelectField', name: :category, type: :select, select_options: { en: ['cooking', 'bread'], fr: ['cuisine', 'pain'] })
+          category: instance_double('SelectField', name: :category, type: :select, localized: true, select_options: [])
         }
       end
-      let(:type) { build_content_type('Articles', order_by: '_position asc', label_field_name: :title, localized_names: [:title, :category], fields: _fields, fields_by_name: fields, fields_with_default: []) }
+      let(:type) { build_content_type('Articles', order_by: '_position asc', label_field_name: :title, localized_names: [:title, :category_id], fields: _fields, fields_by_name: fields, fields_with_default: []) }
       let(:name) { :category }
 
       let(:options) {
         [
-          instance_double('SelectOption1', name: 'cooking'),
-          instance_double('SelectOption2', name: 'wine'),
-          instance_double('SelectOption3', name: 'bread')
+          instance_double('SelectOption1', _id: 0, name: instance_double('I18nField', :[] => 'cooking', translations: { 'en' => 'cooking' })),
+          instance_double('SelectOption2', _id: 1, name: instance_double('I18nField', :[] => 'wine', translations: { 'en' => 'wine' })),
+          instance_double('SelectOption3', _id: 2, name: instance_double('I18nField', :[] => 'bread', translations: { 'en' => 'bread' }))
         ]
       }
 
       let(:entries) do
         [
-          { content_type_id: 1, _position: 0, _label: 'Recipe #1', category_id: 'cooking' },
-          { content_type_id: 1, _position: 1, _label: 'Recipe #2', category_id: 'bread' },
-          { content_type_id: 1, _position: 2, _label: 'Recipe #3', category_id: 'bread' },
-          { content_type_id: 1, _position: 3, _label: 'Recipe #4', category_id: 'unknown' }
+          { content_type_id: 1, _position: 0, _label: 'Recipe #1', category_id: { 'en' => 0 } },
+          { content_type_id: 1, _position: 1, _label: 'Recipe #2', category_id: { 'en' => 2 } },
+          { content_type_id: 1, _position: 2, _label: 'Recipe #3', category_id: { 'en' => 2 } },
+          { content_type_id: 1, _position: 3, _label: 'Recipe #4', category_id: { 'en' => 42 } } # unknown category
         ]
       end
 
       before {
         allow(content_type_repository).to receive(:select_options).and_return(options)
-        %w(cooking wine bread).each_with_index do |name, i|
-          allow(fields[:category].select_options).to receive(:find).with(name).and_return(options.at(i))
+        %w(cooking wine bread).each_with_index do |name, position|
+          allow(fields[:category].select_options).to receive(:find).with(position).and_return(options.at(position))
         end
-        allow(fields[:category].select_options).to receive(:find).with('unknown').and_return(nil)
+        allow(fields[:category].select_options).to receive(:find).with(42).and_return(nil)
       }
 
       it { expect(subject.size).to eq 4 }
@@ -384,7 +384,7 @@ describe Locomotive::Steam::ContentEntryRepository do
 
       let(:value)       { 'CMS' }
       let(:option)      { instance_double('Option', _id: 42)}
-      let(:options)     { instance_double('OptionRepository', by_name: option) }
+      let(:options)     { instance_double('OptionRepository', by_name: option, :'locale=' => nil) }
       let(:field)       { instance_double('SelectField', name: 'category', persisted_name: 'category_id', select_options: options) }
       let(:_fields)     { instance_double('Fields', selects: [field], belongs_to: [], many_to_many: [], dates_and_date_times: []) }
       let(:conditions)  { { 'category' => value } }

data/spec/unit/repositories/section_repository_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require_relative '../../../lib/locomotive/steam/adapters/filesystem.rb'
+
+describe Locomotive::Steam::SectionRepository do
+
+  #TODO: site_id should not be passed like this
+  #TODO: template_path should be shorter
+  let(:sections)    { [{ name: 'Header', slug: 'header', site_id: 1, template_path: 'spec/fixtures/default/app/views/sections/header.liquid'  }] }
+  let(:locale)      { :en }
+  let(:site)        { instance_double('Site', _id: 1, default_locale: :en, locales: [:en, :fr]) }
+  let(:adapter)     { Locomotive::Steam::FilesystemAdapter.new(nil) }
+  let(:repository)  { described_class.new(adapter, site, locale) }
+
+  before do
+    allow(adapter).to receive(:collection).and_return(sections)
+    adapter.cache = NoCacheStore.new
+  end
+
+  describe '#by_slug' do
+
+    let(:name) { nil }
+    subject { repository.by_slug(name) }
+
+    it { is_expected.to eq nil }
+
+    context 'existing section' do
+
+      let(:name) { 'header' }
+      subject { repository.by_slug(name) }
+      it { expect(subject).to_not be_nil }
+      it { expect(subject.class).to eq Locomotive::Steam::Section }
+      it { expect(subject.name).to eq 'Header' }
+      it { expect(subject[:template_path]).to eq 'spec/fixtures/default/app/views/sections/header.liquid' }
+
+    end
+  end
+end
+

data/spec/unit/repositories/snippet_repository_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require_relative '../../../lib/locomotive/steam/adapters/filesystem.rb'
 
 describe Locomotive::Steam::SnippetRepository do
@@ -31,7 +30,5 @@ describe Locomotive::Steam::SnippetRepository do
       it { expect(subject[:template_path][:fr]).to eq 'simple.yml' }
 
     end
-
   end
-
 end

data/spec/unit/services/action_service_spec.rb

@@ -16,7 +16,8 @@ describe Locomotive::Steam::ActionService do
     let(:params)  { {} }
     let(:assigns) { {} }
     let(:session) { {} }
-    let(:context) { ::Liquid::Context.new(assigns, {}, { session: session }) }
+    let(:cookies) { {} }
+    let(:context) { ::Liquid::Context.new(assigns, {}, { session: session, cookies: cookies }) }
 
     subject { service.run(script, params, context) }
 
@@ -112,6 +113,23 @@ describe Locomotive::Steam::ActionService do
 
       end
 
+      describe 'getCookiesProp' do
+
+        let(:cookies) { { 'name' => 'John' } }
+        let(:script) { "return getCookiesProp('name');" }
+
+        it { is_expected.to eq 'John' }
+
+      end
+
+      describe 'sendCookiesProp' do
+
+        let(:script) { "return setCookiesProp('done', true);" }
+
+        it { subject; expect(cookies['done']).to eq 'true' }
+
+      end
+
       describe 'allEntries' do
 
         let(:now)     { Time.use_zone('America/Chicago') { Time.zone.local(2015, 'mar', 25, 10, 0) } }

data/spec/unit/services/asset_host_service_spec.rb

@@ -66,6 +66,14 @@ describe Locomotive::Steam::AssetHostService do
 
     end
 
+    describe 'but without a trailing /' do
+
+      let(:host) { 'https://storage.googleapis.com/locomotive-station' }
+      let(:source) { '/sites/42/assets/1/banner.png' }
+      it { is_expected.to eq 'https://storage.googleapis.com/sites/42/assets/1/banner.png' }
+
+    end
+
   end
 
   describe 'the host is a string' do

data/spec/unit/services/parent_finder_service_spec.rb

@@ -35,7 +35,6 @@ describe Locomotive::Steam::ParentFinderService do
       it { is_expected.to eq 'Index' }
 
     end
-
   end
-
 end
+

data/spec/unit/services/section_finder_service_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::SectionFinderService do
+
+  let(:repository)  { instance_double('SectionRepository') }
+  let(:site)        { instance_double('Site', _id: 1, default_locale: :en, locales: [:en, :fr]) }
+  let(:section)     { instance_double('Section') }
+  let(:slug)        { 'header' }
+
+  let(:finder) { described_class.new(repository) }
+
+  before do
+    allow(repository).to receive(:by_slug).and_return(section)
+    allow(repository).to receive(:locale).and_return(:en)
+    allow(repository).to receive(:site).and_return(site)
+    allow(section).to receive(:localized_attributes).and_return(nil)
+  end
+
+  describe '#find' do
+
+    subject { finder.find(slug) }
+
+    it { is_expected.to eq(section) }
+
+  end
+
+end
+

data/spec/unit/services/url_builder_service_spec.rb

@@ -4,16 +4,16 @@ describe Locomotive::Steam::UrlBuilderService do
 
   let(:prefix_default)  { false }
   let(:mounted_on)      { nil }
-  let(:request)         { instance_double('Request', env: { 'steam.mounted_on' => mounted_on }) }
   let(:site)            { instance_double('Site', default_locale: 'en', prefix_default_locale: prefix_default) }
-  let(:locale)          { 'en' }
-  let(:service)         { described_class.new(site, locale, request) }
+  let(:current_locale)  { 'en' }
+  let(:locale)          { nil }
+  let(:service)         { described_class.new(site, current_locale, mounted_on) }
 
   describe '#url_for' do
 
     let(:page) { instance_double('AboutUs', fullpath: 'about-us', templatized?: false) }
 
-    subject { service.url_for(page) }
+    subject { service.url_for(page, locale) }
 
     it { is_expected.to eq '/about-us' }
 
@@ -37,6 +37,16 @@ describe Locomotive::Steam::UrlBuilderService do
 
     end
 
+    describe 'asking for the index page url in the defaut locale when the current locale is different from the default one' do
+
+      let(:current_locale)  { 'fr' }
+      let(:locale)          { 'en' }
+      let(:page)            { instance_double('index', fullpath: 'index', templatized?: false) }
+
+      it { is_expected.to eq '/en' }
+
+    end
+
     describe 'no need to put the index slug' do
 
       let(:page) { instance_double('Index', fullpath: 'index', templatized?: false) }

data/spec/unit/services/url_finder_service_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::UrlFinderService do
+
+  let(:url_builder)           { instance_double('UrlBuilder') }
+  let(:page_finder)           { instance_double('PageFinder') }
+  let(:content_entry_finder)  { instance_double('ContentEntryFinder') }
+  let(:service) { described_class.new(url_builder, page_finder, content_entry_finder) }
+
+  describe '#url_for' do
+
+    subject { service.url_for(value) }
+
+    context 'value is an url' do
+
+      let(:value) { 'https://www.locomotivecms.com' }
+      it { is_expected.to eq(['https://www.locomotivecms.com', false]) }
+
+    end
+
+    context 'value is a link to an external site' do
+
+      let(:value) { { 'type' => '_external', 'value' => 'https://www.locomotivecms.com', 'new_window' => true } }
+      it { is_expected.to eq(['https://www.locomotivecms.com', true]) }
+
+    end
+
+    context 'value is a link to a page' do
+
+      let(:page)  { instance_double('Page') }
+      let(:value) { { 'type' => 'page', 'value' => 42, 'new_window' => true } }
+
+      context 'the page exists' do
+
+        before do
+          expect(page_finder).to receive(:find_by_id).with(42).and_return(page)
+          expect(url_builder).to receive(:url_for).with(page).and_return('/')
+        end
+
+        it { is_expected.to eq(['/', true]) }
+
+      end
+
+      context "the page doesn't exist" do
+
+        before do
+          expect(page_finder).to receive(:find_by_id).with(42).and_return(nil)
+          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', true]) }
+
+      end
+
+
+    end
+
+    context 'value is a link to a content entry' do
+
+      let(:entry) { instance_double('Product') }
+      let(:page)  { instance_double('Page', :content_entry= => true) }
+      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
+
+  end
+
+  describe '#decode_url_for' do
+
+    let(:value) { 'eyJ0eXBlIjoiX2V4dGVybmFsIiwidmFsdWUiOiJodHRwczovL3d3dy5ub2NvZmZlZS5mciIsImxhYmVsIjpbImV4dGVybmFsIiwiaHR0cHM6Ly93d3cubm9jb2ZmZWUuZnIiXX0=' }
+    subject { service.decode_url_for(value) }
+
+    it { is_expected.to eq(['https://www.nocoffee.fr', false]) }
+
+  end
+
+  describe '#decode_urls_for' do
+
+    let(:value) { 'eyJ0eXBlIjoiX2V4dGVybmFsIiwidmFsdWUiOiJodHRwczovL3d3dy5ub2NvZmZlZS5mciIsImxhYmVsIjpbImV4dGVybmFsIiwiaHR0cHM6Ly93d3cubm9jb2ZmZWUuZnIiXX0=' }
+    let(:text)  { %(<a href="//locomotive/_locomotive-link/#{value}">My Link</a>) }
+    subject     { service.decode_urls_for(text) }
+
+    it { is_expected.to eq('<a href="https://www.nocoffee.fr">My Link</a>') }
+
+  end
+
+end