locomotivecms_steam 1.6.0.rc1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52a8de8a28e60162f058703b686dcd3b4f776a51990bcc90bd1b0ff89609fd7
-  data.tar.gz: 316c87edf83b117562e961ba666452468af720523bd948ed88cd691438b57937
+  metadata.gz: 7df479f835f1f7233945c2da8f3df5e3bfa5186b225ded85197363c63b0c7c5b
+  data.tar.gz: d653e2259dccaa5e8d643c9019f7315bad2fdeb7b759d14997dd5ca87b554ba7
 SHA512:
-  metadata.gz: b49614cb897afa01b679aabf5c8dbb2b10c5410212a71972dedd462850d97dbfa020d1e1ddb75571881e53f2d6c99b7006d7c1bd410a0f7bd1b7dbe10632832e
-  data.tar.gz: c7585f401423c84cc9ca593107fe991a390ca4b58969a0ac56f6630df47a13baf9da710c55a7c92e0a4f7a13bce088585e2fa33439b095dcdb2f0774ac5b15a2
+  metadata.gz: 5269811d92d7853e44cfd9f481f1bf303e11cd5d99652dda98c02e46ec20f28b43f34a419594c3bdc87c8fba3130316c1c79b4528eb3782710522e8974c324ea
+  data.tar.gz: 5faee657e95f13b8a5ab305b149a8739c41c5e698f58715c299363f332a56974bc3011785b21b01fe0552ce64bc907bea25ca200e13acc3616b3e96d02ef7e7b

data/.gitignore

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

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.1)
       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.15.0)
-      nokogiri (~> 1.11.0)
+      nokogiri (>= 1.11, < 1.14)
       pony (~> 1.12)
       rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
@@ -33,18 +33,18 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.2.6)
+    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)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     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 +64,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -72,33 +72,33 @@ 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)
     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)
+    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 +108,34 @@ GEM
       stringex (~> 2.8.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    memory_profiler (0.9.14)
+    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)
     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)
     pony (1.13.1)
       mail (>= 2.0)
-    public_suffix (4.0.6)
-    puma (5.3.2)
+    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 +145,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,19 +176,19 @@ 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)
@@ -206,7 +206,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)

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

@@ -45,4 +45,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -29,7 +29,7 @@ module Locomotive
               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)
@@ -104,4 +104,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -99,4 +99,4 @@ module Locomotive
       end
     end
   end
-end
+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

@@ -155,4 +155,4 @@ module Locomotive
       end
     end
   end
-end
+end

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)

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

@@ -121,4 +121,4 @@ module Locomotive
       end
     end
   end
-end
+end

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

@@ -30,7 +30,12 @@ module Locomotive::Steam
       private
 
       def sign_up(options)
-        return if authenticated? || !is_recaptcha_valid?(options.type, options.recaptcha_response)
+        return if authenticated? 
+
+        if !is_recaptcha_valid?(options.type, options.recaptcha_response)
+          append_message(:invalid_recaptcha_code)
+          return
+        end
 
         status, entry = services.auth.sign_up(options, default_liquid_context, request)
 
@@ -101,7 +106,7 @@ module Locomotive::Steam
       end
 
       def append_message(message)
-        log "[Auth] status message = #{message.inspect}"
+        debug_log "[Auth] status message = #{message.inspect}"
 
         message ||= 'error'
         liquid_assigns["auth_#{message}"] = "auth_#{message}"
@@ -158,7 +163,7 @@ module Locomotive::Steam
         end
 
         def from
-          smtp_config['sender'] || 'support@locomotivecms.com'
+          smtp_config['sender'] || smtp_config['from'] || 'support@locomotivecms.com'
         end
 
         def subject
@@ -182,7 +187,7 @@ module Locomotive::Steam
         end
 
         def recaptcha_response
-          params["g-recaptcha-response"]
+          params['g-recaptcha-response']
         end
 
         def smtp
@@ -213,7 +218,6 @@ module Locomotive::Steam
           end
         end
 
-
       end
 
     end

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

@@ -19,7 +19,7 @@ module Locomotive::Steam
 
           env['steam.authenticated_entry'] = nil if entry.nil?
 
-          log "[Auth] authenticated #{type.to_s.singularize} ##{entry&._id.to_s}"
+          debug_log "[Auth] authenticated #{type.to_s.singularize} ##{entry&._id.to_s}"
 
           liquid_assigns["current_#{type.singularize}"] = entry
         end

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

@@ -40,7 +40,7 @@ module Locomotive::Steam
         def redirect_to(location, type = 301)
           _location = mounted_on && !location.starts_with?(mounted_on) && (location =~ Locomotive::Steam::IsHTTP).nil? ? "#{mounted_on}#{location}" : location
 
-          self.log "Redirected to #{_location}".blue
+          self.debug_log "Redirected to #{_location}".blue
 
           headers = { 'Content-Type' => HTML_CONTENT_TYPE, 'Location' => _location }
           inject_cookies(headers)
@@ -83,6 +83,10 @@ module Locomotive::Steam
           Locomotive::Common::Logger.info (' ' * offset) + msg
         end
 
+        def debug_log(msg, offset = 2)
+          Locomotive::Common::Logger.debug (' ' * offset) + msg
+        end
+
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Locomotive::Steam
             "Your 404 page is missing."
           end) + " Please create it."
 
-          log "[Warning] #{message}".red
+          debug_log "[Warning] #{message}".red
 
           render_response(message, 404)
         end

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

@@ -23,7 +23,7 @@ module Locomotive::Steam
 
         set_locale_cookie
 
-        log "Locale used: #{locale.upcase}"
+        debug_log "Locale used: #{locale.upcase}"
 
         I18n.with_locale(locale) do
           self.next
@@ -48,7 +48,7 @@ module Locomotive::Steam
 
       def locale_from_params
         params[:locale]&.to_sym.tap do |locale|
-          log 'Locale extracted from the params' unless locale.blank?
+          debug_log 'Locale extracted from the params' unless locale.blank?
         end
       end
 
@@ -62,7 +62,7 @@ module Locomotive::Steam
           env['steam.path'] = path.gsub(/^\/#{$1 + $2}/, '/')
           env['steam.locale_in_path'] = true
 
-          log 'Locale extracted from the path'
+          debug_log'Locale extracted from the path'
 
           locale.to_sym
         end
@@ -73,14 +73,14 @@ module Locomotive::Steam
         .sort { |a, b| b[1] <=> a[1] }
         .map  { |lang, _| lang[0..1].to_sym }
         .find { |lang| locales.include?(lang) }.tap do |locale|
-          log 'Locale extracted from the header' unless locale.blank?
+          debug_log 'Locale extracted from the header' unless locale.blank?
         end
       end
 
       def locale_from_cookie
         if locale = services.cookie.get(cookie_key_name)
 
-          log 'Locale extracted from the cookie'
+          debug_log 'Locale extracted from the cookie'
 
           locale.to_sym
         end

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

@@ -14,10 +14,8 @@ module Locomotive::Steam
 
         log "Started #{env['REQUEST_METHOD'].upcase} \"#{env['PATH_INFO']}\" at #{now}".light_white, 0
 
-        if Locomotive::Steam.configuration.mode == :test
-          log "Params: #{env.fetch('steam.request').params.inspect}"
-        end
-
+        debug_log "Params: #{env.fetch('steam.request').params.inspect}"
+        
         app.call(env).tap do |response|
           done_in_ms = ((Time.now - now) * 10000).truncate / 10.0
           log "Completed #{code_to_human(response.first)} in #{done_in_ms}ms\n\n".green

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

@@ -13,10 +13,10 @@ module Locomotive::Steam
 
         if page = fetch_page
           if !page.not_found?
-            log "Found page \"#{page.title}\" [#{page.fullpath}]"
+            debug_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 (#{path.inspect}), rendering the 404 page.".magenta
+            debug_log "Page not found (#{path.inspect}), rendering the 404 page.".magenta
           end
         end
 
@@ -47,7 +47,7 @@ module Locomotive::Steam
           regexp = Regexp.new(/^#{_route}$/i)
 
           if (matches = path.match(regexp))
-            log "Route found! #{route} (#{handle})"
+            debug_log "Route found! #{route} (#{handle})"
 
             # we want the named route parameters in the request params object
             # because they will be needed in the liquid template.
@@ -63,7 +63,7 @@ module Locomotive::Steam
       def fetch_page_from_paths
         page_finder.match(path).tap do |pages|
           if pages.size > 1
-            self.log "Found multiple pages: #{pages.map(&:title).join(', ')}"
+            self.debug_log "Found multiple pages: #{pages.map(&:title).join(', ')}"
           end
         end.first
       end

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

@@ -16,9 +16,15 @@ module Locomotive::Steam
       protected
 
       def set_path!(env)
+        site = env['steam.site']
         path = env['steam.path'].dup
 
-        path.gsub!(/\.[a-zA-Z][a-zA-Z0-9]{2,}$/, '')
+        if site.allow_dots_in_slugs
+          path.gsub!(/\.(html|htm)$/, '')
+        else
+          path.gsub!(/\.[a-zA-Z][a-zA-Z0-9]{2,}$/, '')
+        end
+
         path.gsub!(/^\//, '')
         path.gsub!(/^[A-Z]:\//, '')
 

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

@@ -14,7 +14,7 @@ module Locomotive::Steam
         return if env['steam.private_access_disabled']
 
         if site.private_access
-          log "Site with private access"
+          debug_log "Site with private access"
 
           if access_granted?
             store_password
@@ -28,7 +28,7 @@ module Locomotive::Steam
 
       def render_lock_screen
         if page = services.page_finder.by_handle('lock_screen', false)
-          log "Found custom lock screen: #{page.title}"
+          debug_log "Found custom lock screen: #{page.title}"
           env['steam.page'] = page
         else
           render_response(lock_screen_html, 403)

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

@@ -26,7 +26,7 @@ module Locomotive::Steam
           env['steam.content_entry'] = page.content_entry = entry
 
           # log it
-          log "Found content entry: #{entry._label}"
+          debug_log "Found content entry: #{entry._label}"
         else
           url = services.url_builder.url_for(page_not_found, locale)
           redirect_to url, 302

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

@@ -10,7 +10,7 @@ module Locomotive::Steam
       def _call
         timezone = site.try(:timezone)
 
-        log "Timezone: #{timezone.name}"
+        debug_log "Timezone: #{timezone.name}"
 
         Time.use_zone(timezone) do
           self.next

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.6.0.rc1'
+    VERSION = '1.6.1'
   end
 end

data/lib/locomotive/steam.rb

@@ -48,6 +48,13 @@ module Locomotive
     def self.configure
       yield(configuration)
 
+      # configure the logger
+      Locomotive::Common.reset
+      Locomotive::Common.configure do |config|
+        config.notifier = Locomotive::Common::Logger.setup(configuration.log_file)
+        config.notifier.level = configuration.log_level
+      end
+
       require_relative 'steam/initializers'
     end
 

data/locomotivecms_steam.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mongo',      '~> 2.13.1'
   spec.add_development_dependency 'origin',     '~> 2.3.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.11.0'
+  spec.add_dependency 'nokogiri',               '>= 1.11', '< 1.14'
   spec.add_dependency 'sanitize',               '~> 5.2.1'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.16.0'
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mime-types',             '~> 3.3.0'
   spec.add_dependency 'duktape',                '~> 2.0.1.1'
   spec.add_dependency 'pony',                   '~> 1.12'
-
+  
   spec.add_dependency 'locomotivecms_common',   '~> 0.4.0'
 
   spec.required_ruby_version = ['>= 2.5', '< 3']

data/spec/fixtures/default/app/content_types/accounts.yml

@@ -22,6 +22,9 @@ order_by: manually
 # Activate public 'create' API (e.g for a contact form)
 # public_submission_enabled: false
 
+# Enable Google Recaptcha to create new public entries
+# recaptcha_required: true
+
 # Array of emails to be notified of new entries made with the public API
 # public_submission_accounts: ['john@example.com']
 

data/spec/spec_helper.rb

@@ -45,7 +45,7 @@ RSpec.configure do |config|
   config.filter_run focused: true
   config.run_all_when_everything_filtered = true
 
-  config.before(:all) { remove_logs; setup_common }
+  config.before(:all) { remove_logs; reset_logger }
   config.before { reset! }
   config.after  { reset! }
   config.order = :random

data/spec/support/helpers.rb

@@ -19,7 +19,7 @@ module Spec
       FileUtils.rm_rf(File.expand_path('../../fixtures/default/log', __FILE__))
     end
 
-    def setup_common(logger_output = nil)
+    def reset_logger(logger_output = nil)
       Locomotive::Common.reset
       Locomotive::Common.configure do |config|
         logger_output ||= File.join(default_fixture_site_path, 'log/steam.log')
@@ -30,9 +30,6 @@ module Spec
     def run_server
       require 'haml'
 
-      output = ENV['STEAM_VERBOSE'] ? nil : File.join(default_fixture_site_path, 'log/steam.log')
-      setup_common(output)
-
       Locomotive::Steam.configure do |config|
         config.mode           = :test
         config.adapter        = { name: :filesystem, path: default_fixture_site_path }
@@ -40,6 +37,7 @@ module Spec
         config.asset_path     = File.expand_path(File.join(default_fixture_site_path, 'public'))
         config.serve_assets   = true
         config.minify_assets  = true
+        config.log_file       = ENV['STEAM_VERBOSE'] ? nil : File.join(default_fixture_site_path, 'log/steam.log')
       end
 
       Locomotive::Common::Logger.info 'Server started...'

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

@@ -62,7 +62,7 @@ describe Locomotive::Steam::Liquid::Tags::WithScope do
       it { expect(conditions['hidden']).to eq false }
 
     end
-
+    
     describe 'decode regexps' do
 
       let(:source) { "{% with_scope title: /Like this one|or this one/ %}{% assign conditions = with_scope %}{% endwith_scope %}" }
@@ -146,6 +146,15 @@ describe Locomotive::Steam::Liquid::Tags::WithScope do
 
     end
 
+    describe 'In a loop context, each scope should be evaluated correctly' do
+        let(:assigns) { {'list' => ['A', 'B', 'C']} }
+
+        let(:source) { "{% for key in list %}{% with_scope foo: key %}{% assign conditions = with_scope %}{% endwith_scope %}{{ conditions }}{% endfor %}" }
+
+      it { expect(output).to eq '{"foo"=>"A"}{"foo"=>"B"}{"foo"=>"C"}' }
+
+    end
+
   end
 
 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('7cf53dab8a56bd5d2cbf7610101514fd').and_return(response) }
+      before { expect(cache).to receive(:read).with('4fb84e6d3037dcd54979c3461c5a5ffd').and_return(response) }
 
       context 'the cache is empty' do
 
-        before { expect(cache).to receive(:write).with('7cf53dab8a56bd5d2cbf7610101514fd', Marshal.dump([200, {}, ["Hello world!"]])) }
+        before { expect(cache).to receive(:write).with('4fb84e6d3037dcd54979c3461c5a5ffd', 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 '7cf53dab8a56bd5d2cbf7610101514fd' }
+          it { is_expected.to eq '4fb84e6d3037dcd54979c3461c5a5ffd' }
 
         end
 
@@ -104,7 +104,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       context 'based on the ETag' do
 
-        let(:etag) { '7cf53dab8a56bd5d2cbf7610101514fd' }
+        let(:etag) { '4fb84e6d3037dcd54979c3461c5a5ffd' }
 
         it 'returns a 304 (Not modified) without no cache headers' do
           expect(subject.first).to eq 304

data/spec/unit/middlewares/path_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/middlewares/path'
+
+describe Locomotive::Steam::Middlewares::Path do
+
+  let(:allow_dots_in_slugs) { false }
+  let(:site)            { instance_double('Site', allow_dots_in_slugs: allow_dots_in_slugs) }
+  let(:routes)          { {} }
+  let(:url)             { 'http://models.example.com' }
+  let(:path)            { 'hello-world' }
+  let(:app)             { ->(env) { [200, env, 'app'] } }
+  let(:middleware)      { described_class.new(app) }
+
+  subject do
+    env = env_for(url, 'steam.site' => site)
+    env['steam.path']         = path
+    env['steam.locale']       = 'en'
+    env['steam.request']      = Rack::Request.new(env)
+    code, env = middleware.call(env)
+    env['steam.path']
+  end
+
+  describe 'allow_dots_in_slugs is off' do
+    context 'html extension' do
+      let(:path) { 'foo.html' }
+      it { is_expected.to eq 'foo' }
+    end
+
+    context 'the path stores a version' do
+      let(:path) { 'foo-v1.0' }
+      it { is_expected.to eq 'foo-v1.0' }
+    end
+
+    context 'prefixed by 3 letters word' do
+      let(:path) { 'foo.bar' }
+      it { is_expected.to eq 'foo' }  
+    end
+
+    context 'starting by a dot' do
+      let(:path) { '.well-known' }
+      it { is_expected.to eq '.well-known' }  
+    end
+  end
+
+  describe 'allow_dots_in_slugs is on' do
+    let(:allow_dots_in_slugs) { true }
+
+    context 'html extension' do
+      let(:path) { 'foo.html' }
+      it { is_expected.to eq 'foo' }
+    end
+
+    context 'prefixed by a version' do
+      let(:path) { 'foo-v1.0' }
+      it { is_expected.to eq 'foo-v1.0' }  
+    end
+
+    context 'prefixed by 3 letters word' do
+      let(:path) { 'foo.bar' }
+      it { is_expected.to eq 'foo.bar' }  
+    end
+
+    context 'starting by a dot' do
+      let(:path) { '.well-known' }
+      it { is_expected.to eq '.well-known' }  
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.6.0.rc1
+  version: 1.6.1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,16 +59,22 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.11'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -917,6 +923,7 @@ files:
 - spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_not_found_spec.rb
 - spec/unit/middlewares/page_spec.rb
+- spec/unit/middlewares/path_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
 - spec/unit/middlewares/redirection_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
@@ -978,11 +985,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine
@@ -1238,6 +1245,7 @@ test_files:
 - spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_not_found_spec.rb
 - spec/unit/middlewares/page_spec.rb
+- spec/unit/middlewares/path_spec.rb
 - spec/unit/middlewares/private_access_spec.rb
 - spec/unit/middlewares/redirection_spec.rb
 - spec/unit/middlewares/renderer_spec.rb