locomotivecms_steam 1.7.1 → 1.8.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54113c1f820748abcfc48e22803c588b09387b5889942ac838c4d2165b113de3
-  data.tar.gz: 02706cbb6e9002ae7180dfd99106acab607e58cae7f68b0b7a9b43f877b49b0c
+  metadata.gz: bbac080500edff48f27330a294f5bfe6ca8429aa3ceb3b432050dbab884dabd7
+  data.tar.gz: 21abc53a533550a832797bf54431ded6a3fcb88493dd3266e5a943d80cf692ef
 SHA512:
-  metadata.gz: 07231a9488c08e9f664b6ea326c9e09c86a7eca83567be52ee876c0fb5a87203db2eb5919d87207926f8fbd7185788644b622e73a4fb788f5dd1ae345e29c269
-  data.tar.gz: 742faf6804b70f83d14491e99358f4f9e99c316442ca00434684ef17ba57fb2e36846f59f76bffb7921b8e276c863c79143e64926d253ac295e59c3012ae2c29
+  metadata.gz: 6c8164e4ccba652609c7238fc673ae349eea722cf908fc06829c937c920ba1e9eaa00fb54372abe71be01e51e247b2c363dcc23bf665461b613ca62556343cb5
+  data.tar.gz: 90b452804c38f418adf630de59103e0b6fc53d49f0a97493b91b0d328c4e650aa172ac436c556bebdfa22b02a43012156cfc838604ab3740f827a44fd5f1099e

data/Gemfile

@@ -11,10 +11,10 @@ group :development do
 
   gem 'rake'
 
-  gem 'puma',               '~> 6.1.0'
-  gem 'haml',               '~> 5.2.0'
+  gem 'puma',               '~> 6.4.0'
+  gem 'haml',               '~> 6.2.3'
 
-  gem 'rack', '~> 2.2.3.1'
+  gem 'rack', '~> 3.0'
   gem 'rack-mini-profiler', '~> 0.10.1'
   gem 'flamegraph'
   gem 'stackprof' # ruby 2.1+ only
@@ -22,7 +22,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec',              '~> 3.7.0'
+  gem 'rspec',              '~> 3.12.0'
   gem 'json_spec',          '~> 1.1.5'
   gem 'i18n-spec',          '~> 0.6.0'
 
@@ -30,7 +30,7 @@ group :test do
 
   # gem 'pry-byebug',         '~> 3.3.0'
 
-  gem 'rack-test',          '~> 0.8.2'
+  gem 'rack-test',          '~> 2.1.0'
 
   gem 'coveralls',                  '~> 0.8.23',   require: false
 end

data/Gemfile.lock

@@ -1,46 +1,55 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.7.1)
+    locomotivecms_steam (1.8.0.alpha1)
       RedCloth (~> 4.3.2)
       bcrypt (~> 3.1.11)
       chronic (~> 0.10.2)
       dragonfly (>= 1.2, < 1.5)
       duktape (~> 2.0.1.1)
-      execjs (~> 2.8.1)
+      execjs (~> 2.9.1)
       httparty (~> 0.16.0)
       kramdown (~> 2.3.0)
       liquid (~> 4.0.4)
-      locomotivecms_common (~> 0.5.0)
-      mime-types (~> 3.3.0)
+      locomotivecms_common (~> 0.6.0.alpha1)
+      mime-types (~> 3.5.0)
       mimetype-fu (~> 0.1.2)
-      moneta (~> 1.0.0)
+      moneta (~> 1.6.0)
       morphine (~> 0.1.1)
       multi_json (~> 1.15.0)
       nokogiri (~> 1.14.2)
       pony (~> 1.12)
       rack-cache (>= 1.7, < 2)
       rack-rewrite (~> 1.5.1)
+      rack-session (~> 2.0.0)
       rack_csrf (~> 2.6.0)
       sanitize (~> 6.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.2)
-    activesupport (7.0.4.2)
+    RedCloth (4.3.4)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     attr_extras (7.1.0)
-    bcrypt (3.1.18)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    bigdecimal (3.1.7)
     bson (4.15.0)
     chronic (0.10.2)
-    colorize (0.8.1)
-    concurrent-ruby (1.2.2)
+    colorize (1.1.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -48,36 +57,38 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    date (3.3.3)
-    diff-lcs (1.5.0)
+    date (3.3.4)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     dragonfly (1.4.0)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
+    drb (2.2.1)
     duktape (2.0.1.1)
-    execjs (2.8.1)
+    execjs (2.9.1)
     flamegraph (0.9.5)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.2.5)
+      temple (>= 0.8.2)
+      thor
       tilt
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-spec (0.6.0)
       iso
     iso (0.4.0)
       i18n
-    json (2.6.3)
+    json (2.7.1)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     kramdown (2.3.2)
       rexml
     liquid (4.0.4)
-    locomotivecms_common (0.5.0)
+    locomotivecms_common (0.6.0.alpha1)
       activesupport (>= 5)
       attr_extras (~> 7.1.0)
       colorize
@@ -88,67 +99,70 @@ GEM
       net-pop
       net-smtp
     memory_profiler (1.0.1)
-    mime-types (3.3.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2024.0305)
     mimetype-fu (0.1.2)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
-    moneta (1.0.0)
-    mongo (2.18.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.22.3)
+    moneta (1.6.0)
+    mongo (2.18.3)
       bson (>= 4.14.1, < 5.0.0)
     morphine (0.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.4)
+    mutex_m (0.2.0)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2)
+    nio4r (2.7.0)
+    nokogiri (1.14.5)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.14.5-x86_64-darwin)
       racc (~> 1.4)
     origin (2.3.1)
     pony (1.13.1)
       mail (>= 2.0)
-    public_suffix (5.0.1)
-    puma (6.1.0)
+    public_suffix (5.0.4)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.3.1)
-    rack-cache (1.13.0)
+    racc (1.7.3)
+    rack (3.0.9.1)
+    rack-cache (1.16.0)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
       rack (>= 1.2.0)
     rack-rewrite (1.5.1)
-    rack-test (0.8.3)
-      rack (>= 1.0, < 3)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
-    rake (13.0.6)
-    rexml (3.2.5)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.1.0)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.3)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sanitize (6.0.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.2)
+    sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     simplecov (0.16.1)
@@ -156,16 +170,16 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    stackprof (0.2.23)
-    stringex (2.8.5)
+    stackprof (0.2.26)
+    stringex (2.8.6)
     sync (0.5.0)
-    temple (0.10.0)
-    term-ansicolor (1.7.1)
+    temple (0.10.3)
+    term-ansicolor (1.7.2)
       tins (~> 1.0)
-    thor (1.2.1)
-    tilt (2.1.0)
-    timecop (0.9.6)
-    timeout (0.3.2)
+    thor (1.3.1)
+    tilt (2.3.0)
+    timecop (0.9.8)
+    timeout (0.4.1)
     tins (1.32.1)
       sync
     tzinfo (2.0.6)
@@ -178,19 +192,19 @@ PLATFORMS
 DEPENDENCIES
   coveralls (~> 0.8.23)
   flamegraph
-  haml (~> 5.2.0)
+  haml (~> 6.2.3)
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.5)
   locomotivecms_steam!
   memory_profiler
   mongo (~> 2.18.2)
   origin (~> 2.3.1)
-  puma (~> 6.1.0)
-  rack (~> 2.2.3.1)
+  puma (~> 6.4.0)
+  rack (~> 3.0)
   rack-mini-profiler (~> 0.10.1)
-  rack-test (~> 0.8.2)
+  rack-test (~> 2.1.0)
   rake
-  rspec (~> 3.7.0)
+  rspec (~> 3.12.0)
   stackprof
   timecop (~> 0.9.1)
 

data/bin/steam.rb

@@ -74,7 +74,6 @@ Locomotive::Steam.configure do |config|
   config.serve_assets   = options[:asset_path].present?
   config.asset_path     = options[:asset_path]
   config.asset_host     = options[:asset_host]
-  config.minify_assets  = false
   config.log_file       = options[:log_file]
 end
 

data/lib/locomotive/steam/configuration.rb

@@ -63,15 +63,7 @@ module Locomotive
       # default: nil
       #
       attr_accessor :asset_path
-
-      # If java is installed and if this option is enabled,
-      # then Uglifier and Sass are used to minify the javascript and the css.
-      #
-      # default: false
-      #
-      attr_accessor :minify_assets
-      def minify_assets; @minify_assets.nil? ? false : @minify_assets; end
-
+      
       # Dragonfly needs it to generate the protective SHA.
       #
       # default: 'please change it'

data/lib/locomotive/steam/decorators/template_decorator.rb

@@ -36,7 +36,7 @@ module Locomotive
 
         def render_haml(source, template_path)
           begin
-            Haml::Engine.new(source, escape_attrs: false).render
+            Haml::Template.new(escape_attrs: false) { source }.render
           rescue Haml::SyntaxError => e
             raise Steam::RenderError.new(e, template_path, source)
           end

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

@@ -39,7 +39,7 @@ module Locomotive::Steam
           code, headers, _ = response = fetch_cached_response(key)
 
           unless CACHEABLE_RESPONSE_CODES.include?(code.to_i)
-            env['steam.cache_control'] = headers['Cache-Control'] = NO_CACHE_CONTROL
+            env['steam.cache_control'] = headers['cache-control'] = NO_CACHE_CONTROL
             env['steam.cache_vary'] = headers['Vary'] = nil
           end
 

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

@@ -8,7 +8,7 @@ module Locomotive::Steam
         HTML_MIME_TYPES   = [nil, 'text/html', 'application/x-www-form-urlencoded', 'multipart/form-data'].freeze
 
         CACHE_HEADERS     = {
-          'steam.cache_control'       => 'Cache-Control',
+          'steam.cache_control'       => 'cache-control',
           'steam.cache_vary'          => 'Vary',
           'steam.cache_etag'          => 'ETag',
           'steam.cache_last_modified' => 'Last-Modified'
@@ -25,7 +25,7 @@ module Locomotive::Steam
         end
 
         def render_response(content, code = 200, type = nil)
-          base_headers = { 'Content-Type' => type || HTML_CONTENT_TYPE }
+          base_headers = { 'content-type' => type || HTML_CONTENT_TYPE }
 
           CACHE_HEADERS.each do |key, http_name|
             base_headers[http_name] = env[key] if env[key]
@@ -34,7 +34,7 @@ module Locomotive::Steam
           _headers = env['steam.headers'] || {}
           inject_cookies(_headers)
 
-          @next_response = [code, base_headers.merge(_headers), [content]]
+          @next_response = [code, base_headers.merge(_headers), [content].compact]
         end
 
         def redirect_to(location, type = 301)
@@ -42,7 +42,7 @@ module Locomotive::Steam
 
           self.debug_log "Redirected to #{_location}".blue
 
-          headers = { 'Content-Type' => HTML_CONTENT_TYPE, 'Location' => _location }
+          headers = { 'content-type' => HTML_CONTENT_TYPE, 'location' => _location }
           inject_cookies(headers)
 
           @next_response = [type, headers, []]

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

@@ -10,7 +10,7 @@ module Locomotive::Steam
       def call(env)
         if env['PATH_INFO'] == '/favicon.ico'
           # Default and empty Favicon rendered
-          [200, { 'Content-Type' => 'image/vnd.microsoft.icon' }, ['']]
+          [200, { 'content-type' => 'image/vnd.microsoft.icon' }, ['']]
         else
           app.call(env)
         end

data/lib/locomotive/steam/models/associations/embedded.rb

@@ -37,8 +37,8 @@ module Locomotive::Steam
         # TODO: not implemented yet
       end
 
-      def method_missing(name, *args, &block)
-        @repository.send(name, *args, &block)
+      def method_missing(name, *args, **kwargs, &block)
+        @repository.send(name, *args, **kwargs, &block)
       end
 
       def respond_to_missing?(name, include_private = false)

data/lib/locomotive/steam/models/mapper.rb

@@ -64,9 +64,10 @@ module Locomotive::Steam
       end
 
       def deserialize(attributes)
-        build_localized_attributes(attributes)
-        build_associations(attributes)
-        attributes
+        enhanced_attributes = attributes.with_indifferent_access
+        build_localized_attributes(enhanced_attributes)
+        build_associations(enhanced_attributes)
+        enhanced_attributes
       end
 
       def serialize(entity)

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.7.1'
+    VERSION = '1.8.0.alpha1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -29,20 +29,21 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
   spec.add_dependency 'rack-cache',             '>= 1.7', '< 2'
+  spec.add_dependency 'rack-session',           '~> 2.0.0'
   spec.add_dependency 'rack_csrf',              '~> 2.6.0'
   spec.add_dependency 'dragonfly',              '>= 1.2', '< 1.5'
-  spec.add_dependency 'moneta',                 '~> 1.0.0'
+  spec.add_dependency 'moneta',                 '~> 1.6.0'
 
-  spec.add_dependency 'execjs',              '~> 2.8.1'
+  spec.add_dependency 'execjs',                 '~> 2.9.1'
 
   spec.add_dependency 'kramdown',               '~> 2.3.0'
   spec.add_dependency 'RedCloth',               '~> 4.3.2'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
-  spec.add_dependency 'mime-types',             '~> 3.3.0'
+  spec.add_dependency 'mime-types',             '~> 3.5.0'
   spec.add_dependency 'duktape',                '~> 2.0.1.1'
   spec.add_dependency 'pony',                   '~> 1.12'
   
-  spec.add_dependency 'locomotivecms_common',   '~> 0.5.0'
+  spec.add_dependency 'locomotivecms_common',   '~> 0.6.0.alpha1'
 
-  spec.required_ruby_version = ['>= 2.7', '< 3.2']
+  spec.required_ruby_version = ['>= 3.0']
 end

data/spec/integration/liquid/filters/translate_spec.rb

@@ -37,21 +37,21 @@ describe Locomotive::Steam::Liquid::Filters::Translate do
     describe 'legacy syntax' do
 
       let(:source) { "{{ 'welcome_message' | translate: 'fr', 'locomotive.default' }}" }
-      it { expect(translator).to receive(:translate).with('welcome_message', 'locale' => 'fr', 'scope' => 'locomotive.default'); subject }
+      it { expect(translator).to receive(:translate).with('welcome_message', { 'locale' => 'fr', 'scope' => 'locomotive.default' }); subject }
 
     end
 
     describe 'new syntax' do
 
       let(:source) { "{{ 'welcome_message' | translate: locale: 'fr', scope: 'locomotive.default' }}" }
-      it { expect(translator).to receive(:translate).with('welcome_message', 'locale' => 'fr', 'scope' => 'locomotive.default'); subject }
+      it { expect(translator).to receive(:translate).with('welcome_message', { 'locale' => 'fr', 'scope' => 'locomotive.default' }); subject }
 
     end
 
     describe 'shortcut alias' do
 
       let(:source) { "{{ 'welcome_message' | t: 'fr', 'locomotive.default' }}" }
-      it { expect(translator).to receive(:translate).with('welcome_message', 'locale' => 'fr', 'scope' => 'locomotive.default'); subject }
+      it { expect(translator).to receive(:translate).with('welcome_message', { 'locale' => 'fr', 'scope' => 'locomotive.default' }); subject }
 
     end
 

data/spec/support/helpers.rb

@@ -36,7 +36,6 @@ module Spec
         # config.adapter        = { name: :'mongoDB', database: 'steam_test', hosts: ['127.0.0.1'] }
         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
 

data/spec/unit/liquid/drops/content_entry_collection_spec.rb

@@ -42,14 +42,14 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
 
       describe '#first' do
         before do
-          expect(services.repositories.content_entry).to receive(:all).with('visible' => true).and_return(['a', 'b'])
+          expect(services.repositories.content_entry).to receive(:all).with({ 'visible' => true }).and_return(['a', 'b'])
         end
         it { expect(drop.first).to eq('a') }
       end
 
       describe '#count' do
         before do
-          expect(services.repositories.content_entry).to receive(:count).with('visible' => true).and_return(2)
+          expect(services.repositories.content_entry).to receive(:count).with({ 'visible' => true }).and_return(2)
         end
         it { expect(drop.count).to eq 2 }
       end
@@ -57,7 +57,7 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntryCollection do
       describe 'only applied to the first content type' do
 
         it 'sets the content type in the context' do
-          expect(services.repositories.content_entry).to receive(:all).with('visible' => true).and_return(['a', 'b'])
+          expect(services.repositories.content_entry).to receive(:all).with({ 'visible' => true }).and_return(['a', 'b'])
           expect(context['with_scope_content_type']).to eq nil
           drop.first
           expect(context['with_scope_content_type']).to eq 'articles'

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

@@ -111,7 +111,7 @@ describe Locomotive::Steam::Liquid::Tags::Consume do
     let(:source)    { %{{% consume blog from "#{url}" timeout: 5.0 %}{{ blog.title }}{% endconsume %}} }
 
     it 'should pass the timeout option to httparty' do
-      expect(services.external_api).to receive(:consume).with(url, timeout: 5.0).and_return(response)
+      expect(services.external_api).to receive(:consume).with(url, { timeout: 5.0 }).and_return(response)
       subject
     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('40ba2b3cfde6e2f8539c9ffa02fab139').and_return(response) }
+      before { expect(cache).to receive(:read).with('7f3fe1e49370f63970331ec3194d4590').and_return(response) }
 
       context 'the cache is empty' do
 
-        before { expect(cache).to receive(:write).with('40ba2b3cfde6e2f8539c9ffa02fab139', Marshal.dump([200, {}, ["Hello world!"]])) }
+        before { expect(cache).to receive(:write).with('7f3fe1e49370f63970331ec3194d4590', 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 '40ba2b3cfde6e2f8539c9ffa02fab139' }
+          it { is_expected.to eq '7f3fe1e49370f63970331ec3194d4590' }
 
         end
 
@@ -104,11 +104,11 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       context 'based on the ETag' do
 
-        let(:etag) { '40ba2b3cfde6e2f8539c9ffa02fab139' }
+        let(:etag) { '7f3fe1e49370f63970331ec3194d4590' }
 
         it 'returns a 304 (Not modified) without no cache headers' do
           expect(subject.first).to eq 304
-          expect(subject.last['Cache-Control']).to eq nil
+          expect(subject.last['cache-control']).to eq nil
         end
 
       end
@@ -119,7 +119,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
         it 'returns a 304 (Not modified) without no cache headers' do
           expect(subject.first).to eq 304
-          expect(subject.last['Cache-Control']).to eq nil
+          expect(subject.last['cache-control']).to eq nil
         end
 
       end

data/spec/unit/middlewares/encoded_link_redirection_spec.rb

@@ -22,7 +22,7 @@ describe Locomotive::Steam::Middlewares::EncodedLinkRedirection do
     env['steam.services']   = services
     env['locomotive.path']  = locomotive_path
     code, env = middleware.call(env)
-    [code, env['Location']]
+    [code, env['location']]
   end
 
   describe 'no redirections' do

data/spec/unit/middlewares/helpers_spec.rb

@@ -38,7 +38,7 @@ describe Locomotive::Steam::Middlewares::Concerns::Helpers do
 
   describe '#redirect_to' do
 
-    subject { instance.redirect_to(location)[1]['Location'] }
+    subject { instance.redirect_to(location)[1]['location'] }
 
     context 'mounted_on is not blank' do
 

data/spec/unit/middlewares/impersonated_entry_spec.rb

@@ -54,7 +54,7 @@ describe Locomotive::Steam::Middlewares::ImpersonatedEntry do
 
       subject do
         code, env, body = call
-        [code, env['steam.impersonating_authenticated_entry'], env['Location']]
+        [code, env['steam.impersonating_authenticated_entry'], env['location']]
       end
 
       before do

data/spec/unit/middlewares/locale_redirection_spec.rb

@@ -20,7 +20,7 @@ describe Locomotive::Steam::Middlewares::LocaleRedirection do
     env['steam.request']    = Rack::Request.new(env)
     env['steam.path']       = env['steam.request'].path_info.gsub(/\A#{mounted_on}/, '').gsub(/\A\/#{locale}/, '')
     code, env = middleware.call(env)
-    [code, env['Location']]
+    [code, env['location']]
   end
 
   describe 'prefix_default_locale is false' do

data/spec/unit/middlewares/redirection_spec.rb

@@ -17,7 +17,7 @@ describe Locomotive::Steam::Middlewares::Redirection do
     env['steam.request']    = Rack::Request.new(env)
     env['locomotive.path']  = locomotive_path
     code, env = middleware.call(env)
-    [code, env['Location']]
+    [code, env['location']]
   end
 
   describe 'no redirection exception raised' do

data/spec/unit/middlewares/section_spec.rb

@@ -46,7 +46,7 @@ describe Locomotive::Steam::Middlewares::Section do
   it 'renders the HTML code related to the section' do
     is_expected.to eq [
       200,
-      { "Content-Type" => "text/html" },
+      { "content-type" => "text/html" },
       [%(<div id="locomotive-section-header" class="locomotive-section" data-locomotive-section-type="header"><span id="header-section"></span>Here some </div>)]
     ]
   end
@@ -62,7 +62,7 @@ describe Locomotive::Steam::Middlewares::Section do
     it 'renders the HTML code related to the section' do
       is_expected.to eq [
         200,
-        { "Content-Type" => "text/html" },
+        { "content-type" => "text/html" },
         [%(<div id="locomotive-section-dropzone-42" class="locomotive-section" data-locomotive-section-type="header"><span id="dropzone-42-section"></span>Here some modified HTML</div>)]
       ]
     end

data/spec/unit/middlewares/site_spec.rb

@@ -23,7 +23,7 @@ describe Locomotive::Steam::Middlewares::Site do
     env['steam.is_default_host']  = is_default_host
     env['steam.live_editing']     = live_editing
     code, env = middleware.call(env)
-    [code, env['Location']]
+    [code, env['location']]
   end
 
   describe 'no site' do

data/spec/unit/middlewares/sitemap_spec.rb

@@ -26,7 +26,7 @@ describe Locomotive::Steam::Middlewares::Sitemap do
     describe 'no pages' do
 
       it 'renders a blank sitemap' do
-        is_expected.to eq [200, { "Content-Type"=>"application/xml" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n\n</urlset>\n"]]
+        is_expected.to eq [200, { "content-type"=>"application/xml" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n\n</urlset>\n"]]
       end
 
     end
@@ -36,7 +36,7 @@ describe Locomotive::Steam::Middlewares::Sitemap do
       let(:pages) { [instance_double('Page', index?: false, not_found?: false, layout?: true)] }
 
       it 'renders a blank sitemap' do
-        is_expected.to eq [200, { "Content-Type"=>"application/xml" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n\n</urlset>\n"]]
+        is_expected.to eq [200, { "content-type"=>"application/xml" }, ["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n\n</urlset>\n"]]
       end
 
     end

data/spec/unit/middlewares/url_redirection_spec.rb

@@ -18,7 +18,7 @@ describe Locomotive::Steam::Middlewares::UrlRedirection do
     env['steam.request']    = Rack::Request.new(env)
     env['locomotive.path']  = locomotive_path
     code, env = middleware.call(env)
-    [code, env['Location']]
+    [code, env['location']]
   end
 
   describe 'no redirections' do

data/spec/unit/services/email_service_spec.rb

@@ -21,7 +21,7 @@ describe Locomotive::Steam::EmailService do
     subject { service.send_email(options, context) }
 
     it 'sends the email over Pony' do
-      expect(Pony).to receive(:mail).with(
+      expect(Pony).to receive(:mail).with({
         to:           'john@doe.net',
         from:         'me@locomotivecms.com',
         subject:      'Hello world',
@@ -32,7 +32,7 @@ describe Locomotive::Steam::EmailService do
           user_name:  'user',
           password:   'password'
         }
-      )
+      })
       subject
     end
 
@@ -61,7 +61,7 @@ describe Locomotive::Steam::EmailService do
       let(:options) { { to: 'john@doe.net', from: 'me@locomotivecms.com', subject: 'Hello world', page_handle: 'notification-email', smtp: smtp_options, html: true } }
 
       it 'sends the email over Pony' do
-        expect(Pony).to receive(:mail).with(
+        expect(Pony).to receive(:mail).with({
           to:           'john@doe.net',
           from:         'me@locomotivecms.com',
           subject:      'Hello world',
@@ -72,7 +72,7 @@ describe Locomotive::Steam::EmailService do
             user_name:  'user',
             password:   'password'
           }
-        )
+        })
         subject
       end
 
@@ -100,7 +100,7 @@ describe Locomotive::Steam::EmailService do
         end
 
         it 'sends the email over Pony' do
-          expect(Pony).to receive(:mail).with(
+          expect(Pony).to receive(:mail).with({
             to:           'john@doe.net',
             from:         'me@locomotivecms.com',
             subject:      'Hello world',
@@ -112,7 +112,7 @@ describe Locomotive::Steam::EmailService do
               user_name:  'user',
               password:   'password'
             }
-          )
+          })
           subject
         end
 
@@ -124,7 +124,7 @@ describe Locomotive::Steam::EmailService do
 
         it 'sends the email over Pony' do
           expect(Net::HTTP).to receive(:get).with(URI('http://acme.org/bar.txt')).and_return('Bar')
-          expect(Pony).to receive(:mail).with(
+          expect(Pony).to receive(:mail).with({
             to:           'john@doe.net',
             from:         'me@locomotivecms.com',
             subject:      'Hello world',
@@ -136,7 +136,7 @@ describe Locomotive::Steam::EmailService do
               user_name:  'user',
               password:   'password'
             }
-          )
+          })
           subject
         end
 
@@ -144,7 +144,7 @@ describe Locomotive::Steam::EmailService do
 
           it "doesn't send the email" do
             expect(Net::HTTP).to receive(:get).with(URI('http://acme.org/bar.txt')).and_raise('URL not responding')
-            expect(Pony).to receive(:mail).with(
+            expect(Pony).to receive(:mail).with({
               to:           'john@doe.net',
               from:         'me@locomotivecms.com',
               subject:      'Hello world',
@@ -156,7 +156,7 @@ describe Locomotive::Steam::EmailService do
                 user_name:  'user',
                 password:   'password'
               }
-            )
+            })
             subject
           end
 
@@ -169,7 +169,7 @@ describe Locomotive::Steam::EmailService do
         let(:attachments) { { 'bar.txt' => 'Bar' } }
 
         it 'sends the email over Pony' do
-          expect(Pony).to receive(:mail).with(
+          expect(Pony).to receive(:mail).with({
             to:           'john@doe.net',
             from:         'me@locomotivecms.com',
             subject:      'Hello world',
@@ -181,7 +181,7 @@ describe Locomotive::Steam::EmailService do
               user_name:  'user',
               password:   'password'
             }
-          )
+          })
           subject
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0.alpha1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -187,6 +187,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: rack-session
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
@@ -227,28 +241,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -297,14 +311,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: duktape
   requirement: !ruby/object:Gem::Requirement
@@ -339,14 +353,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0.alpha1
 description: The LocomotiveCMS Steam is the rendering stack used by both Wagon and
   Engine
 email:
@@ -891,17 +905,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine