locomotivecms_steam 1.5.3 → 1.6.0.beta1

data/lib/locomotive/steam/liquid/drops/section_block.rb

@@ -10,6 +10,7 @@ module Locomotive
             @section    = section
             @block      = block || { 'settings' => {} }
             @index      = index
+            @leaves     = []
             @definition = section.definition['blocks'].find do |block|
               block['type'] == type
             end || {}
@@ -23,6 +24,18 @@ module Locomotive
             @block['type']
           end
 
+          def depth
+            @block['depth'].presence || 0
+          end
+
+          def leaves
+            @leaves
+          end
+
+          def has_leaves?
+            leaves.size > 0
+          end
+
           def settings
             @content_proxy ||= SectionContentProxy.new(
               @block['settings'] || {},

data/lib/locomotive/steam/liquid/drops/section_content_proxy.rb

@@ -18,10 +18,12 @@ module Locomotive
             return nil if value.blank?
 
             case type_of(name)
-            when 'url'          then SectionUrlField.new(*url_finder.url_for(value))
-            when 'image_picker' then SectionImagePickerField.new(value)
-            when 'integer'      then value.to_i
-            when 'text'         then url_finder.decode_urls_for(value)
+            when 'url'            then SectionUrlField.new(*url_finder.url_for(value))
+            when 'image_picker'   then SectionImagePickerField.new(value)
+            when 'asset_picker'   then SectionAssetPickerField.new(value)
+            when 'integer'        then value.to_i
+            when 'text'           then url_finder.decode_urls_for(value)
+            when 'content_entry'  then find_content_entry(name, value)
             else value
             end
           end
@@ -40,9 +42,46 @@ module Locomotive
             @context.registers[:services].url_finder
           end
 
+          def find_content_entry(name, value)
+            type_slug = setting_of(name).try(:[], 'content_type')
+            service   = @context.registers[:services].content_entry
+
+            return nil if type_slug.nil? || value.blank?
+
+            service.find(type_slug, value['id'])
+          end
+
+        end
+
+
+        class SectionAssetPickerField < ::Liquid::Drop
+
+          def initialize(url_or_attributes)
+            if url_or_attributes.is_a?(String) || url_or_attributes.blank?
+              @attributes = { url: url_or_attributes }
+            else
+              @attributes = url_or_attributes.symbolize_keys || {}
+            end
+          end
+
+          def url
+            @attributes[:url]
+          end
+
+          def size
+            @attributes[:size]
+          end
+
+          def name
+            self.url.present? ? File.basename(self.url) : nil
+          end
+          
+          def to_s
+            self.url || ''
+          end
         end
 
-        # Drop representing the valud of an image picker.
+        # Drop representing the value of an image picker.
         # It holds extra attributes like:
         # the width, height, format and cropped of the image
         class SectionImagePickerField < ::Liquid::Drop

data/lib/locomotive/steam/liquid/drops/section_editor_setting_data.rb

@@ -40,7 +40,7 @@ module Locomotive
             return false if settings.blank?
 
             text_inputs(settings).include?(id)
-          end
+          end          
 
           def text_inputs(settings)
             settings.map do |input|

data/lib/locomotive/steam/liquid/tags/concerns/path.rb

@@ -29,7 +29,7 @@ module Locomotive
               handle = @context[@handle] || @handle
 
               # is external url?
-              if handle =~ Locomotive::Steam::IsHTTP
+              if handle.to_s =~ Locomotive::Steam::IsHTTP
                 handle
               elsif page = self.retrieve_page_drop_from_handle(handle) # return a drop or model?
                 # make sure we've got the page/content entry (if templatized)

data/lib/locomotive/steam/liquid/tags/concerns/section.rb

@@ -13,7 +13,7 @@ module Locomotive::Steam::Liquid::Tags::Concerns
         )
 
         # assign an id if specified in the context
-        context['section'].id ||= context['section_id'] if context['section_id'].present?
+        context['section'].id = context['section_id'] if context['section_id'].present?
 
         begin
           _render(context, template)

data/lib/locomotive/steam/liquid/tags/section.rb

@@ -59,7 +59,12 @@ module Locomotive
           private
 
           def set_section_dom_id(context)
-            context['section_id'] = "page-#{attributes[:id] || section_type}"
+            # is the section being rendered from the section middleware?
+            if content = context.registers[:_section_content]
+              context['section_id'] = content['id'] || section_type
+            else       
+              context['section_id'] = "page-#{attributes[:id] || section_type}"
+            end
           end
 
           def find_section(context)

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

@@ -13,7 +13,10 @@ module Locomotive::Steam
         now = Time.now
 
         log "Started #{env['REQUEST_METHOD'].upcase} \"#{env['PATH_INFO']}\" at #{now}".light_white, 0
-        log "Params: #{env.fetch('steam.request').params.inspect}"
+
+        if Locomotive::Steam.configuration.mode == :test
+          log "Params: #{env.fetch('steam.request').params.inspect}"
+        end
 
         app.call(env).tap do |response|
           done_in_ms = ((Time.now - now) * 10000).truncate / 10.0

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

@@ -42,7 +42,7 @@ module Locomotive::Steam
       end
 
       def redirect_if_required(site)
-        return if env['steam.is_default_host']
+        return if env['steam.is_default_host'] || env['steam.live_editing']
 
         if redirect_to_first_domain?(site) || redirect_to_https?(site)
           klass = request.scheme == 'https' || redirect_to_https?(site) ? URI::HTTPS : URI::HTTP

data/lib/locomotive/steam/repositories/content_entry_repository.rb

@@ -241,7 +241,7 @@ module Locomotive
 
           # belongs_to
           _prepare(@fields.belongs_to) { |field, value| value_to_id(value, field.target_id) }
-
+          
           # many_to_many
           _prepare(@fields.many_to_many) { |field, value| values_to_ids(value, field.target_id) }
 
@@ -276,10 +276,10 @@ module Locomotive
         end
 
         def value_to_id(value, target_id)
+          return values_to_ids(value, target_id) if value.kind_of?(Array)
+
           _value = if value.is_a?(Hash)
             value['_id'] || value[:_id]
-          elsif value.respond_to?(:each) # array
-            values_to_ids(value, target_id)
           else
             value.respond_to?(:_id) ? value._id : value
           end

data/lib/locomotive/steam/repositories/content_type_field_select_option_repository.rb

@@ -19,13 +19,20 @@ module Locomotive
       end
 
       def by_name(name)
-        query { where(name: name) }.first
+        scope.with_locale(query_locale) do
+          query { where(name: name) }.first
+        end
       end
 
       def by_id_or_name(id_or_name)
         find(id_or_name) || by_name(id_or_name)
       end
 
+      def query_locale
+        # if the select field is not localized, query in the default locale of the site
+        content_type_field.localized? ? locale : scope.default_locale 
+      end
+
     end
   end
 end

data/lib/locomotive/steam/services/asset_host_service.rb

@@ -14,7 +14,7 @@ module Locomotive
 
         timestamp ||= (site.try(:template_version) || site.try(:updated_at)).to_i
 
-        return add_timestamp_suffix(source, timestamp) if source =~ Steam::IsHTTP
+        return add_timestamp_suffix(source, timestamp) if source.to_s =~ Steam::IsHTTP
 
         url = self.host ? build_url(host, source) : source
 

data/lib/locomotive/steam/services/url_finder_service.rb

@@ -74,6 +74,8 @@ module Locomotive
         when 'page'
           page_finder.find_by_id(value)
         when 'content_entry'
+          return nil if value.blank?
+
           # find the page template
           page_finder.find_by_id(value['page_id']).tap do |_page|
             entry = content_entry_finder.find(value['content_type_slug'], value['id'])

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0.alpha < 1.0.0.alpha1 < 1.0.0.beta < 1.0.0.beta2 < 1.0.0.beta11 < 1.0.0.rc1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.5.3'
+    VERSION = '1.6.0.beta1'
   end
 end

data/lib/locomotive/steam.rb

@@ -22,8 +22,8 @@ module Locomotive
 
     CONTENT_ENTRY_ENGINE_CLASS_NAME   = /^Locomotive::ContentEntry(.*)$/o.freeze
 
-    SECTIONS_SETTINGS_VARIABLE_REGEXP = /^\s*([a-z]+\.)?settings\.(?<id>.*)\s*$/o.freeze
-    SECTIONS_BLOCK_FORLOOP_REGEXP     = /(?<name>.+)-section\.blocks$/o.freeze
+    SECTIONS_SETTINGS_VARIABLE_REGEXP = /^\s*([a-z\_]+\.)?settings\.(?<id>.*)\s*$/o.freeze
+    SECTIONS_BLOCK_FORLOOP_REGEXP     = /(?<name>.+)-(section|block)\.(blocks|blocks_as_tree|leaves)$/o.freeze
     SECTIONS_LINK_TARGET_REGEXP       = /[^\"]+\/_locomotive-link\/(?<link>[^\"]+)/mo.freeze
 
     ASSET_URL_REGEXP                  = /("|')(https:\/\/[^\/]+)?\/(sites|steam)\/(\S+)("|')/.freeze

data/locomotivecms_steam.gemspec

@@ -17,22 +17,22 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake',       '~> 13.0.1'
 
-  spec.add_development_dependency 'mongo',      '~> 2.8.0'
+  spec.add_development_dependency 'mongo',      '~> 2.13.1'
   spec.add_development_dependency 'origin',     '~> 2.3.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.10.8'
-  spec.add_dependency 'sanitize',               '~> 4.6.4'
+  spec.add_dependency 'nokogiri',               '~> 1.11.0'
+  spec.add_dependency 'sanitize',               '~> 5.2.1'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.16.0'
   spec.add_dependency 'chronic',                '~> 0.10.2'
   spec.add_dependency 'bcrypt',                 '~> 3.1.11'
-  spec.add_dependency 'multi_json',             '~> 1.13.1'
+  spec.add_dependency 'multi_json',             '~> 1.15.0'
   spec.add_dependency 'liquid',                 '~> 4.0.3'
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
   spec.add_dependency 'rack-cache',             '~> 1.7.0'
   spec.add_dependency 'rack_csrf',              '~> 2.6.0'
-  spec.add_dependency 'dragonfly',              '~> 1.2.0'
+  spec.add_dependency 'dragonfly',              '>= 1.2', '< 1.5'
   spec.add_dependency 'moneta',                 '~> 1.0.0'
 
   spec.add_dependency 'sprockets',              '~> 3.7.1'
@@ -42,14 +42,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'compass',                '~> 1.0.3'
   spec.add_dependency 'autoprefixer-rails',     '~> 8.0.0'
 
-  spec.add_dependency 'kramdown',               '~> 1.16.2'
+  spec.add_dependency 'kramdown',               '~> 2.3.0'
   spec.add_dependency 'RedCloth',               '~> 4.3.2'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
-  spec.add_dependency 'mime-types',             '~> 3.1.0'
+  spec.add_dependency 'mime-types',             '~> 3.3.0'
   spec.add_dependency 'duktape',                '~> 2.0.1.1'
   spec.add_dependency 'pony',                   '~> 1.12'
 
   spec.add_dependency 'locomotivecms_common',   '~> 0.4.0'
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = ['>= 2.5', '< 3']
 end

data/script/ci/before_build.sh

@@ -2,3 +2,4 @@
 echo 'America/Chicago' | sudo tee /etc/timezone
 sudo dpkg-reconfigure --frontend noninteractive tzdata
 date
+mongo --version

data/spec/integration/adapters/mongodb_spec.rb

@@ -32,12 +32,12 @@ describe Locomotive::Steam::MongoDBAdapter do
 
     subject { described_class.disconnect_session }
 
-    it { is_expected.to eq nil }
-
     it 'closes clients' do
-      10.times { connection['locomotive_sites'].find.count }
-      subject
-      expect(current_connections).to eq @before_connections
+      10.times { connection['locomotive_sites'].find.count }      
+      @before_connections = current_connections
+      is_expected.to eq true
+      sleep(2) # NOTE: wait for the connections to be completely closed
+      expect(current_connections).to be < @before_connections
     end
 
   end

data/spec/integration/liquid/drops/content_types_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+require_relative '../../../../lib/locomotive/steam/adapters/filesystem.rb'
+require_relative '../../../../lib/locomotive/steam/adapters/mongodb.rb'
+
+describe Locomotive::Steam::Liquid::Drops::ContentTypes do
+
+  describe 'access a content type through a variable' do
+
+    let(:source) { <<-EOF
+  {% assign myContentType = 'songs' %}
+  {% for song in contents[myContentType] %}
+    <span>{{ song.title }}</span>
+  {% endfor %}
+  EOF
+    }
+
+    let(:page)      { nil }
+    let(:site)      { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }
+    let(:services)  { Locomotive::Steam::Services.build_instance }
+    let(:assigns)   { { 'contents' => Locomotive::Steam::Liquid::Drops::ContentTypes.new, 'fullpath' => '/', 'current_page' => page } }
+    let(:context)   { ::Liquid::Context.new(assigns, {}, { services: services }) }
+
+    before {
+      services.locale = :en
+      services.repositories.adapter       = adapter
+      services.repositories.current_site  = site
+    }
+
+    subject { render_template(source, context) }
+
+    shared_examples_for 'listing content entries of a dynamic content type' do
+
+      it { is_expected.to match /<span>Song #1<\/span>/ }
+
+    end
+
+    context 'Filesystem' do
+
+      it_should_behave_like 'listing content entries of a dynamic content type' do
+
+        let(:site_id)   { 1 }
+        let(:adapter)   { Locomotive::Steam::FilesystemAdapter.new(default_fixture_site_path) }
+
+      end
+
+    end
+
+    context 'MongoDB' do
+
+      it_should_behave_like 'listing content entries of a dynamic content type' do
+
+        let(:site_id)   { mongodb_site_id }
+        let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: mongodb_database, hosts: ['127.0.0.1:27017']) }
+
+      end
+
+    end
+
+  end
+
+end

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -70,6 +70,11 @@ describe Locomotive::Steam::ContentEntryRepository do
     describe 'filter by a select field' do
       subject { repository.all(kind: 'grunge') }
       it { expect(subject.map { |entry| entry[:name] }).to eq(['Alice in Chains', 'Pearl Jam']) }
+
+      context 'switching to a different locale' do
+        let(:locale) { 'fr' }
+        it { expect(subject.map { |entry| entry[:name] }).to eq(['Alice in Chains', 'Pearl Jam']) }        
+      end
     end
 
     describe 'filter by a belongs_to field' do

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Drops::SectionBlock do
+
+  let(:section) { instance_double('Section', definition: { 'blocks' => [] }) }
+  let(:block) { instance_double('block') }
+  let(:index) { 0 }
+  let(:drop) { described_class.new(section, block, index) }
+
+  describe '#has_leaves?' do
+
+    subject { drop.has_leaves? }
+
+    it { is_expected.to eq false }
+
+    context 'the block has leaves' do
+
+      before { drop.leaves << instance_double('SectionBlock') }
+
+      it { is_expected.to eq true }
+
+    end
+
+  end
+
+end

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

@@ -2,8 +2,9 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Drops::SectionContentProxy do
 
-  let(:url_finder_service) { instance_double('UrlFinderService') }
-  let(:services)  { instance_double('Services', url_finder: url_finder_service) }
+  let(:url_finder_service)    { instance_double('UrlFinderService') }
+  let(:content_entry_service) { instance_double('ContentEntryService') }
+  let(:services)  { instance_double('Services', url_finder: url_finder_service, content_entry: content_entry_service) }
   let(:site)      { instance_double('Site', default_locale: 'en') }
   let(:context)   { ::Liquid::Context.new({}, {}, { locale: 'en', services: services, site: site }) }
   let(:drop)      { described_class.new(content, settings).tap { |d| d.context = context } }
@@ -97,6 +98,30 @@ describe Locomotive::Steam::Liquid::Drops::SectionContentProxy do
 
   end
 
+  describe 'content entry picker' do
+
+    let(:settings)  { [{ 'id' => 'article', 'type' => 'content_entry', 'content_type' => 'articles' }] }
+    let(:value)     { nil }
+    let(:content)   { { 'article' => value } }
+
+    subject { drop.liquid_method_missing(:article) }
+
+    it { is_expected.to eq nil }
+
+    context 'an id to a content entry has been passed' do
+
+      let(:article) { instance_double('Article', title: 'Hello world!') }
+      let(:value)   { { 'id' => '42' } }
+
+      it 'calls the content_entry service to fetch the article' do
+        expect(content_entry_service).to receive(:find).with('articles', '42').and_return(article)
+        expect(subject.title).to eq('Hello world!')
+      end
+
+    end
+
+  end
+
   describe 'image picker type setting' do
 
     let(:settings)    { [{ 'id' => 'image', 'type' => 'image_picker' }] }
@@ -144,4 +169,38 @@ describe Locomotive::Steam::Liquid::Drops::SectionContentProxy do
 
   end
 
+  describe 'asset picker type setting' do
+
+    let(:settings)    { [{ 'id' => 'file', 'type' => 'asset_picker' }] }
+    let(:value)       { nil }
+    let(:content)     { { 'file' => value } }
+    let(:page)        { instance_double('Page') }
+    let(:asset_drop)  { drop.liquid_method_missing(:file) }
+
+    subject { asset_drop.to_s }
+    it { is_expected.to eq '' }
+
+    context 'the asset is a string' do
+      let(:value) { '/foo/bar/specs.pdf' }
+      it { is_expected.to eq('/foo/bar/specs.pdf') }
+    end
+
+    context 'the asset is a hash' do
+      let(:value) { { url: '/foo/specs.pdf', size: 30 } }
+      it { is_expected.to eq('/foo/specs.pdf') }
+      it 'has access to size and name of the asset' do
+        expect(asset_drop.url).to eq('/foo/specs.pdf')
+        expect(asset_drop.name).to eq('specs.pdf')
+        expect(asset_drop.size).to eq(30)
+      end
+    end
+
+    context 'the asset is nil' do
+      let(:value) { nil }
+      subject { asset_drop }
+      it { is_expected.to eq nil }
+    end
+
+  end
+
 end