locomotivecms_steam 1.8.0.alpha1 → 1.8.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbac080500edff48f27330a294f5bfe6ca8429aa3ceb3b432050dbab884dabd7
-  data.tar.gz: 21abc53a533550a832797bf54431ded6a3fcb88493dd3266e5a943d80cf692ef
+  metadata.gz: 39e4a6bd91280f55333a8768a420af73e22c4331fb7a3bc3f4c51c31640cc0de
+  data.tar.gz: 1cc1dac9af9cc2b79950334ef6a722a658738d39083774ff6e2a124d4318f851
 SHA512:
-  metadata.gz: 6c8164e4ccba652609c7238fc673ae349eea722cf908fc06829c937c920ba1e9eaa00fb54372abe71be01e51e247b2c363dcc23bf665461b613ca62556343cb5
-  data.tar.gz: 90b452804c38f418adf630de59103e0b6fc53d49f0a97493b91b0d328c4e650aa172ac436c556bebdfa22b02a43012156cfc838604ab3740f827a44fd5f1099e
+  metadata.gz: d1f85e7b6980570962161221eba73ef55947ed964004a73192923c87a63f0628d9760f8f923902ebc8902b768408e37af504a64c172ef71f3506ae99743111b8
+  data.tar.gz: 3c1ad7cc6b9565f0edc7e3868854e01af4a891148ba5ff9f8f4e129cf76a41d2ee6bfea4b094dd239dd7a3b400e7e946086198c201049a43ca051310301356ab

data/.github/workflows/continuous_integration.yml

@@ -0,0 +1,43 @@
+name: Continuous integration
+
+on: [push]
+
+jobs:
+  ci_validation:
+    runs-on: ubuntu-latest
+    
+    services:
+      mongo:
+        image: mongo:6.0.14
+        ports:
+          - 27017:27017
+        env:
+          MONGO_INITDB_DATABASE: steam_test_1_8_x
+        options: >-
+          --health-cmd "echo 'db.runCommand("ping").ok' | mongosh --quiet"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+          --name mongo_container
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Install MongoDB tools
+        run: |
+          wget https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.deb
+          sudo apt install ./mongodb-database-tools-ubuntu2204-x86_64-100.9.4.deb
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1.4
+          bundler-cache: true
+          cache-version: 1
+
+      - name: Prepare the DB
+        run: bundle exec rake mongodb:test:seed
+
+      - name: Test
+        run: bundle exec rspec

data/Gemfile

@@ -32,5 +32,5 @@ group :test do
 
   gem 'rack-test',          '~> 2.1.0'
 
-  gem 'coveralls',                  '~> 0.8.23',   require: false
+  gem 'simplecov',                  '~> 0.22.0', require: false
 end

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.8.0.alpha1)
+    locomotivecms_steam (1.8.0.alpha2)
       RedCloth (~> 4.3.2)
       bcrypt (~> 3.1.11)
       chronic (~> 0.10.2)
       dragonfly (>= 1.2, < 1.5)
       duktape (~> 2.0.1.1)
       execjs (~> 2.9.1)
-      httparty (~> 0.16.0)
+      httparty (~> 0.21.0)
       kramdown (~> 2.3.0)
       liquid (~> 4.0.4)
       locomotivecms_common (~> 0.6.0.alpha1)
@@ -17,7 +17,7 @@ PATH
       moneta (~> 1.6.0)
       morphine (~> 0.1.1)
       multi_json (~> 1.15.0)
-      nokogiri (~> 1.14.2)
+      nokogiri (~> 1.15.6)
       pony (~> 1.12)
       rack-cache (>= 1.7, < 2)
       rack-rewrite (~> 1.5.1)
@@ -29,7 +29,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.4)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -39,23 +39,17 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     attr_extras (7.1.0)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     bson (4.15.0)
     chronic (0.10.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)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
     crass (1.0.6)
     date (3.3.4)
     diff-lcs (1.5.1)
@@ -72,8 +66,8 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    httparty (0.16.4)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
@@ -81,7 +75,6 @@ GEM
       iso
     iso (0.4.0)
       i18n
-    json (2.7.1)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
@@ -101,42 +94,43 @@ GEM
     memory_profiler (1.0.1)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
+    mime-types-data (3.2024.0604)
     mimetype-fu (0.1.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.24.0)
     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)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
     mutex_m (0.2.0)
-    net-imap (0.4.10)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.14.5)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.7.1)
+    nokogiri (1.15.6)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.5-x86_64-darwin)
+    nokogiri (1.15.6-x86_64-darwin)
       racc (~> 1.4)
     origin (2.3.1)
     pony (1.13.1)
       mail (>= 2.0)
-    public_suffix (5.0.4)
+    public_suffix (6.0.0)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.7.3)
-    rack (3.0.9.1)
-    rack-cache (1.16.0)
+    racc (1.8.0)
+    rack (3.0.10)
+    rack-cache (1.17.0)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
       rack (>= 1.2.0)
@@ -148,7 +142,8 @@ GEM
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
     rake (13.1.0)
-    rexml (3.2.6)
+    rexml (3.3.1)
+      strscan
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -165,23 +160,20 @@ GEM
     sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    simplecov (0.16.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     stackprof (0.2.26)
     stringex (2.8.6)
-    sync (0.5.0)
+    strscan (3.1.0)
     temple (0.10.3)
-    term-ansicolor (1.7.2)
-      tins (~> 1.0)
     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)
       concurrent-ruby (~> 1.0)
 
@@ -190,7 +182,6 @@ PLATFORMS
   x86_64-darwin-22
 
 DEPENDENCIES
-  coveralls (~> 0.8.23)
   flamegraph
   haml (~> 6.2.3)
   i18n-spec (~> 0.6.0)
@@ -205,6 +196,7 @@ DEPENDENCIES
   rack-test (~> 2.1.0)
   rake
   rspec (~> 3.12.0)
+  simplecov (~> 0.22.0)
   stackprof
   timecop (~> 0.9.1)
 

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 NoCoffee
+Copyright (c) 2010-2024 NoCoffee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,7 +1,5 @@
 # Steam
 
-[![Code Climate](https://codeclimate.com/github/locomotivecms/steam/badges/gpa.svg)](https://codeclimate.com/github/locomotivecms/steam) [![Build Status](https://travis-ci.com/locomotivecms/steam.svg?branch=master)](https://travis-ci.com/locomotivecms/steam) [![Coverage Status](https://coveralls.io/repos/locomotivecms/steam/badge.svg?branch=master)](https://coveralls.io/r/locomotivecms/steam?branch=master) [![Gitter](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/locomotivecms/steam)
-
 The rendering stack used by both Wagon and Engine. It includes:
 
 - the rack stack to pages and already precompiled assets (through webpack, vite or other).
@@ -103,4 +101,4 @@ Note: you do not need to prefix with bundle exec as the docky-ruby image already
 
 ## License
 
-Copyright (c) 2023 NoCoffee. MIT Licensed, see MIT-LICENSE for details.
+Copyright (c) 2010-2024 NoCoffee. MIT Licensed, see MIT-LICENSE for details.

data/Rakefile

@@ -27,8 +27,10 @@ namespace :mongodb do
         `mv #{dump_path} #{db_path}`
       end
 
-      `mongo steam_test_1_7_x --eval "db.dropDatabase()" #{host}`
-      `mongorestore -d steam_test_1_7_x #{db_path} #{host}`
+      # NOTE: command to drop the database
+      # `mongo steam_test_1_8_x --eval "db.dropDatabase()" #{host}`
+
+      `mongorestore --drop -d steam_test_1_8_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/filesystem/yaml_loader.rb

@@ -19,7 +19,7 @@ module Locomotive::Steam
         end
 
         def _load(path, frontmatter = false, strict = false, &block)
-          if File.exists?(path)
+          if File.exist?(path)
             yaml      = File.open(path).read.force_encoding('utf-8')
             template  = nil
 
@@ -72,7 +72,7 @@ module Locomotive::Steam
         end
 
         def safe_json_file_load(path)
-          return {} unless File.exists?(path)
+          return {} unless File.exist?(path)
 
           json = File.read(path)
 

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/content_entry.rb

@@ -70,7 +70,7 @@ module Locomotive
 
               _path = File.join(site_path, 'public', path)
 
-              File.exists?(_path) ? File.size(_path) : nil
+              File.exist?(_path) ? File.size(_path) : nil
             end
 
             def modify_for_associations(attributes)
@@ -114,7 +114,7 @@ module Locomotive
 
               path = File.join(site_path, 'data', env.to_s, 'content_entries')
 
-              @path = File.exists?(path) ? path : File.join(site_path, 'data') # allow the legacy folder
+              @path = File.exist?(path) ? path : File.join(site_path, 'data') # allow the legacy folder
             end
 
             def content_type

data/lib/locomotive/steam/initializers/dragonfly.rb

@@ -33,7 +33,7 @@ module Locomotive
           convert   = ENV['IMAGE_MAGICK_CONVERT'] || `which convert`.strip.presence || '/usr/local/bin/convert'
           identify  = ENV['IMAGE_MAGICK_IDENTIFY'] || `which identify`.strip.presence || '/usr/local/bin/identify'
 
-          if File.exists?(convert)
+          if File.exist?(convert)
             { convert_command: convert, identify_command: identify }
           else
             missing_image_magick

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

@@ -29,7 +29,7 @@ module Locomotive
               handle = @context[@handle] || @handle
 
               # is external url?
-              if handle =~ Locomotive::Steam::IsHTTP
+              if handle.is_a?(String) && 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)

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

data/locomotivecms_steam.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mongo',      '~> 2.18.2'
   spec.add_development_dependency 'origin',     '~> 2.3.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.14.2'
+  spec.add_dependency 'nokogiri',               '~> 1.15.6'
   spec.add_dependency 'sanitize',               '~> 6.0.1'
   spec.add_dependency 'morphine',               '~> 0.1.1'
-  spec.add_dependency 'httparty',               '~> 0.16.0'
+  spec.add_dependency 'httparty',               '~> 0.21.0'
   spec.add_dependency 'chronic',                '~> 0.10.2'
   spec.add_dependency 'bcrypt',                 '~> 3.1.11'
   spec.add_dependency 'multi_json',             '~> 1.15.0'

data/spec/integration/adapters/mongodb_spec.rb

@@ -43,7 +43,8 @@ describe Locomotive::Steam::MongoDBAdapter do
   end
 
   def current_connections
-    `mongosh --eval "db.serverStatus().connections.current"`.split("\n").last.to_i
+    stats = JSON.parse(`mongostat --noheaders -n 1 --json`)
+    stats.dig('localhost', 'conn')&.to_i
   end
 
 end

data/spec/spec_helper.rb

@@ -1,12 +1,4 @@
-# require 'simplecov'
-# require 'codeclimate-test-reporter'
-# require 'coveralls'
-# require 'simplecov'
-# require 'coveralls'
-
 require 'simplecov'
-require 'coveralls'
-
 
 SimpleCov.start do
   # formatter SimpleCov::Formatter::MultiFormatter.new([

data/spec/support/helpers.rb

@@ -4,7 +4,7 @@ module Spec
   module Helpers
 
     def mongodb_database
-      'steam_test_1_7_x'
+      'steam_test_1_8_x'
     end
 
     def mongodb_site_id

data/spec/unit/initializers/dragonfly_spec.rb

@@ -17,7 +17,7 @@ describe Locomotive::Steam::Initializers::Dragonfly do
 
     before do
       ::Dragonfly::App.destroy_apps
-      expect(File).to receive(:exists?).and_return(false)
+      expect(File).to receive(:exist?).and_return(false)
       initializer.run
     end
     it { is_expected.to eq nil }

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('7f3fe1e49370f63970331ec3194d4590').and_return(response) }
+      before { expect(cache).to receive(:read).with('f5f2eb8af560507da49fbe5df8220030').and_return(response) }
 
       context 'the cache is empty' do
 
-        before { expect(cache).to receive(:write).with('7f3fe1e49370f63970331ec3194d4590', Marshal.dump([200, {}, ["Hello world!"]])) }
+        before { expect(cache).to receive(:write).with('f5f2eb8af560507da49fbe5df8220030', 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 '7f3fe1e49370f63970331ec3194d4590' }
+          it { is_expected.to eq 'f5f2eb8af560507da49fbe5df8220030' }
 
         end
 
@@ -104,7 +104,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
       context 'based on the ETag' do
 
-        let(:etag) { '7f3fe1e49370f63970331ec3194d4590' }
+        let(:etag) { 'f5f2eb8af560507da49fbe5df8220030' }
 
         it 'returns a 304 (Not modified) without no cache headers' do
           expect(subject.first).to eq 304

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.8.0.alpha1
+  version: 1.8.0.alpha2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.6
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -373,8 +373,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/continuous_integration.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -599,7 +599,6 @@ files:
 - lib/locomotive/steam/services/url_finder_service.rb
 - lib/locomotive/steam/version.rb
 - locomotivecms_steam.gemspec
-- script/ci/before_build.sh
 - spec/fixtures/default/README
 - spec/fixtures/default/app/content_types/accounts.yml
 - spec/fixtures/default/app/content_types/bands.yml
@@ -912,7 +911,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-services: mongodb
-before_script: ./script/ci/before_build.sh
-rvm:
-  - 2.7.7
-  - 3.0.5
-  - 3.1.3
-addons:
-  code_climate:
-    repo_token: 3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9

data/script/ci/before_build.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-echo 'America/Chicago' | sudo tee /etc/timezone
-sudo dpkg-reconfigure --frontend noninteractive tzdata
-date
-mongo --version