locomotivecms_steam 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dcf9666c7fcd392c8570476374e32a3db2492bc9a56449e0faa0667a87dcb5d
-  data.tar.gz: e92dbc7da55147cba7c476fa088ee28fda6e7da0aadcad796d97e20f70de13f0
+  metadata.gz: f5fcd89084fca2167fb869e5819dce44029256761bbed64ceaec4274b4d24bfc
+  data.tar.gz: fc263ea755d1e716e2f288a2a8b88ed87419b47916a8a1945f4b13679a380744
 SHA512:
-  metadata.gz: 6a5d931f8f0fe0007a45422a0d256dd93de213f450246c103a682f95829a5c75b4f9c4069142e3e166736a87a9b1f03bda40a1035165b5bfbc024017b8303b82
-  data.tar.gz: f5cedd73e0abb3a7f7b9309a778b3e9ee5bacaa9eb54cbe3adaef787322ad829bd9cef78769804bd553a0844fc994d94f346f8835a66cafefec8afa956e40641
+  metadata.gz: f8d908e44d028406732eae11fc5fdc73b774a684afef6b4cf40a55c0b27342dc86bd3ed512ffb77917fcedae0c4791ba4bc6d25418ef284587f0c191d18a9e3f
+  data.tar.gz: 46357b80f3a669cb0306045ecd5dbb961aed2d2c9124836aaebd2583752d757df4b43c8be8c34a1df15894362d3c85640899c38264df4a848e82b2a9e64b7e75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.5.2)
+    locomotivecms_steam (1.5.3)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -19,7 +19,7 @@ PATH
       moneta (~> 1.0.0)
       morphine (~> 0.1.1)
       multi_json (~> 1.13.1)
-      nokogiri (~> 1.10.4)
+      nokogiri (~> 1.10.8)
       pony (~> 1.12)
       rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
@@ -82,7 +82,7 @@ GEM
       rack (>= 1.3)
     duktape (2.0.1.1)
     execjs (2.7.0)
-    ffi (1.12.1)
+    ffi (1.12.2)
     flamegraph (0.9.5)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -124,7 +124,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri

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

@@ -19,13 +19,13 @@ module Locomotive
 
           Syntax = /(#{::Liquid::VariableSignature}+)\s*from\s*(#{::Liquid::QuotedFragment}+),?(.+)?/o.freeze
 
-          attr_reader :variable_name, :url, :expires_in
+          attr_reader :variable_name, :url_expr, :url, :expires_in
 
           def initialize(tag_name, markup, options)
             super
 
             if markup =~ Syntax
-              @variable_name, @url, attributes = $1.to_s, ::Liquid::Expression.parse($2), $3
+              @variable_name, @url_expr, attributes = $1.to_s, ::Liquid::Expression.parse($2), $3
 
               parse_attributes(attributes)
             else
@@ -41,7 +41,7 @@ module Locomotive
             @expires_in = attributes.delete(:expires_in)&.to_i
 
             # the URL can come from a variable
-            @url = context.evaluate(url)
+            @url = context.evaluate(url_expr)
 
             if url.blank?
               Locomotive::Common::Logger.error "A consume tag can't call an empty URL."

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

@@ -85,7 +85,9 @@ module Locomotive
           # to only return pages which will be displayed in the nav.
           def children_of(page)
             children  = (page_repository.children_of(page) || [])
-            children.select { |child| self.include_page?(child) }
+            children
+            .map { |child| decorate_page(child) }
+            .select { |child| self.include_page?(child) }
           end
 
           # Determine whether or not a page should be a part of the menu.
@@ -179,7 +181,6 @@ module Locomotive
           # @return [ String ] The HTML output
           #
           def render_entry_link(page, css, depth, context)
-            page      = decorate_page(page)
             url       = self.entry_url(page)
             label     = self.entry_label(page, context)
             css       = self.entry_css(page, css)
@@ -243,7 +244,7 @@ module Locomotive
             self.current_page       = context.registers[:page]
             self.services           = context.registers[:services]
             self.current_locale     = context.registers[:locale]
-            self.page_repository    = self.services.repositories.page
+            self.page_repository    = services.repositories.page
           end
 
           # Parse the template of the snippet give in option of the tag.

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.2'
+    VERSION = '1.5.3'
   end
 end

data/locomotivecms_steam.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mongo',      '~> 2.8.0'
   spec.add_development_dependency 'origin',     '~> 2.3.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.10.4'
+  spec.add_dependency 'nokogiri',               '~> 1.10.8'
   spec.add_dependency 'sanitize',               '~> 4.6.4'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.16.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement