locomotivecms_steam 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39383656db0b143ed8aa7df54aa656ed34d7104ea4b201a5be7ad87bc6c5005
-  data.tar.gz: 83e94cde0a6206f0cab0c2908cf1159a1c389cc55f4534c8883d0843b22ececa
+  metadata.gz: 8dcf9666c7fcd392c8570476374e32a3db2492bc9a56449e0faa0667a87dcb5d
+  data.tar.gz: e92dbc7da55147cba7c476fa088ee28fda6e7da0aadcad796d97e20f70de13f0
 SHA512:
-  metadata.gz: c04b7ed843d8c66d1eff244521db444db057ccf40a67b71fff9cced61d5107a2d63c6417856a77af1f48d42a223d9af92ae567a65940a0705c216e6e506c9c97
-  data.tar.gz: fa161306ac9c4752c2693cffca31d737bc4a622055a104ae226c7f44bd0ace67ab69f1201690bfcb23aea7ea436452257d2d35deeb7ddcba18839fe5169dd250
+  metadata.gz: 6a5d931f8f0fe0007a45422a0d256dd93de213f450246c103a682f95829a5c75b4f9c4069142e3e166736a87a9b1f03bda40a1035165b5bfbc024017b8303b82
+  data.tar.gz: f5cedd73e0abb3a7f7b9309a778b3e9ee5bacaa9eb54cbe3adaef787322ad829bd9cef78769804bd553a0844fc994d94f346f8835a66cafefec8afa956e40641

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.5.1)
+    locomotivecms_steam (1.5.2)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -73,7 +73,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crass (1.0.5)
+    crass (1.0.6)
     diff-lcs (1.3)
     docile (1.3.2)
     dragonfly (1.2.0)
@@ -82,7 +82,7 @@ GEM
       rack (>= 1.3)
     duktape (2.0.1.1)
     execjs (2.7.0)
-    ffi (1.11.3)
+    ffi (1.12.1)
     flamegraph (0.9.5)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -116,7 +116,7 @@ GEM
     mimetype-fu (0.1.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     moneta (1.0.0)
     mongo (2.8.0)
       bson (>= 4.4.2, < 5.0.0)
@@ -131,7 +131,7 @@ GEM
     origin (2.3.1)
     pony (1.13.1)
       mail (>= 2.0)
-    public_suffix (4.0.2)
+    public_suffix (4.0.3)
     puma (4.3.1)
       nio4r (~> 2.0)
     rack (2.0.8)

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

@@ -16,7 +16,7 @@ module Locomotive
 
             def parse_attributes(markup, default = {})
               @attributes     = default || {}
-              @raw_attributes = {}
+              @raw_attributes = @attributes.dup
 
               return if markup.blank?
 
@@ -24,13 +24,14 @@ module Locomotive
                 _key = key.to_sym
 
                 @attributes[_key]     = block_given? ? yield(value) : ::Liquid::Expression.parse(value)
-                @raw_attributes[_key] = value
+                @raw_attributes[_key] = @attributes[_key]
               end
             end
 
-            def evaluate_attributes(context)
-              @attributes = @attributes.transform_values do |attribute|
-                context.evaluate(attribute)
+            def evaluate_attributes(context, lax: false)
+              @attributes = @raw_attributes.transform_values do |value|
+                _value = context.evaluate(value)
+                lax && _value.nil? ? value&.name : _value
               end
             end
 

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

@@ -22,7 +22,7 @@ module Locomotive
             end
 
             def render_path(context, &block)
-              evaluate_attributes(context)
+              evaluate_attributes(context, lax: true)
 
               set_vars_from_context(context)
 
@@ -86,11 +86,11 @@ module Locomotive
             end
 
             def locale
-              attributes[:locale] || raw_attributes[:locale] || @locale
+              attributes[:locale] || @locale
             end
 
             def template_slug
-              attributes[:with] || raw_attributes[:with]
+              attributes[:with]
             end
 
             def set_vars_from_context(context)

data/lib/locomotive/steam/liquid/tags/editable/base.rb

@@ -18,6 +18,9 @@ module Locomotive
 
                 parse_attributes(markup, fixed: false, inline_editing: true)
 
+                # we don't allow dynamic attributes
+                evaluate_attributes(::Liquid::Context.new, lax: true)
+
                 set_label_and_slug
               else
                 raise ::Liquid::SyntaxError.new("Valid syntax: #{tag_name} <slug>(, <options>)")

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

@@ -5,24 +5,14 @@ module Locomotive
 
         class Snippet < ::Liquid::Include
 
-          attr_reader :template_name
-
-          def initialize(tag_name, markup, options)
-            super
-
-            if markup =~ Syntax
-              @template_name = $1
-            end
-          end
-
           def parse(tokens)
-            ActiveSupport::Notifications.instrument('steam.parse.include', page: parse_context[:page], name: template_name)
-
             # look for editable elements (only used by the Engine)
             # In the next version of Locomotive (v5), we won't support the editable elements
-            #
             # NOTE: it doesn't support dynamically choosen template
-            #
+            template_name = template_name_expr.respond_to?(:name) ? template_name_expr.name : template_name_expr
+
+            ActiveSupport::Notifications.instrument('steam.parse.include', page: parse_context[:page], name: template_name)
+
             if parse_context[:snippet_finder] && snippet = parse_context[:snippet_finder].find(template_name)
               parse_context[:parser]._parse(snippet, parse_context.merge(snippet: template_name))
             end
@@ -37,9 +27,9 @@ module Locomotive
             rescue ::Liquid::ArgumentError
               # NOTE: Locomotive site developers should always use quotes (or doubles quotes) for the name of a snippet.
               # Unfortunately, a lot of sites don't use them. So here is a little patch to not break those sites.
-              Locomotive::Common::Logger.warn("Use quotes if the name of your snippet (#{template_name}) is not dynamic.")
+              Locomotive::Common::Logger.warn("Use quotes if the name of your snippet (#{template_name_expr.name}) is not dynamic.")
 
-              @template_name_expr = template_name
+              @template_name_expr = template_name_expr.name
 
               super
             end

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

@@ -19,8 +19,9 @@ module Locomotive
           include Concerns::Attributes
 
           # Regexps and Arrays are allowed
-          ArrayFragment   = /\[(\s*(#{::Liquid::QuotedFragment},\s*)*#{::Liquid::QuotedFragment}\s*)\]/o.freeze
-          RegexpFragment  = /\/([^\/]+)\/([imx]+)?/o.freeze
+          ArrayFragment         = /\[(\s*(#{::Liquid::QuotedFragment},\s*)*#{::Liquid::QuotedFragment}\s*)\]/o.freeze
+          RegexpFragment        = /\/([^\/]+)\/([imx]+)?/o.freeze
+          StrictRegexpFragment  = /\A#{RegexpFragment}\z/o.freeze
 
           # a slight different from the Shopify implementation because we allow stuff like `started_at.le`
           TagAttributes   = /([a-zA-Z_0-9\.]+)\s*\:\s*(#{ArrayFragment}|#{RegexpFragment}|#{::Liquid::QuotedFragment})/o.freeze
@@ -66,7 +67,7 @@ module Locomotive
 
           def parse_attribute(value)
             case value
-            when RegexpFragment
+            when StrictRegexpFragment
               # let the cast_value attribute create the Regexp (done during the rendering phase)
               value
             when ArrayFragment
@@ -94,8 +95,8 @@ module Locomotive
 
           def cast_value(context, value)
             case value
-            when Array          then value.map { |_value| cast_value(context, _value) }
-            when RegexpFragment then create_regexp($1, $2)
+            when Array                then value.map { |_value| cast_value(context, _value) }
+            when StrictRegexpFragment then create_regexp($1, $2)
             else
               _value = context.evaluate(value)
               _value.respond_to?(:_id) ? _value.send(:_source) : _value

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.1'
+    VERSION = '1.5.2'
   end
 end

data/spec/unit/liquid/tags/editable/text_spec.rb

@@ -76,10 +76,11 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
         context 'with a defined label' do
 
-          let(:source) { "{% editable_text 'first_column', label: 'Column #1' %}{% endeditable_text %}" }
+          let(:source) { "{% editable_text 'first_column', label: 'Column #1', format: raw %}{% endeditable_text %}" }
 
           it { is_expected.to include(slug: 'first_column') }
           it { is_expected.to include(label: 'Column #1') }
+          it { is_expected.to include(format: 'raw') }
 
         end
 

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

@@ -35,13 +35,14 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
 
   describe 'from a handle of a page' do
 
+    let(:locales)   { ['en', 'fr', 'es']}
     let(:drop)      { Locomotive::Steam::Liquid::Drops::Page.new(page) }
     let(:page)      { liquid_instance_double('Index', title: 'Index', handle: 'index', fullpath: fullpath, localized_attributes: { fullpath: true }, templatized?: false) }
-    let(:fullpath)  { { en: 'index', fr: 'index' } }
+    let(:fullpath)  { { en: 'index', fr: 'index', es: 'index' } }
     let(:source)    { '{% path_to index %}' }
 
     before do
-      expect(services.page_finder).to receive(:by_handle).with('index').and_return(page)
+      expect(services.page_finder).to receive(:by_handle).with('index').and_return(page).at_least(:once)
       allow(page).to receive(:to_liquid).and_return(drop)
     end
 
@@ -52,6 +53,14 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
       let(:source) { "{% path_to index, locale: 'fr' %}" }
       it { is_expected.to eq '/fr' }
 
+      context 'used as a variable' do
+
+        let(:assigns) { { 'locales' => locales } }
+        let(:source) { "{% for my_locale in locales %}{% path_to index, locale: my_locale %},{% endfor %}" }
+        it { is_expected.to eq '/,/fr,/es,' }
+
+      end
+
     end
 
     context 'the current locale in session is different from the requested locale' do

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

@@ -138,10 +138,11 @@ describe Locomotive::Steam::Liquid::Tags::WithScope do
 
     describe 'decode criteria with gt and lt' do
 
-      let(:source) { "{% with_scope price.gt:42.0, price.lt:50, published_at.lte: '2019-09-10 00:00:00' %}{% assign conditions = with_scope %}{% endwith_scope %}" }
+      let(:source) { "{% with_scope price.gt:42.0, price.lt:50, published_at.lte: '2019-09-10 00:00:00', published_at.gte: '2019/09/09 00:00:00' %}{% assign conditions = with_scope %}{% endwith_scope %}" }
       it { expect(conditions['price.gt']).to eq 42.0 }
       it { expect(conditions['price.lt']).to eq 50 }
       it { expect(conditions['published_at.lte']).to eq '2019-09-10 00:00:00' }
+      it { expect(conditions['published_at.gte']).to eq '2019/09/09 00:00:00' }
 
     end
 

data/spec/unit/middlewares/cache_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake