locomotivecms_steam 1.5.3 → 1.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5fcd89084fca2167fb869e5819dce44029256761bbed64ceaec4274b4d24bfc
-  data.tar.gz: fc263ea755d1e716e2f288a2a8b88ed87419b47916a8a1945f4b13679a380744
+  metadata.gz: 0d35b741fa9c5e6b037bbd68927bc8649fc84f8af37d2f78a985cfa69152dfcd
+  data.tar.gz: c49d4e7241cd13cbe04d243efb260563b6f3dd9a4fd5e3c28a5ce45b5843ebbe
 SHA512:
-  metadata.gz: f8d908e44d028406732eae11fc5fdc73b774a684afef6b4cf40a55c0b27342dc86bd3ed512ffb77917fcedae0c4791ba4bc6d25418ef284587f0c191d18a9e3f
-  data.tar.gz: 46357b80f3a669cb0306045ecd5dbb961aed2d2c9124836aaebd2583752d757df4b43c8be8c34a1df15894362d3c85640899c38264df4a848e82b2a9e64b7e75
+  metadata.gz: bcac97ad438cce9af46f52444acbcc27c6124a8c73cc05d186778b1db3c527ecbfefffaa0ee19cab1dd8936cbb1f8c28ae8fa9964c04ec9599c748ca94add9f3
+  data.tar.gz: 457eae026dfbcbff8eefd1720dc659fea6f79e97259a9106988c5c5ccab77b5653d0c594bdb4a747d3ec3a8334ce3e6162a47f36dce165f6162471a1bde06ab2

data/.gitignore

@@ -13,6 +13,7 @@ test/tmp
 test/version_tmp
 tmp
 benchmark.rb
+.DS_Store
 
 # YARD artifacts
 .yardoc

data/.travis.yml

@@ -2,10 +2,8 @@ language: ruby
 services: mongodb
 before_script: ./script/ci/before_build.sh
 rvm:
-  - 2.6.1
   - 2.6.5
-env:
-  - CODECLIMATE_REPO_TOKEN=3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9
+  - 2.7.2
 addons:
   code_climate:
     repo_token: 3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9

data/Gemfile

@@ -9,8 +9,8 @@ group :development do
   # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
   # gem 'duktape', github: 'did/duktape.rb', branch: 'any-fixnum'
 
-  gem 'puma',               '~> 4.3.1'
-  gem 'haml',               '~> 5.0.4'
+  gem 'puma',               '~> 5.3.1'
+  gem 'haml',               '~> 5.2.0'
 
   gem 'rack-mini-profiler', '~> 0.10.1'
   gem 'flamegraph'
@@ -29,6 +29,5 @@ group :test do
 
   gem 'rack-test',          '~> 0.8.2'
 
-  gem 'codeclimate-test-reporter',  '~> 0.4.7',   require: false
   gem 'coveralls',                  '~> 0.8.1',   require: false
 end

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.5.3)
+    locomotivecms_steam (1.6.0.beta1)
       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.0)
+      dragonfly (>= 1.2, < 1.5)
       duktape (~> 2.0.1.1)
       httparty (~> 0.16.0)
-      kramdown (~> 1.16.2)
+      kramdown (~> 2.3.0)
       liquid (~> 4.0.3)
       locomotivecms_common (~> 0.4.0)
-      mime-types (~> 3.1.0)
+      mime-types (~> 3.3.0)
       mimetype-fu (~> 0.1.2)
       moneta (~> 1.0.0)
       morphine (~> 0.1.1)
-      multi_json (~> 1.13.1)
-      nokogiri (~> 1.10.8)
+      multi_json (~> 1.15.0)
+      nokogiri (~> 1.11.0)
       pony (~> 1.12)
       rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.6.0)
-      sanitize (~> 4.6.4)
+      sanitize (~> 5.2.1)
       sass (~> 3.4.25)
       sprockets (~> 3.7.1)
       uglifier (~> 4.1.3)
@@ -33,22 +33,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.2.4.1)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     attr_extras (5.2.0)
     autoprefixer-rails (8.0.0)
       execjs
-    bcrypt (3.1.13)
-    bson (4.6.0)
+    bcrypt (3.1.16)
+    bson (4.11.1)
     chronic (0.10.2)
-    chunky_png (1.3.11)
-    codeclimate-test-reporter (0.4.8)
-      simplecov (>= 0.7.1, < 1.0.0)
+    chunky_png (1.4.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -66,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.5)
+    concurrent-ruby (1.1.7)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -74,33 +72,34 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    dragonfly (1.2.0)
+    dragonfly (1.4.0)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
     duktape (2.0.1.1)
-    execjs (2.7.0)
-    ffi (1.12.2)
+    execjs (2.8.1)
+    ffi (1.15.4)
     flamegraph (0.9.5)
-    haml (5.0.4)
+    haml (5.2.0)
       temple (>= 0.8.0)
       tilt
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.7.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     i18n-spec (0.6.0)
       iso
-    iso (0.2.2)
+    iso (0.3.0)
       i18n
-    json (2.2.0)
+    json (2.3.1)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (1.16.2)
+    kramdown (2.3.1)
+      rexml
     liquid (4.0.3)
     locomotivecms_common (0.4.0)
       activesupport (>= 5.1.5, < 6.0)
@@ -110,31 +109,33 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     memory_profiler (0.9.14)
-    mime-types (3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2021.0901)
     mimetype-fu (0.1.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    mini_mime (1.1.1)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     moneta (1.0.0)
-    mongo (2.8.0)
-      bson (>= 4.4.2, < 5.0.0)
+    mongo (2.13.1)
+      bson (>= 4.8.2, < 5.0.0)
     morphine (0.1.1)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (1.5.0)
-      nokogiri
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.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.3)
-    puma (4.3.1)
+    public_suffix (4.0.6)
+    puma (5.3.2)
       nio4r (~> 2.0)
-    rack (2.0.8)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-cache (1.7.2)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
@@ -145,9 +146,10 @@ GEM
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
     rake (13.0.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rexml (3.2.5)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -161,10 +163,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    sanitize (4.6.6)
+    sanitize (5.2.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
     sass (3.4.25)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -174,17 +176,19 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    stackprof (0.2.13)
+    stackprof (0.2.16)
     stringex (2.8.5)
+    sync (0.5.0)
     temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timecop (0.9.1)
-    tins (1.22.2)
-    tzinfo (1.2.6)
+    timecop (0.9.2)
+    tins (1.26.0)
+      sync
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
@@ -193,17 +197,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  codeclimate-test-reporter (~> 0.4.7)
   coveralls (~> 0.8.1)
   flamegraph
-  haml (~> 5.0.4)
+  haml (~> 5.2.0)
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.5)
   locomotivecms_steam!
   memory_profiler
-  mongo (~> 2.8.0)
+  mongo (~> 2.13.1)
   origin (~> 2.3.1)
-  puma (~> 4.3.1)
+  puma (~> 5.3.1)
   rack-mini-profiler (~> 0.10.1)
   rack-test (~> 0.8.2)
   rake (~> 13.0.1)
@@ -212,4 +215,4 @@ DEPENDENCIES
   timecop (~> 0.9.1)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -2,7 +2,7 @@
 
 [![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 (WIP). It includes:
+The rendering stack used by both Wagon and Engine. It includes:
 
 - the rack stack to serve assets (SCSS, Coffeescript, ...etc) and pages.
 - the liquid drops/filters/tags libs to parse and render liquid templates.
@@ -13,8 +13,10 @@ The rendering stack used by both Wagon and Engine (WIP). It includes:
 
 ## Installation [WIP]
 
-    gem install thin
-    gem install locomotivecms_steam
+```bash
+gem install puma
+gem install locomotivecms_steam
+```
 
 ## Usage
 
@@ -24,26 +26,33 @@ The rendering stack used by both Wagon and Engine (WIP). It includes:
 
 Display all the options:
 
-    steam --help
+```bash
+steam --help
+```
 
 Render a local Wagon site:
 
-    steam --path=<PATH to a Wagon site>
+```bash
+steam --path=<PATH to a Wagon site>
+```
 
 Render a Engine site:
 
-    steam --database=<NAME of the MongoDB database used by the Engine> --assets-path=<PATH to the public folder of the Locomotive>
+```bash
+steam --database=<NAME of the MongoDB database used by the Engine> --assets-path=<PATH to the public folder of the Locomotive>
+```
 
 Once launched, open your browser
 
-    open localhost:8080
+```bash
+open localhost:8080
+```
 
 ### Inside Engine / Wagon:
 
 [https://github.com/locomotivecms/engine/blob/master/lib/locomotive/steam_adaptor.rb](https://github.com/locomotivecms/engine/blob/master/lib/locomotive/steam_adaptor.rb)
 [https://github.com/locomotivecms/engine/blob/master/spec/dummy/config/routes.rb](https://github.com/locomotivecms/engine/blob/master/spec/dummy/config/routes.rb#L12)
 
-
 [https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb](https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb#L65)
 [https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb](https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb#L138)
 

data/bin/steam.rb

@@ -68,6 +68,8 @@ 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]
@@ -84,21 +86,9 @@ end
 
 app = Locomotive::Steam.to_app
 
-# Thin rack handler
-# Note: alt thin settings (Threaded)
-# require 'thin'
-# server = Thin::Server.new(server_options[:address], server_options[:port], app)
-# server.threaded = true
-# server.start
-# Locomotive::Common::Logger.info 'Server started...'
-# FIXME: Rack::Handler::Thin.run app (not threaded)
-
-# WEBRick rack handler
-# Rack::Handler::WEBrick.run app
-# Locomotive::Common::Logger.info 'Server started...'
-
 # Puma rack handler
 require 'puma'
+
 server   = ::Puma::Server.new(app)
 server.add_tcp_listener server_options[:address], server_options[:port]
 server.min_threads = 4

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

@@ -53,7 +53,7 @@ module Locomotive::Steam
 
           def set_id(entity)
             # don't override the id if it was set from a MongoDB dump
-            return if entity._id =~ /[a-z0-9]{12,}/
+            return if entity._id.to_s =~ /[a-z0-9]{12,}/
 
             if (slug = entity[:_slug]).respond_to?(:translations)
               entity[:_id] = slug[locale]

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

@@ -81,8 +81,9 @@ module Locomotive::Steam
       end
 
       def disconnect_session
-        @session.try(:close)
-        @session = nil
+        @session.try(:close).tap do
+          @session = nil
+        end
       end
 
     end

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

@@ -11,7 +11,6 @@ module Locomotive::Steam
       }.merge(attributes))
     end
 
-
   end
 
 end

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

@@ -51,8 +51,25 @@ module Locomotive
           end
 
           def blocks
-            (@content['blocks'] || []).each_with_index.map do |block, index|
-              SectionBlock.new(@section, block, index)
+            build_blocks(@content['blocks'])
+          end
+
+          def blocks_as_tree
+            [].tap do |root|
+              parents = []
+
+              build_blocks(@content['blocks']) do |block, previous_block|
+                if block.depth == 0
+                  parents = [block]
+                  root
+                elsif block.depth > previous_block.depth
+                  (parents << previous_block).last.leaves
+                elsif (diff = previous_block.depth - block.depth) > 0
+                  parents[parents.size - diff - 1].tap { parents.pop(diff) }.leaves
+                else
+                  parents.last.leaves
+                end << block
+              end
             end
           end
 
@@ -60,6 +77,18 @@ module Locomotive
             SectionEditorSettingData.new(@section)
           end
 
+          private
+
+          def build_blocks(blocks)
+            previous_block = nil
+
+            (blocks || []).each_with_index.map do |block, index|
+              section_block = SectionBlock.new(@section, block, index)
+              yield(section_block, previous_block) if block_given?
+              previous_block = section_block
+            end
+          end
+
         end
 
       end