locomotivecms_steam 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a1f4d2ebdb1c75ddf8e389fc7d5d285da6dba496aeecd8c15525321831271d1
-  data.tar.gz: 46c604e1570a07662bd1776f5f3f84cd3c2106c95853028c6a9e5aa046933629
+  metadata.gz: c1d1190c7a803c31bd03c95eadc0778dae4018260d5f189e17504584ff214eb2
+  data.tar.gz: a31caf22fe539484172005e8ffd8429bc301b72d1e09b0b0d4d553ca6364a8c9
 SHA512:
-  metadata.gz: 402d5b879bfd1bc6feafe3b5baa934e4caf1027a2a512aa2cc1047a41735fea6590f341660862ae600689b0fae166abc79b10add10261510967f4cc2bb185035
-  data.tar.gz: 2091fc30d6b46c8dbb5a3cbccfbc6e629810c27605ef4c2559b05671962ed470032793b666ba019cff266b1f38dc3dbd61616efcbf83946c8b539ad2607e768e
+  metadata.gz: 5fce3dfa770a46f8d6f7ae47db8c7045d4dece1acb550685955f0641bf09c82de9a2d9dc67309727d3fc7874b21b59c205d29f770c8f7c2f3ab5829c72ce769c
+  data.tar.gz: 34b654ec05743ce7da33454004a9828f94533d15f26691a25c254833f179f2ba84cc5f3dc9864485452d76f82b889ae6dd7f10ac6a90bda3951dd5f80b961604

data/.gitignore

@@ -28,3 +28,4 @@ spec/fixtures/default/log/*
 log
 dragonfly.log
 .byebug_history
+TODO.md

data/.travis.yml

@@ -2,8 +2,7 @@ language: ruby
 services: mongodb
 before_script: ./script/ci/before_build.sh
 rvm:
-  - 2.6.5
-  - 2.7.2
+  - 2.7.4
 addons:
   code_climate:
     repo_token: 3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9

data/Gemfile

@@ -9,7 +9,9 @@ group :development do
   # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
   # gem 'duktape', github: 'did/duktape.rb', branch: 'any-fixnum'
 
-  gem 'puma',               '~> 5.6.4'
+  gem 'rake'
+
+  gem 'puma',               '~> 6.1.0'
   gem 'haml',               '~> 5.2.0'
 
   gem 'rack', '~> 2.2.3.1'
@@ -30,5 +32,5 @@ group :test do
 
   gem 'rack-test',          '~> 0.8.2'
 
-  gem 'coveralls',                  '~> 0.8.1',   require: false
+  gem 'coveralls',                  '~> 0.8.23',   require: false
 end

data/Gemfile.lock

@@ -1,84 +1,46 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.6.0)
+    locomotivecms_steam (1.7.0)
       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.2, < 1.5)
       duktape (~> 2.0.1.1)
+      execjs (~> 2.8.1)
       httparty (~> 0.16.0)
       kramdown (~> 2.3.0)
-      liquid (~> 4.0.3)
-      locomotivecms_common (~> 0.4.0)
+      liquid (~> 4.0.4)
+      locomotivecms_common (~> 0.5.0)
       mime-types (~> 3.3.0)
       mimetype-fu (~> 0.1.2)
       moneta (~> 1.0.0)
       morphine (~> 0.1.1)
       multi_json (~> 1.15.0)
-      nokogiri (>= 1.11, < 1.14)
-      parser (~> 2.7)
+      nokogiri (~> 1.14.2)
       pony (~> 1.12)
       rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.6.0)
-      sanitize (~> 5.2.1)
-      sass (~> 3.4.25)
-      sprockets (~> 3.7.1)
-      uglifier (~> 4.1.3)
-      unparser (~> 0.4)
+      sanitize (~> 6.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    abstract_type (0.0.7)
-    activesupport (5.2.8.1)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.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
+    attr_extras (7.1.0)
     bcrypt (3.1.18)
     bson (4.15.0)
     chronic (0.10.2)
-    chunky_png (1.4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     colorize (0.8.1)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    concord (0.1.6)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -86,6 +48,7 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
+    date (3.3.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dragonfly (1.4.0)
@@ -93,9 +56,7 @@ GEM
       multi_json (~> 1.0)
       rack (>= 1.3)
     duktape (2.0.1.1)
-    equalizer (0.0.11)
     execjs (2.8.1)
-    ffi (1.15.5)
     flamegraph (0.9.5)
     haml (5.2.2)
       temple (>= 0.8.0)
@@ -107,62 +68,59 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-spec (0.6.0)
       iso
-    ice_nine (0.11.2)
     iso (0.4.0)
       i18n
-    json (2.6.2)
+    json (2.6.3)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     kramdown (2.3.2)
       rexml
-    liquid (4.0.3)
-    locomotivecms_common (0.4.0)
-      activesupport (>= 5.1.5, < 6.0)
-      attr_extras (~> 5.2.0)
+    liquid (4.0.4)
+    locomotivecms_common (0.5.0)
+      activesupport (>= 5)
+      attr_extras (~> 7.1.0)
       colorize
-      stringex (~> 2.8.2)
-    mail (2.7.1)
+      stringex (~> 2.8.5)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    memory_profiler (1.0.0)
+      net-imap
+      net-pop
+      net-smtp
+    memory_profiler (1.0.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0218.1)
     mimetype-fu (0.1.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     moneta (1.0.0)
-    mongo (2.13.3)
-      bson (>= 4.8.2, < 5.0.0)
+    mongo (2.18.2)
+      bson (>= 4.14.1, < 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)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.8)
+    nokogiri (1.14.2)
       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)
-    procto (0.0.3)
-    public_suffix (5.0.0)
-    puma (5.6.5)
+    public_suffix (5.0.1)
+    puma (6.1.0)
       nio4r (~> 2.0)
-    racc (1.6.0)
+    racc (1.6.2)
     rack (2.2.3.1)
     rack-cache (1.7.2)
       rack (>= 0.4)
@@ -174,9 +132,6 @@ GEM
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
     rake (13.0.6)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
     rexml (3.2.5)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -191,68 +146,51 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    sanitize (5.2.3)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
-    sass (3.4.25)
+      nokogiri (>= 1.12.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    stackprof (0.2.21)
+    stackprof (0.2.23)
     stringex (2.8.5)
     sync (0.5.0)
-    temple (0.8.2)
+    temple (0.10.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (1.2.1)
-    thread_safe (0.3.6)
-    tilt (2.0.11)
-    timecop (0.9.5)
-    tins (1.31.1)
+    tilt (2.1.0)
+    timecop (0.9.6)
+    timeout (0.3.2)
+    tins (1.32.1)
       sync
-    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)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
-  x86_64-darwin-20
+  x86_64-darwin-22
 
 DEPENDENCIES
-  coveralls (~> 0.8.1)
+  coveralls (~> 0.8.23)
   flamegraph
   haml (~> 5.2.0)
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.5)
   locomotivecms_steam!
   memory_profiler
-  mongo (~> 2.13.1)
+  mongo (~> 2.18.2)
   origin (~> 2.3.1)
-  puma (~> 5.6.4)
+  puma (~> 6.1.0)
   rack (~> 2.2.3.1)
   rack-mini-profiler (~> 0.10.1)
   rack-test (~> 0.8.2)
-  rake (~> 13.0.1)
+  rake
   rspec (~> 3.7.0)
   stackprof
   timecop (~> 0.9.1)
 
 BUNDLED WITH
-   2.3.7
+   2.3.10

data/Rakefile

@@ -27,8 +27,8 @@ namespace :mongodb do
         `mv #{dump_path} #{db_path}`
       end
 
-      `mongo steam_test_1_5_x --eval "db.dropDatabase()" #{host}`
-      `mongorestore -d steam_test_1_5_x #{db_path} #{host}`
+      `mongo steam_test_1_7_x --eval "db.dropDatabase()" #{host}`
+      `mongorestore -d steam_test_1_7_x #{db_path} #{host}`
 
       puts "Done! Update now the spec/support/helpers.rb file by setting the new id of the site returned by the mongodb_site_id method"
     end

data/lib/locomotive/steam/adapters/mongodb/command.rb

@@ -23,7 +23,7 @@ module Locomotive::Steam
         def update(entity)
           entity.tap do
             serialized_entity = @mapper.serialize(entity)
-            @collection.find(_id: entity._id).update_one(serialized_entity)
+            @collection.find(_id: entity._id).update_one('$set' => serialized_entity)
           end
         end
 

data/lib/locomotive/steam/initializers.rb

@@ -1,3 +1,2 @@
-require_relative 'initializers/sprockets.rb'
 require_relative 'initializers/i18n.rb'
 require_relative 'initializers/dragonfly.rb'

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

@@ -1,6 +1,3 @@
-require 'parser/current'
-require 'unparser'
-
 module Locomotive
   module Steam
     module Liquid
@@ -13,52 +10,28 @@ 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 = {})
-              @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
+              @attributes     = default || {}
+              @raw_attributes = @attributes.dup
 
-            def context_evaluate_array(vals)
-              vals.map { value.is_a?(::Liquid::VariableLookup) ? context.evaluate(value) : value }
-            end
+              return if markup.blank?
 
-            def context_evaluate(vals)
-              vals.type
-            end
+              markup.scan(tag_attributes_regexp) do |key, value|
+                _key = key.to_sym
 
-            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
+                @attributes[_key]     = block_given? ? yield(value) : ::Liquid::Expression.parse(value)
+                @raw_attributes[_key] = @attributes[_key]
               end
             end
 
-            def evaluate_value(context, value, lax: false)
-              case value
-              when ::Liquid::VariableLookup
+            def evaluate_attributes(context, lax: false)
+              @attributes = @raw_attributes.transform_values do |value|
                 _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
 
@@ -66,70 +39,10 @@ module Locomotive
               ::Liquid::TagAttributes
             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
   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, :compatible_attributes
+            attr_reader :handle
 
             def initialize(tag_name, markup, options)
               super
@@ -15,13 +15,6 @@ 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!
@@ -29,14 +22,14 @@ module Locomotive
             end
 
             def render_path(context, &block)
-              evaluate_attributes(context)
+              evaluate_attributes(context, lax: true)
 
               set_vars_from_context(context)
 
               handle = @context[@handle] || @handle
 
               # is external url?
-              if handle.to_s =~ Locomotive::Steam::IsHTTP
+              if handle =~ 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)
@@ -53,18 +46,6 @@ 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
@@ -105,11 +86,11 @@ module Locomotive
             end
 
             def locale
-              attributes[:locale] || compatible_attributes[:locale] || @locale
+              attributes[:locale] || @locale
             end
 
             def template_slug
-              attributes[:with] || compatible_attributes[:with]
+              attributes[:with]
             end
 
             def set_vars_from_context(context)
@@ -123,4 +104,4 @@ module Locomotive
       end
     end
   end
-end
+end

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