locomotivecms_steam 1.6.0.rc1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52a8de8a28e60162f058703b686dcd3b4f776a51990bcc90bd1b0ff89609fd7
-  data.tar.gz: 316c87edf83b117562e961ba666452468af720523bd948ed88cd691438b57937
+  metadata.gz: 6a1f4d2ebdb1c75ddf8e389fc7d5d285da6dba496aeecd8c15525321831271d1
+  data.tar.gz: 46c604e1570a07662bd1776f5f3f84cd3c2106c95853028c6a9e5aa046933629
 SHA512:
-  metadata.gz: b49614cb897afa01b679aabf5c8dbb2b10c5410212a71972dedd462850d97dbfa020d1e1ddb75571881e53f2d6c99b7006d7c1bd410a0f7bd1b7dbe10632832e
-  data.tar.gz: c7585f401423c84cc9ca593107fe991a390ca4b58969a0ac56f6630df47a13baf9da710c55a7c92e0a4f7a13bce088585e2fa33439b095dcdb2f0774ac5b15a2
+  metadata.gz: 402d5b879bfd1bc6feafe3b5baa934e4caf1027a2a512aa2cc1047a41735fea6590f341660862ae600689b0fae166abc79b10add10261510967f4cc2bb185035
+  data.tar.gz: 2091fc30d6b46c8dbb5a3cbccfbc6e629810c27605ef4c2559b05671962ed470032793b666ba019cff266b1f38dc3dbd61616efcbf83946c8b539ad2607e768e

data/Gemfile

@@ -9,9 +9,10 @@ group :development do
   # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
   # gem 'duktape', github: 'did/duktape.rb', branch: 'any-fixnum'
 
-  gem 'puma',               '~> 5.3.1'
+  gem 'puma',               '~> 5.6.4'
   gem 'haml',               '~> 5.2.0'
 
+  gem 'rack', '~> 2.2.3.1'
   gem 'rack-mini-profiler', '~> 0.10.1'
   gem 'flamegraph'
   gem 'stackprof' # ruby 2.1+ only

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.6.0.rc1)
+    locomotivecms_steam (1.6.0)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -19,7 +19,8 @@ PATH
       moneta (~> 1.0.0)
       morphine (~> 0.1.1)
       multi_json (~> 1.15.0)
-      nokogiri (~> 1.11.0)
+      nokogiri (>= 1.11, < 1.14)
+      parser (~> 2.7)
       pony (~> 1.12)
       rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
@@ -28,23 +29,33 @@ PATH
       sass (~> 3.4.25)
       sprockets (~> 3.7.1)
       uglifier (~> 4.1.3)
+      unparser (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.2.6)
+    abstract_type (0.0.7)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    anima (0.3.2)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2)
+      equalizer (~> 0.0.11)
+    ast (2.4.2)
     attr_extras (5.2.0)
     autoprefixer-rails (8.0.0)
       execjs
-    bcrypt (3.1.16)
-    bson (4.11.1)
+    bcrypt (3.1.18)
+    bson (4.15.0)
     chronic (0.10.2)
     chunky_png (1.4.0)
     coffee-script (2.4.1)
@@ -64,7 +75,10 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.1.7)
+    concord (0.1.6)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
+    concurrent-ruby (1.1.10)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -72,33 +86,35 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
     dragonfly (1.4.0)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
     duktape (2.0.1.1)
+    equalizer (0.0.11)
     execjs (2.8.1)
-    ffi (1.15.4)
+    ffi (1.15.5)
     flamegraph (0.9.5)
-    haml (5.2.0)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-spec (0.6.0)
       iso
-    iso (0.3.0)
+    ice_nine (0.11.2)
+    iso (0.4.0)
       i18n
-    json (2.3.1)
+    json (2.6.2)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
     liquid (4.0.3)
     locomotivecms_common (0.4.0)
@@ -108,34 +124,46 @@ GEM
       stringex (~> 2.8.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    memory_profiler (0.9.14)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    memory_profiler (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2022.0105)
     mimetype-fu (0.1.2)
-    mini_mime (1.1.1)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
     moneta (1.0.0)
-    mongo (2.13.1)
+    mongo (2.13.3)
       bson (>= 4.8.2, < 5.0.0)
     morphine (0.1.1)
+    mprelude (0.1.0)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      procto (~> 0.0.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     origin (2.3.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     pony (1.13.1)
       mail (>= 2.0)
-    public_suffix (4.0.6)
-    puma (5.3.2)
+    procto (0.0.3)
+    public_suffix (5.0.0)
+    puma (5.6.5)
       nio4r (~> 2.0)
-    racc (1.5.2)
-    rack (2.2.3)
+    racc (1.6.0)
+    rack (2.2.3.1)
     rack-cache (1.7.2)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
@@ -145,8 +173,8 @@ GEM
       rack (>= 1.0, < 3)
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
-    rake (13.0.1)
-    rb-fsevent (0.11.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
@@ -176,25 +204,36 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    stackprof (0.2.16)
+    stackprof (0.2.21)
     stringex (2.8.5)
     sync (0.5.0)
     temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.0.1)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
-    timecop (0.9.2)
-    tins (1.26.0)
+    tilt (2.0.11)
+    timecop (0.9.5)
+    tins (1.31.1)
       sync
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
+    unparser (0.5.5)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.1)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      mprelude (~> 0.1.0)
+      parser (>= 2.6.5)
+      procto (~> 0.0.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   coveralls (~> 0.8.1)
@@ -206,7 +245,8 @@ DEPENDENCIES
   memory_profiler
   mongo (~> 2.13.1)
   origin (~> 2.3.1)
-  puma (~> 5.3.1)
+  puma (~> 5.6.4)
+  rack (~> 2.2.3.1)
   rack-mini-profiler (~> 0.10.1)
   rack-test (~> 0.8.2)
   rake (~> 13.0.1)
@@ -215,4 +255,4 @@ DEPENDENCIES
   timecop (~> 0.9.1)
 
 BUNDLED WITH
-   2.1.4
+   2.3.7

data/bin/steam.rb

@@ -68,8 +68,6 @@ end.parse!
 require_relative '../lib/locomotive/steam'
 require_relative '../lib/locomotive/steam/server'
 
-puts options.inspect
-
 Locomotive::Steam.configure do |config|
   config.mode           = :test
   config.adapter        = options[:adapter]
@@ -77,11 +75,7 @@ Locomotive::Steam.configure do |config|
   config.asset_path     = options[:asset_path]
   config.asset_host     = options[:asset_host]
   config.minify_assets  = false
-end
-
-Locomotive::Common.reset
-Locomotive::Common.configure do |config|
-  config.notifier = Locomotive::Common::Logger.setup(options[:log_file])
+  config.log_file       = options[:log_file]
 end
 
 app = Locomotive::Steam.to_app

data/docker-compose.yml

@@ -12,4 +12,8 @@ services:
       - ./bundle:/usr/local/bundle
     depends_on:
       - db
+    labels:
+      docky.main.service: True
+      docky.user: ubuntu
+
 version: '3'

data/lib/locomotive/steam/configuration.rb

@@ -102,6 +102,19 @@ module Locomotive
       attr_accessor :render_404_if_no_site
       def render_404_if_no_site; @render_404_if_no_site.nil? ? true : @render_404_if_no_site; end
 
+      # Log file
+      #
+      # default: nil (ENV['LOCOMOTIVE_STEAM_LOG'] || STDOUT)
+      #
+      attr_accessor :log_file
+
+      # Log level 
+      #
+      # default: ::Logger::DEBUG
+      #
+      attr_accessor :log_level
+      def log_level; @log_level || ::Logger::DEBUG; end
+
       # Lambda called once a Services instance has been built.
       # It is used when we want to change one of the services
       #

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

@@ -25,6 +25,7 @@ module Locomotive::Steam
         sections:                 nil,
         sections_content:         nil,
         asset_host:               nil,
+        allow_dots_in_slugs:      false,
         routes:                   []
       }.merge(attributes))
     end

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

@@ -1,3 +1,6 @@
+require 'parser/current'
+require 'unparser'
+
 module Locomotive
   module Steam
     module Liquid
@@ -10,28 +13,52 @@ module Locomotive
 
           module Attributes
 
+            SyntaxWithoutComa = /^ *([a-zA-Z0-9_.]*:.*)$/
+            SyntaxWithComa = /^[a-zA-Z0-9 _"']*, *(.*)$/
+
             attr_reader :attributes, :raw_attributes
 
             private
 
             def parse_attributes(markup, default = {})
-              @attributes     = default || {}
-              @raw_attributes = @attributes.dup
+              @raw_attributes = default.dup || {}
+              attribute_markup = ''
+              if markup =~ SyntaxWithoutComa
+                attribute_markup = $1
+              elsif markup =~ SyntaxWithComa
+                attribute_markup = $1
+              end
+              unless attribute_markup.blank?
+                @raw_attributes.merge!(AttributeParser.parse(attribute_markup))
+              end
+              @raw_attributes
+            end
 
-              return if markup.blank?
+            def context_evaluate_array(vals)
+              vals.map { value.is_a?(::Liquid::VariableLookup) ? context.evaluate(value) : value }
+            end
 
-              markup.scan(tag_attributes_regexp) do |key, value|
-                _key = key.to_sym
+            def context_evaluate(vals)
+              vals.type
+            end
 
-                @attributes[_key]     = block_given? ? yield(value) : ::Liquid::Expression.parse(value)
-                @raw_attributes[_key] = @attributes[_key]
+            def evaluate_attributes(context, lax: false)
+              @attributes = HashWithIndifferentAccess.new.tap do |hash|
+                raw_attributes.each do |key, value|
+                  hash[evaluate_value(context, key, lax: lax)] = evaluate_value(context, value, lax: lax)
+                end
               end
             end
 
-            def evaluate_attributes(context, lax: false)
-              @attributes = @raw_attributes.transform_values do |value|
+            def evaluate_value(context, value, lax: false)
+              case value
+              when ::Liquid::VariableLookup
                 _value = context.evaluate(value)
                 lax && _value.nil? ? value&.name : _value
+              when Array          then value.map { |_value| evaluate_value(context, _value) }
+              when Hash           then value.transform_values { |_value| evaluate_value(context, _value) }
+              else
+                value
               end
             end
 
@@ -39,8 +66,68 @@ module Locomotive
               ::Liquid::TagAttributes
             end
 
-          end
+            class AttributeParser
+              class << self
+                def parse(markup)
+                  handle_hash(Parser::CurrentRuby.parse("{#{markup}}"), )
+                end
+
+                def handle(node)
+                  handler = "handle_#{node.type}"
+                  unless respond_to?(handler)
+                    raise ::Liquid::SyntaxError.new(
+                      "Fail to parse attributes. Unknown expression type: #{node.type.inspect}")
+                  end
+                  public_send handler, node
+                end
+
+                def handle_hash(node)
+                  res = {}
+                  node.children.each do | n |
+                    res[handle(n.children[0])] = handle(n.children[1])
+                  end
+                  res
+                end
 
+                def handle_sym(node)
+                  node.children[0]
+                end
+
+                def handle_int(node)
+                  node.children[0]
+                end
+
+                def handle_str(node)
+                  node.children[0]
+                end
+
+                def handle_regexp(node)
+                  Unparser.unparse(node)
+                end
+
+                def handle_send(node)
+                  ::Liquid::Expression.parse(Unparser.unparse(node))
+                end
+
+                def handle_true(node)
+                  true
+                end
+
+                def handle_false(node)
+                  false
+                end
+
+                def handle_float(node)
+                  node.children[0]
+                end
+
+                def handle_array(node)
+                  node.children.map{|n| handle(n)}
+                end
+              end
+            end
+
+          end
         end
       end
     end

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

@@ -7,7 +7,7 @@ module Locomotive
 
             Syntax = /(#{::Liquid::QuotedFragment}+)(\s*,.+)?/o
 
-            attr_reader :handle
+            attr_reader :handle, :compatible_attributes
 
             def initialize(tag_name, markup, options)
               super
@@ -15,6 +15,13 @@ module Locomotive
               if markup =~ Syntax
                 @handle, _attributes = $1, $2
 
+                # this is a hack for sites which don't follow the new syntax.
+                # We need this hack because the value pass by with can contain "-"
+                # for example : "link_to another_song, with: a-song-template"
+                # This will be evaluated as multiple variable by the ruby AST parser
+                # So we need to convert it to "link_to another_song, with: 'a-song-template'"
+                parse_compatible_attributes(_attributes)
+
                 parse_attributes(_attributes)
               else
                 self.wrong_syntax!
@@ -22,7 +29,7 @@ module Locomotive
             end
 
             def render_path(context, &block)
-              evaluate_attributes(context, lax: true)
+              evaluate_attributes(context)
 
               set_vars_from_context(context)
 
@@ -46,6 +53,18 @@ module Locomotive
 
             protected
 
+            def parse_compatible_attributes(_attributes)
+              if _attributes
+                _compatible_attributes = _attributes.dup
+                %w(with locale).each do |name|
+                  _compatible_attributes.gsub!(/#{name}: ([\w-]+)/, name + ': "\1"')
+                end
+                @compatible_attributes = parse_attributes(_compatible_attributes)
+              else
+                @compatible_attributes = {}
+              end
+            end
+
             def services
               @context.registers[:services]
             end
@@ -86,11 +105,11 @@ module Locomotive
             end
 
             def locale
-              attributes[:locale] || @locale
+              attributes[:locale] || compatible_attributes[:locale] || @locale
             end
 
             def template_slug
-              attributes[:with]
+              attributes[:with] || compatible_attributes[:with]
             end
 
             def set_vars_from_context(context)

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

@@ -25,9 +25,9 @@ module Locomotive
             super
 
             if markup =~ Syntax
-              @variable_name, @url_expr, 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)
+              parse_attributes(_attributes)
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in 'consume' - Valid syntax: consume <var> from \"<url>\" [username: value, password: value]")
             end

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

@@ -119,11 +119,11 @@ module Locomotive
                 block:          self.current_inherited_block_name,
                 label:          label,
                 slug:           slug,
-                hint:           attributes[:hint],
-                priority:       attributes[:priority] || 0,
-                fixed:          [true, 'true'].include?(attributes[:fixed]),
+                hint:           raw_attributes[:hint],
+                priority:       raw_attributes[:priority] || 0,
+                fixed:          [true, 'true'].include?(raw_attributes[:fixed]),
                 disabled:       false,
-                inline_editing: [true, 'true'].include?(attributes[:inline_editing]),
+                inline_editing: [true, 'true'].include?(raw_attributes[:inline_editing]),
                 from_parent:    false,
                 type:           @tag_name.to_sym
               }

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

@@ -9,7 +9,7 @@ module Locomotive
               source:     :site,
               id:         "site-#{section_type}",
               key:        section_type,
-              placement:  attributes[:placement]&.to_sym
+              placement:  raw_attributes[:placement]&.to_sym
             )
           end
 

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

@@ -72,7 +72,7 @@ module Locomotive
                 page: parse_context[:page],
                 name: name,
                 found_super: self.contains_super?(nodelist)
-              }.merge(attributes))
+              }.merge(raw_attributes))
             end
           end
 
@@ -85,8 +85,7 @@ module Locomotive
 
               # the block drop is in charge of rendering "{{ block.super }}"
               context['block'] = Drops::InheritedBlock.new(block)
-
-              anchor_html = if live_editing?(context) && (attributes[:anchor] || attributes[:anchor].nil?)
+              anchor_html = if live_editing?(context) && (raw_attributes[:anchor] || raw_attributes[:anchor].nil?)
                 %{<span class="locomotive-block-anchor" data-element-id="#{name}" style="visibility: hidden"></span>}
               else
                 ''

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

@@ -24,10 +24,10 @@ module Locomotive
 
           def parse(tokens)
             notify_on_parsing(section_type,
-              id:         "page-#{attributes[:id] || section_type}",
-              key:        (attributes[:id] || section_type).to_s,
-              label:      attributes[:label],
-              placement:  attributes[:placement]&.to_sym
+              id:         "page-#{raw_attributes[:id] || section_type}",
+              key:        (raw_attributes[:id] || section_type).to_s,
+              label:      raw_attributes[:label],
+              placement:  raw_attributes[:placement]&.to_sym
             )
           end
 

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

@@ -11,6 +11,16 @@ module Locomotive
             # NOTE: it doesn't support dynamically choosen template
             template_name = template_name_expr.respond_to?(:name) ? template_name_expr.name : template_name_expr
 
+            # make sure we keep track of the parsed snippets
+            parse_context[:parsed_snippets] ||= []
+
+            # already parsed? (it happens when doing recursivity with snippets)
+            if parse_context[:parsed_snippets].include?(template_name)
+              return
+            else
+              parse_context[:parsed_snippets] << template_name
+            end
+
             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)