locomotivecms_steam 1.5.0.beta2 → 1.5.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612050310b274060e06a38a72ec026c69b071f3166d6453e2d7f4a8242a3cda1
-  data.tar.gz: 5d92a727d6a162872eddd102d560e0c7840a7fc5142a12907f19411e07793955
+  metadata.gz: bd4a12f87c87fc5603766c1b2358615b820c4c74a1de3808afc1446289883337
+  data.tar.gz: e1c94bb3d492bd893409cd491fb74093666958286544a6f7bea749d5786ae508
 SHA512:
-  metadata.gz: e9be228b111d043a33b745dcc7bdf7408cf3651d377183394d7c779067186c0e064f0fed97e66cceceeb791b8b1eeebc61af4e959342b0c6975e5720cf8a7ea7
-  data.tar.gz: cc472030e4d96fcd1ca0ef278fb8f9d4a58a502db6a06fad8d1ea1f733272329e057cbe57effa8d18cdb78ffa3bc14d1113181d7ed276d8266d97a65885ffd29
+  metadata.gz: 4413660fd7eb9284d6c92b88830864e7507d8757f1edc198628131c889d48c5373c68e54749b6c15b1964d19536215d7e7247344bd8784cd1aae7c48f48f5afc
+  data.tar.gz: 2ef38c06b49efc2a5e3923db8935c5483618baf62f0f38699139aa339b29dbc05995eecbb7333ccca32ae20f1954dd9d535ee14cffab5fa0907516d2a3987295

data/Gemfile.lock

@@ -12,14 +12,14 @@ GIT
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.5.0.beta2)
+    locomotivecms_steam (1.5.0.beta3)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
-      dragonfly (~> 1.1.4)
+      dragonfly (~> 1.2.0)
       duktape (~> 1.6.1.0)
       httparty (~> 0.16.0)
       kramdown (~> 1.16.2)
@@ -44,18 +44,18 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     attr_extras (5.2.0)
     autoprefixer-rails (8.0.0)
       execjs
     bcrypt (3.1.12)
-    bson (4.3.0)
+    bson (4.4.2)
     chronic (0.10.2)
     chunky_png (1.3.11)
     codeclimate-test-reporter (0.4.8)
@@ -77,7 +77,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     coveralls (0.8.22)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -87,27 +87,27 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     docile (1.3.1)
-    dragonfly (1.1.5)
+    dragonfly (1.2.0)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
     duktape (1.6.1.0)
     execjs (2.7.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     flamegraph (0.9.5)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    httparty (0.16.3)
+    httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.1.0)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     i18n-spec (0.6.0)
       iso
     iso (0.2.2)
       i18n
-    json (2.1.0)
+    json (2.2.0)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
@@ -117,7 +117,7 @@ GEM
       locomotivecms-liquid (~> 4.0.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    memory_profiler (0.9.11)
+    memory_profiler (0.9.12)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
@@ -136,11 +136,11 @@ GEM
     nokogumbo (1.5.0)
       nokogiri
     origin (2.3.1)
-    pony (1.12)
+    pony (1.13)
       mail (>= 2.0)
     public_suffix (3.0.3)
     puma (3.12.0)
-    rack (2.0.5)
+    rack (2.0.6)
     rack-cache (1.7.2)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
@@ -150,10 +150,10 @@ GEM
       rack (>= 1.0, < 3)
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -181,15 +181,15 @@ GEM
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stackprof (0.2.12)
-    stringex (2.8.4)
+    stringex (2.8.5)
     temple (0.8.0)
-    term-ansicolor (1.6.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.9.1)
-    tins (1.16.3)
+    tins (1.20.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
@@ -199,7 +199,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16.1)
   codeclimate-test-reporter (~> 0.4.7)
   coveralls (~> 0.8.1)
   flamegraph
@@ -223,4 +222,4 @@ RUBY VERSION
    ruby 2.5.0p0
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/lib/locomotive/steam/adapters/filesystem/sanitizers/content_entry.rb

@@ -10,6 +10,10 @@ module Locomotive::Steam
           def apply_to_entity(entity)
             super
             add_label(entity)
+
+            locales.each do |locale|
+              set_automatic_translations(entity, locale)
+            end
           end
 
           def apply_to_dataset(dataset)
@@ -23,6 +27,7 @@ module Locomotive::Steam
             # Note: this statement attaches the site to the entity
             apply_to_entity(entity)
 
+
             # make sure it gets an unique slug and an _id + set default values
             _apply_to_dataset(entity, dataset)
           end
@@ -57,6 +62,15 @@ module Locomotive::Steam
             end
           end
 
+          def set_automatic_translations(entity, locale)
+            return if locale == default_locale
+
+            entity.localized_attributes.each do |(name, _)|
+              next if entity[name].blank?
+              entity[name][locale] ||= entity[name][default_locale]
+            end
+          end
+
           def set_default_values(entity)
             each_field_with_default(entity) do |field|
               name  = field.type == 'select' ? "#{field.name}_id" : field.name

data/lib/locomotive/steam/adapters/filesystem/sanitizers/page.rb

@@ -10,7 +10,7 @@ module Locomotive::Steam
           def setup(scope)
             super.tap do
               @ids, @parent_ids, @templatized_ids = {}, {}, {}
-              @localized      = locales.inject({}) { |m, l| m[l] = {}; m }
+              @localized = locales.inject({}) { |m, l| m[l] = {}; m }
             end
           end
 
@@ -91,7 +91,7 @@ module Locomotive::Steam
           end
 
           def set_automatic_translations(page, locale)
-            return if locale == self.locale
+            return if locale == default_locale
 
             if page[:template_path][locale].blank?
               %i(

data/lib/locomotive/steam/adapters/memory/query.rb

@@ -38,6 +38,7 @@ module Locomotive::Steam
 
         def order_by(*args)
           @sorting = Order.new(*args)
+          self
         end
 
         def limit(num)

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

@@ -13,6 +13,10 @@ module Locomotive
             Param.new(@_params[meth.to_s])
           end
 
+          def unsafe
+            @_params
+          end
+
           def as_json
             @_params.as_json
           end

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

@@ -38,6 +38,10 @@ module Locomotive
             @section.definition['class']
           end
 
+          def anchor
+            @content['anchor'] || id
+          end
+
           def blocks
             (@content['blocks'] || []).each_with_index.map do |block, index|
               SectionBlock.new(@section, block, index)

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

@@ -36,11 +36,12 @@ module Locomotive::Steam::Liquid::Tags::Concerns
       # we need the section_css_class once
       context.scopes.last.delete('section_css_class')
 
+      anchor_id = %(id="#{section.anchor}-section")
       tag_id    = %(id="locomotive-section-#{section.id}")
       tag_class = %(class="#{['locomotive-section', section.css_class, css_class].compact.join(' ')}")
       tag_data  = %(data-locomotive-section-type="#{section.type}")
 
-      %(<div #{tag_id} #{tag_class} #{tag_data}>#{html}</div>)
+      %(<div #{tag_id} #{tag_class} #{tag_data}><span #{anchor_id}></span>#{html}</div>)
     end
 
     # in order to enable string/text synchronization with the editor:

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

@@ -21,7 +21,7 @@ module Locomotive
 
               next if section.nil? # the section doesn't exist anymore?
 
-              # assign a new dom_id to the section
+              # assign a new dom_id to the section if it doesn't have one
               content['id'] = "dropzone-#{index}"
 
               # parse the template of the section

data/lib/locomotive/steam/middlewares/concerns/helpers.rb

@@ -14,7 +14,13 @@ module Locomotive::Steam
         end
 
         def render_response(content, code = 200, type = nil)
-          @next_response = [code, { 'Content-Type' => type || 'text/html' }, [content]]
+          _headers = env['steam.headers'] || {}
+
+          @next_response = [
+            code,
+            { 'Content-Type' => type || 'text/html' }.merge(_headers),
+            [content]
+          ]
         end
 
         def redirect_to(location, type = 301)

data/lib/locomotive/steam/middlewares/concerns/liquid_context.rb

@@ -80,7 +80,7 @@ module Locomotive::Steam
 
         def _http_actions_liquid_assigns
           {
-            'head?'    => request.head?,
+            'head?'   => request.head?,
             'get?'    => request.get?,
             'post?'   => request.post?,
             'put?'    => request.put?,

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

@@ -57,7 +57,7 @@ module Locomotive::Steam
           locale = $1
 
           # no need to keep the locale in the path used to fetch the page
-          env['steam.path'] = path.gsub($1 + $2, '')
+          env['steam.path'] = path.gsub(/^\/#{$1 + $2}/, '/')
           env['steam.locale_in_path'] = true
 
           log 'Locale extracted from the path'

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

@@ -16,7 +16,7 @@ module Locomotive::Steam
             log "Found page \"#{page.title}\" [#{page.fullpath}]"
           else
             ActiveSupport::Notifications.instrument('steam.render.page_not_found', path: path, locale: locale, default_locale: default_locale)
-            log "Page not found, rendering the 404 page.".magenta
+            log "Page not found (#{path.inspect}), rendering the 404 page.".magenta
           end
         end
 

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

@@ -1,18 +1,16 @@
 module Locomotive::Steam
   module Middlewares
 
-    class Robots
+    class Robots < ThreadSafe
 
       include Concerns::Helpers
 
-      attr_accessor_initialize :app
-
-      def call(env)
+      def _call
         if env['PATH_INFO'] == '/robots.txt'
           site = env['steam.site']
           render_response(site[:robots_txt] || '', 200, 'text/plain')
         else
-          app.call(env)
+          self.next
         end
       end
 

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

@@ -61,6 +61,14 @@ module Locomotive
         first { where(conditions) }
       end
 
+      def first(&block)
+        all({}, &block).first
+      end
+
+      def last(&block)
+        all({}, &block).last
+      end
+
       def exists?(conditions = {})
         conditions, _ = conditions_without_order_by(conditions)
         query { where(conditions) }.all.size > 0
@@ -214,6 +222,12 @@ module Locomotive
         end
 
         def prepare
+          # _id (primary key)
+          _prepare([Locomotive::Steam::ContentTypeField.new(name: '_id')]) do |_, value|
+            @target_repository.adapter.make_id(value)
+          end
+
+          # select
           _prepare(@fields.selects) do |field, value|
             # FIXME: [only in Wagon], if the user changes the locale, since all content is stored in memory,
             # we have to change the locale in the repository used to fetch the select options.
@@ -278,6 +292,8 @@ module Locomotive
         end
 
         def slug_to_id(slug, target_id)
+          return nil if slug.blank?
+
           if _repository = @target_repository.with(target_id)
             _entry = _repository.first { where(_slug: slug).only(:_id) }
             _entry.try(:_id)

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

@@ -8,6 +8,13 @@ module Locomotive
       # Entity mapping
       mapping :translations, entity: Translation
 
+      def group_by_key
+        all { only(:key, :values) }.inject({}) do |memo, translation|
+          memo[translation.key] = translation.values
+          memo
+        end
+      end
+
       def by_key(key)
         first { where(key: key) }
       end

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

@@ -19,7 +19,7 @@ module Locomotive
         if scope.blank?
           input = "#{input}_#{pluralize_prefix(options['count'])}" if options['count']
 
-          values = repository.by_key(input).try(:values) || {}
+          values = find_values_by_key(input)
 
           # FIXME: important to check if the returned value is nil (instead of nil + false)
           # false being reserved for an existing key but without provided translation)
@@ -37,6 +37,10 @@ module Locomotive
 
       private
 
+      def find_values_by_key(input)
+        (@all_values ||= repository.group_by_key)[input] || {}
+      end
+
       def _translate(string, options)
         ::Liquid::Template.parse(string).render(options)
       end

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

@@ -16,10 +16,11 @@ module Locomotive
       #   'type'        => 'page',
       #   'value'       =>  '42', # id of the home page
       #   'locale'      => 'en',
-      #   'new_window'  => true
+      #   'new_window'  => true,
+      #   'anchor'      => 'portfolio'
       # })
       #
-      # will return: ['/', true]
+      # will return: ['/#portfolio', true]
       #
       def url_for(resource)
         return [resource, false] if resource.is_a?(String)
@@ -27,8 +28,16 @@ module Locomotive
         _resource   = resource || {}
         page_or_url = find_page(_resource['type'], _resource['value']) || page_finder.find('404')
 
+        url = if page_or_url.is_a?(String)
+          page_or_url
+        elsif !page_or_url.not_found?
+          [url_builder.url_for(page_or_url), _resource['anchor'].presence].compact.join('#')
+        else
+          url_builder.url_for(page_or_url)
+        end
+
         [
-          page_or_url.is_a?(String) ? page_or_url : url_builder.url_for(page_or_url),
+          url,
           _resource['new_window'] || false
         ]
       end
@@ -59,7 +68,7 @@ module Locomotive
       # Based on the type of the resource, it returns either:
       # - a simple page
       # - a templatized page with its related content entry attached
-      # - nil if external url
+      # - the value itself if external url
       def find_page(type, value)
         case type
         when 'page'
@@ -76,6 +85,8 @@ module Locomotive
           end
         when '_external'
           value
+        when 'email'
+          "mailto:#{value}"
         else
           nil
         end

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.0.beta2'
+    VERSION = '1.5.0.beta3'
   end
 end

data/locomotivecms_steam.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',    '~> 1.16.1'
   spec.add_development_dependency 'rake',       '~> 12.3.0'
 
   spec.add_development_dependency 'mongo',      '~> 2.5.1'
@@ -32,7 +31,7 @@ Gem::Specification.new do |spec|
   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.1.4'
+  spec.add_dependency 'dragonfly',              '~> 1.2.0'
   spec.add_dependency 'moneta',                 '~> 1.0.0'
 
   spec.add_dependency 'sprockets',              '~> 3.7.1'

data/spec/integration/liquid/filters/translate_spec.rb

@@ -52,8 +52,8 @@ describe Locomotive::Steam::Liquid::Filters::Translate do
 
   describe 'pluralization' do
 
-    let(:translation) { instance_double('Translation', values: { 'en' => '{{ name }} has {{ count }} articles' }) }
-    before { expect(translator.repository).to receive(:by_key).with('post_count_two').and_return(translation) }
+    let(:translation) { { 'en' => '{{ name }} has {{ count }} articles' } }
+    before { expect(translator.repository).to receive(:group_by_key).and_return({ 'post_count_two' => translation }) }
 
     let(:source) { "{{ 'post_count' | translate: count: 2, name: 'John' }}" }
     it { expect(subject).to eq('John has 2 articles') }

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -35,6 +35,16 @@ describe Locomotive::Steam::ContentEntryRepository do
       it { is_expected.to eq true }
     end
 
+    describe '#first' do
+      subject { repository.first }
+      it { expect(subject.name).to eq 'Alice in Chains' }
+    end
+
+    describe '#last' do
+      subject { repository.last }
+      it { expect(subject.name).to eq 'The who' }
+    end
+
     describe '#find' do
       subject { repository.find(entry_id) }
       it { expect(subject.name).to eq 'Pearl Jam' }
@@ -52,6 +62,11 @@ describe Locomotive::Steam::ContentEntryRepository do
       it { expect(subject.name).to eq 'Alice in Chains' }
     end
 
+    describe 'filter by an _id (string)' do
+      subject { repository.all(_id: entry_id.to_s) }
+      it { expect(subject.map { |entry| entry[:name] }).to eq(['Pearl Jam']) }
+    end
+
     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']) }
@@ -60,6 +75,11 @@ describe Locomotive::Steam::ContentEntryRepository do
     describe 'filter by a belongs_to field' do
       subject { target_repository.all(band: 'the-who') }
       it { expect(subject.map { |entry| entry[:title] }).to eq(['Song #5', 'Song #6']) }
+      context 'looking for a nil value and in a different locale' do
+        before { target_repository.scope.locale = :fr }
+        subject { target_repository.all(band: nil) }
+        it { expect(subject.size).to eq 2 }
+      end
     end
 
     describe '#group_by_select_option' do

data/spec/integration/repositories/translation_repository_spec.rb

@@ -16,6 +16,13 @@ describe Locomotive::Steam::TranslationRepository do
       it { expect(subject.size).to eq 8 }
     end
 
+    describe '#group_by_key' do
+      subject { repository.group_by_key }
+      it { expect(subject.keys.size).to eq 8 }
+      it { expect(subject['powered_by']).to eq({ 'en' => 'Powered by', 'fr' => 'Propulsé par' }) }
+      it { expect(subject['auth_wrong_email']).to eq({ 'en' => "Your email is unknown", 'fr' => "Votre email est inconnu" }) }
+    end
+
     describe '#by_key' do
       subject { repository.by_key('powered_by') }
       it { expect(subject.values).to eq({ 'en' => 'Powered by', 'fr' => 'Propulsé par' }) }

data/spec/integration/services/external_api_service_spec.rb

@@ -4,26 +4,34 @@ describe Locomotive::Steam::ExternalAPIService do
 
   pending 'API rate limit exceeded'
 
-  let(:service) { described_class.new }
+  if ENV['TRAVIS'].blank?
 
-  describe '#consume' do
+    let(:service) { described_class.new }
 
-    let(:url)     { 'https://api.github.com/users/did/repos' }
-    let(:options) { { format: "'json'", with_user_agent: true } }
+    describe '#consume' do
 
-    subject { service.consume(url, options) }
+      let(:url)     { 'https://api.github.com/users/did/repos' }
+      let(:options) { { format: "'json'", with_user_agent: true } }
 
-    it { expect(subject.size).to_not eq 0 }
+      subject { service.consume(url, options) }
 
-    context 'returns the status too' do
+      it { expect(subject.size).to_not eq 0 }
 
-      subject { service.consume(url, options, true) }
+      context 'returns the status too' do
 
-      it { expect(subject[:status]).to eq 200 }
-      it { expect(subject[:data].size).to_not eq 0 }
+        subject { service.consume(url, options, true) }
+
+        it { expect(subject[:status]).to eq 200 }
+        it { expect(subject[:data].size).to_not eq 0 }
+
+      end
 
     end
 
+  else
+
+    pending 'API not available in Travis'
+
   end
 
 end

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

@@ -35,4 +35,20 @@ describe Locomotive::Steam::Liquid::Drops::Params do
 
   end
 
+  describe 'gives access to the Hash object through the unsafe method' do
+
+    let(:params) { { 'foo' => 'hello', 'bar' => 'world' } }
+
+    it 'expects to respond to []' do
+      expect(drop.unsafe['foo']).to eq('hello')
+    end
+
+    it 'expects to respond to each_pair' do
+      memo = []
+      drop.unsafe.each_pair { |p| memo << p.last }
+      expect(memo.join(' ')).to eq 'hello world'
+    end
+
+  end
+
 end

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

@@ -49,13 +49,13 @@ describe Locomotive::Steam::Liquid::Tags::GlobalSection do
 
       let(:liquid_source) { %(built by <a>\n\t<strong>{{ section.settings.brand }}</strong></a>) }
 
-      it { is_expected.to eq %(Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header">built by <a>\n\t<strong data-locomotive-editor-setting="section-site-header.brand">NoCoffee</strong></a></div>) }
+      it { is_expected.to eq %(Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span>built by <a>\n\t<strong data-locomotive-editor-setting="section-site-header.brand">NoCoffee</strong></a></div>) }
 
       context 'capturing the setting in a liquid variable' do
 
         let(:liquid_source) { %({% capture brand %}<strong class="bold">{{ section.settings.brand }}</strong>{% endcapture %}built by <a>\n\t{{ brand }}</a>) }
 
-        it { is_expected.to eq %(Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header">built by <a>\n\t<strong class="bold" data-locomotive-editor-setting="section-site-header.brand">NoCoffee</strong></a></div>) }
+        it { is_expected.to eq %(Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span>built by <a>\n\t<strong class="bold" data-locomotive-editor-setting="section-site-header.brand">NoCoffee</strong></a></div>) }
 
       end
 
@@ -64,7 +64,7 @@ describe Locomotive::Steam::Liquid::Tags::GlobalSection do
 
         let(:liquid_source) { 'built by <strong>{{ section.settings.image }}</strong>' }
 
-        it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header">built by <strong>foo.png</strong></div>' }
+        it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span>built by <strong>foo.png</strong></div>' }
 
       end
 
@@ -72,7 +72,7 @@ describe Locomotive::Steam::Liquid::Tags::GlobalSection do
 
         let(:live_editing) { false }
 
-        it { is_expected.to eq %(Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header">built by <a>\n\t<strong>NoCoffee</strong></a></div>) }
+        it { is_expected.to eq %(Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span>built by <a>\n\t<strong>NoCoffee</strong></a></div>) }
 
       end
 
@@ -82,13 +82,13 @@ describe Locomotive::Steam::Liquid::Tags::GlobalSection do
 
       let(:liquid_source) { '{% for foo in section.blocks %}<a href="/">{{ foo.settings.title }}</a>{% endfor %}' }
 
-      it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><a href="/" data-locomotive-editor-setting="section-site-header-block.42.title">Home</a></div>' }
+      it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span><a href="/" data-locomotive-editor-setting="section-site-header-block.42.title">Home</a></div>' }
 
       context 'with a non text type input' do
 
         let(:liquid_source) { '{% for foo in section.blocks %}<a>{{ foo.settings.image }}</a>{% endfor %}' }
 
-        it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><a>foo.png</a></div>' }
+        it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span><a>foo.png</a></div>' }
 
       end
 
@@ -106,7 +106,7 @@ describe Locomotive::Steam::Liquid::Tags::GlobalSection do
 
       let(:liquid_source) { 'built by <strong>{{ section.settings.brand }}</strong>' }
 
-      it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header">built by <strong data-locomotive-editor-setting="section-site-header.brand">Locomotive</strong></div>' }
+      it { is_expected.to eq 'Locomotive <div id="locomotive-section-site-header" class="locomotive-section my-awesome-header" data-locomotive-section-type="header"><span id="site-header-section"></span>built by <strong data-locomotive-editor-setting="section-site-header.brand">Locomotive</strong></div>' }
 
     end
 

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

@@ -65,6 +65,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
         ' <div id="locomotive-section-page-header"'\
         ' class="locomotive-section my-awesome-header"'\
         ' data-locomotive-section-type="header">'\
+          '<span id="page-header-section"></span>'\
           'built by <a>' + %(\n\t) + '<strong data-locomotive-editor-setting="section-page-header.brand">NoCoffee</strong></a>'\
         '</div>' }
 
@@ -76,6 +77,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
           ' <div id="locomotive-section-page-header"'\
           ' class="locomotive-section my-awesome-header"'\
           ' data-locomotive-section-type="header">'\
+            '<span id="page-header-section"></span>'\
             'built by <a>' + %(\n\t) + '<strong class="bold" data-locomotive-editor-setting="section-page-header.brand">NoCoffee</strong></a>'\
           '</div>' }
 
@@ -89,6 +91,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
           ' <div id="locomotive-section-page-header"'\
           ' class="locomotive-section my-awesome-header"'\
           ' data-locomotive-section-type="header">'\
+            '<span id="page-header-section"></span>'\
             'built by <strong>foo.png</strong>'\
           '</div>' }
 
@@ -102,6 +105,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
           '<div id="locomotive-section-page-header"'\
           ' class="locomotive-section my-awesome-header"'\
           ' data-locomotive-section-type="header">'\
+            '<span id="page-header-section"></span>'\
             'built by <a>' + %(\n\t) + '<strong>NoCoffee</strong></a>'\
           '</div>' }
 
@@ -117,6 +121,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
         ' <div id="locomotive-section-page-header"'\
         ' class="locomotive-section my-awesome-header"'\
         ' data-locomotive-section-type="header">'\
+          '<span id="page-header-section"></span>'\
           '<a href="/" data-locomotive-editor-setting="section-page-header-block.42.title">Home</a>'\
         '</div>' }
 
@@ -128,6 +133,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
           ' <div id="locomotive-section-page-header"'\
           ' class="locomotive-section my-awesome-header"'\
           ' data-locomotive-section-type="header">'\
+            '<span id="page-header-section"></span>'\
             '<a>foo.png</a>'\
           '</div>' }
 
@@ -154,6 +160,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
             '<div id="locomotive-section-page-header"'\
             ' class="locomotive-section my-awesome-header"'\
             ' data-locomotive-section-type="header">'\
+              '<span id="page-header-section"></span>'\
               'built by '\
               '<strong data-locomotive-editor-setting="section-page-header.brand">'\
                 'Locomotive'\
@@ -177,6 +184,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
             '<div id="locomotive-section-page-my_header" '\
             'class="locomotive-section my-awesome-header" '\
             'data-locomotive-section-type="header">'\
+              '<span id="page-my_header-section"></span>'\
               'built by '\
               '<strong data-locomotive-editor-setting="section-page-my_header.brand">'\
                 'Locomotive'\
@@ -198,6 +206,7 @@ describe Locomotive::Steam::Liquid::Tags::Section do
             '<div id="locomotive-section-site-header" '\
             'class="locomotive-section my-awesome-header" '\
             'data-locomotive-section-type="header">'\
+              '<span id="site-header-section"></span>'\
               'built by '\
               '<strong data-locomotive-editor-setting="section-site-header.brand">'\
                 'Locomotive'\

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

@@ -30,11 +30,13 @@ describe Locomotive::Steam::Liquid::Tags::SectionsDropzone do
       let(:content) { [
         {
           type:     'hero',
+          anchor:   'hero-1',
           settings: { title: 'Hello world' },
           blocks:   []
         }.deep_stringify_keys,
         {
           type:     'slideshow',
+          anchor:   'slideshow-1',
           settings: {},
           blocks:   [{ settings: { title: 'Slide 1' } }, { settings: { title: 'Slide 2' } }]
         }.deep_stringify_keys
@@ -66,12 +68,15 @@ describe Locomotive::Steam::Liquid::Tags::SectionsDropzone do
       end
 
       it 'renders the list of sections' do
+        puts is_expected.inspect
         is_expected.to eq <<-HTML
           <div class="locomotive-sections">
             <div id="locomotive-section-dropzone-0" class="locomotive-section" data-locomotive-section-type="hero">
+              <span id="hero-1-section"></span>
               <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">
+              <span id="slideshow-1-section"></span>
               <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>

data/spec/unit/middlewares/locale_spec.rb

@@ -23,7 +23,15 @@ describe Locomotive::Steam::Middlewares::Locale do
     env['steam.request']  = Rack::Request.new(env)
     env['steam.services'] = services
     code, env = middleware.call(env)
-    [env['steam.locale'], session['steam-locale']&.to_sym]
+    [env['steam.locale'], session['steam-locale']&.to_sym, env['steam.path']]
+  end
+
+  describe 'locale defined in the path' do
+
+    let(:url) { 'http://models.example.com/de/hello-de/foo' }
+
+    it { is_expected.to eq [:de, :de, '/hello-de/foo'] }
+
   end
 
   describe 'no locale defined in the path' do
@@ -32,7 +40,7 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       context 'without accept-language header' do
 
-        it { is_expected.to eq [:de, :de] }
+        it { is_expected.to eq [:de, :de, '/'] }
 
       end
 
@@ -40,13 +48,13 @@ describe Locomotive::Steam::Middlewares::Locale 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] }
+        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] }
+          it { is_expected.to eq [:de, :de, '/werkzeug'] }
 
         end
 
@@ -58,7 +66,7 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       let(:session) { {'steam-locale' => 'en'} }
 
-      it { is_expected.to eq [:en, :en] }
+      it { is_expected.to eq [:en, :en, '/'] }
 
     end
 
@@ -70,7 +78,7 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       let(:url) { 'http://models.example.com?locale=' }
 
-      it { is_expected.to eq [:de, :de] }
+      it { is_expected.to eq [:de, :de, '/'] }
 
     end
 
@@ -78,7 +86,7 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       let(:url) { 'http://models.example.com?locale=en' }
 
-      it { is_expected.to eq [:en, :en] }
+      it { is_expected.to eq [:en, :en, '/'] }
 
     end
 
@@ -86,7 +94,7 @@ describe Locomotive::Steam::Middlewares::Locale do
 
       let(:url) { 'http://models.example.com?locale=onload' }
 
-      it { is_expected.to eq [:de, :de] }
+      it { is_expected.to eq [:de, :de, '/'] }
 
     end
 

data/spec/unit/middlewares/section_spec.rb

@@ -45,7 +45,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">Here some </div>)]
+      [%(<div id="locomotive-section-page-header" class="locomotive-section" data-locomotive-section-type="header"><span id="page-header-section"></span>Here some </div>)]
     ]
   end
 
@@ -61,7 +61,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">Here some modified HTML</div>)]
+        [%(<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>)]
       ]
     end
 

data/spec/unit/middlewares/url_redirection_spec.rb

@@ -54,6 +54,15 @@ describe Locomotive::Steam::Middlewares::UrlRedirection do
 
       end
 
+      describe 'and redirecting to an external url' do
+
+        let(:redirections) { [['/foo.php', 'https://rickandmorty.dev']] }
+        let(:url) { 'http://models.example.com/foo.php' }
+
+        it { is_expected.to eq [301, 'https://rickandmorty.dev'] }
+
+      end
+
       describe 'url matching a pattern' do
 
         let(:redirections) { [['/old_images/:file', '/images/old/:file']] }

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -451,6 +451,13 @@ describe Locomotive::Steam::ContentEntryRepository do
 
       end
 
+      context 'testing a nil value (field => nil)' do
+
+        let(:value) { nil }
+        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => nil }, nil]) }
+
+      end
+
       context 'testing a nil value (field.ne => nil)' do
 
         let(:conditions)  { { 'person.ne' => nil } }

data/spec/unit/services/translator_service_spec.rb

@@ -14,14 +14,14 @@ describe Locomotive::Steam::TranslatorService do
     let(:interpolation) { {} }
 
     before do
-      allow(repository).to receive(:by_key).with('example_test').and_return(translation)
+      allow(repository).to receive(:group_by_key).and_return({ 'example_test' => translation })
     end
 
     subject { service.translate(input, interpolation.merge('locale' => locale, 'scope' => scope)) }
 
     describe 'existing translation' do
 
-      let(:translation) { instance_double('Translation', values: { 'en' => 'Example text', 'es' => 'Texto de ejemplo' }) }
+      let(:translation) { { 'en' => 'Example text', 'es' => 'Texto de ejemplo' } }
 
       it { is_expected.to eq 'Example text' }
 
@@ -55,7 +55,7 @@ describe Locomotive::Steam::TranslatorService do
       describe 'interpolation' do
 
         let(:interpolation) { { 'name' => 'John' } }
-        let(:translation)   { instance_double('Translation', values: { 'en' => 'Hello {{ name }}', 'es' => 'Texto de ejemplo' }) }
+        let(:translation)   { { 'en' => 'Hello {{ name }}', 'es' => 'Texto de ejemplo' } }
 
         it { is_expected.to eq 'Hello John' }
 
@@ -66,9 +66,9 @@ describe Locomotive::Steam::TranslatorService do
         context 'zero' do
 
           let(:interpolation) { { 'count' => '0' } }
-          let(:translation)   { instance_double('Translation', values: { 'en' => 'No posts' }) }
+          let(:translation)   { { 'en' => 'No posts' } }
 
-          before { expect(repository).to receive(:by_key).with('example_test_zero').and_return(translation) }
+          before { expect(repository).to receive(:group_by_key).and_return({ 'example_test_zero' => translation }) }
 
           it { is_expected.to eq 'No posts' }
 
@@ -77,9 +77,9 @@ describe Locomotive::Steam::TranslatorService do
         context 'one' do
 
           let(:interpolation) { { 'count' => '1' } }
-          let(:translation)   { instance_double('Translation', values: { 'en' => '1 post' }) }
+          let(:translation)   { { 'en' => '1 post' } }
 
-          before { expect(repository).to receive(:by_key).with('example_test_one').and_return(translation) }
+          before { expect(repository).to receive(:group_by_key).and_return({ 'example_test_one' => translation }) }
 
           it { is_expected.to eq '1 post' }
 
@@ -88,9 +88,9 @@ describe Locomotive::Steam::TranslatorService do
         context 'two' do
 
           let(:interpolation) { { 'count' => 2 } }
-          let(:translation)   { instance_double('Translation', values: { 'en' => '2 posts' }) }
+          let(:translation)   { { 'en' => '2 posts' } }
 
-          before { expect(repository).to receive(:by_key).with('example_test_two').and_return(translation) }
+          before { expect(repository).to receive(:group_by_key).and_return({ 'example_test_two' => translation }) }
 
           it { is_expected.to eq '2 posts' }
 
@@ -99,9 +99,9 @@ describe Locomotive::Steam::TranslatorService do
         context 'other' do
 
           let(:interpolation) { { 'count' => 42 } }
-          let(:translation)   { instance_double('Translation', values: { 'en' => '{{ count }} posts' }) }
+          let(:translation)   { { 'en' => '{{ count }} posts' } }
 
-          before { expect(repository).to receive(:by_key).with('example_test_other').and_return(translation) }
+          before { expect(repository).to receive(:group_by_key).and_return({ 'example_test_other' => translation }) }
 
           it { is_expected.to eq '42 posts' }
 

data/spec/unit/services/url_finder_service_spec.rb

@@ -25,10 +25,17 @@ describe Locomotive::Steam::UrlFinderService do
 
     end
 
+    context 'value is an email address' do
+
+      let(:value) { { 'type' => 'email', 'value' => 'jane@doe.net', 'new_window' => false } }
+      it { is_expected.to eq(['mailto:jane@doe.net', false]) }
+
+    end
+
     context 'value is a link to a page' do
 
-      let(:page)  { instance_double('Page') }
-      let(:value) { { 'type' => 'page', 'value' => 42, 'new_window' => true } }
+      let(:page)  { instance_double('Page', not_found?: false) }
+      let(:value) { { 'type' => 'page', 'value' => 42, 'new_window' => true, 'anchor' => '' } }
 
       context 'the page exists' do
 
@@ -39,6 +46,13 @@ describe Locomotive::Steam::UrlFinderService do
 
         it { is_expected.to eq(['/', true]) }
 
+        context 'pointing to a section' do
+
+          let(:value) { { 'type' => 'page', 'value' => 42, 'anchor' => 'getting-started' } }
+          it { is_expected.to eq(['/#getting-started', false]) }
+
+        end
+
       end
 
       context "the page doesn't exist" do
@@ -53,13 +67,12 @@ describe Locomotive::Steam::UrlFinderService do
 
       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(: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 },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.0.beta2
+  version: 1.5.0.beta3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.16.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,14 +201,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement