locomotivecms 4.1.0.rc1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac2bdf950937bd4a07418b142bb21eea251c24db4b5682b8412a9c718374343
-  data.tar.gz: 1546625baf49879c2c70209e5f3df46f0290b689f28c141135e8d52019c3b065
+  metadata.gz: f262308ca535c2fab8094e923bcfa830cccd8d47412c017354d3d41698545af0
+  data.tar.gz: 2dfc9cee2bb9d8543abb64ad496a5659baa8cbe7d47f22f7b74dabb7a0e79cdc
 SHA512:
-  metadata.gz: d2e672fcec21c3eecba19c80fc7d1bc35f56488d57bc59f43cd2cde49946e71f900b826bef17c5255037b598f1ce4bdc912623d9b09fc477c95112e1d8ac2380
-  data.tar.gz: 9226f4e89892f1e2d66b6f6b74d71981462f53e4969de3a5b09042316e2de20ac578dc9286165055b87066978b37b6a1883bb6da62f5de26173e603d6f3ba3b6
+  metadata.gz: 42b05ebe723bd5b2e84ab6a8b405677e7dec0e17f33702eafae56d4882dc9ad7691be902a17d273193e8199cf8311579f178c5a8791e0fcf2bb5fd95e2f0f068
+  data.tar.gz: 9aea9657f2b6a396e6fc749273c223b480d775add9827ff418760cbcebb037af3adfa7bdc117dca1d9eca78c6252216acde6da435c1e2d9f4982ae18a649666a

data/app/api/locomotive/api/entities/site_entity.rb

@@ -7,7 +7,8 @@ module Locomotive
         expose  :name, :handle, :seo_title, :meta_keywords, :meta_description,
                 :robots_txt, :cache_enabled, :private_access
 
-        expose :locales, :prefix_default_locale, :bypass_browser_locale, :domains, :asset_host, :url_redirections, :overwrite_same_content_assets
+        expose :locales, :prefix_default_locale, :bypass_browser_locale, :domains, :asset_host, :url_redirections
+        expose :overwrite_same_content_assets, :allow_dots_in_slugs
 
         expose :memberships, using: MembershipEntity
 

data/app/api/locomotive/api/forms/site_form.rb

@@ -11,6 +11,7 @@ module Locomotive
         attrs :cache_enabled, :cache_control, :cache_vary
         attrs :sections_content
         attrs :overwrite_same_content_assets
+        attrs :allow_dots_in_slugs
 
         # Make sure locales and domains are in arrays.
         def locales

data/app/api/locomotive/api/resources/current_site_resource.rb

@@ -48,6 +48,7 @@ module Locomotive
               optional :sections_content
               optional :routes
               optional :overwrite_same_content_assets
+              optional :allow_dots_in_slugs
             end
           end
           put do

data/app/api/locomotive/api/resources/site_resource.rb

@@ -77,6 +77,7 @@ module Locomotive
               optional :sections_content
               optional :routes
               optional :overwrite_same_content_assets
+              optional :allow_dots_in_slugs
             end
           end
           post do
@@ -115,6 +116,7 @@ module Locomotive
               optional :sections_content
               optional :routes
               optional :overwrite_same_content_assets
+              optional :allow_dots_in_slugs
             end
           end
           put ':id' do

data/app/assets/javascripts/locomotive/editor.js

@@ -1077,7 +1077,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var reac
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ \"./node_modules/react/index.js\");\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash */ \"./node_modules/lodash/lodash.js\");\n/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var _i18n__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../i18n */ \"./app/javascript/src/locomotive/editor/i18n.js\");\n/* harmony import */ var client_compress__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! client-compress */ \"./node_modules/client-compress/dist/index.js\");\n/* harmony import */ var client_compress__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(client_compress__WEBPACK_IMPORTED_MODULE_3__);\nfunction _typeof(obj) { \"@babel/helpers - typeof\"; if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj; }; } return _typeof(obj); }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }\n\nfunction _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function\"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }\n\nfunction _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }\n\nfunction _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }\n\nfunction _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === \"object\" || typeof call === \"function\")) { return call; } return _assertThisInitialized(self); }\n\nfunction _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return self; }\n\nfunction _isNativeReflectConstruct() { if (typeof Reflect === \"undefined\" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === \"function\") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }\n\nfunction _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }\n\n\n\n\n\n\nvar Uploader = /*#__PURE__*/function (_Component) {\n  _inherits(Uploader, _Component);\n\n  var _super = _createSuper(Uploader);\n\n  function Uploader(props) {\n    var _this;\n\n    _classCallCheck(this, Uploader);\n\n    _this = _super.call(this, props);\n    _this.state = {\n      uploading: false\n    };\n    Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"bindAll\"])(_assertThisInitialized(_this), 'openDialog', 'handleUpload');\n    return _this;\n  }\n\n  _createClass(Uploader, [{\n    key: \"openDialog\",\n    value: function openDialog() {\n      this.input.click();\n    }\n  }, {\n    key: \"_handleUpload\",\n    value: function _handleUpload(files) {\n      var _this2 = this;\n\n      this.props.uploadAssets(files).then(function (assets) {\n        _this2.setState({\n          uploading: false\n        }, function () {\n          _this2.props.handleUpload(assets[0]);\n        });\n      })[\"catch\"](function (error) {\n        alert('error!', error);\n      });\n    }\n  }, {\n    key: \"handleUpload\",\n    value: function handleUpload(event) {\n      var _this3 = this;\n\n      var files = Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"compact\"])(Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"map\"])(event.target.files, function (file) {\n        return file.size > window.Locomotive.maximum_uploaded_file_size ? null : file;\n      }));\n      if (files.length != event.target.files.length) alert(_i18n__WEBPACK_IMPORTED_MODULE_2__[\"default\"].t('views.pickers.images.too_big'));\n      if (files.length > 0) this.setState({\n        uploading: true\n      }, function () {\n        // do we have to compress the images on the browser before sending them to server?\n        // https://www.npmjs.com/package/client-compress\n        if (_this3.props.compress !== undefined) {\n          var compress = new client_compress__WEBPACK_IMPORTED_MODULE_3___default.a(_this3.props.compress);\n          compress.compress(files).then(function (conversions) {\n            return Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"map\"])(conversions, function (conversion) {\n              return {\n                blob: conversion.photo.data,\n                filename: conversion.photo.name\n              };\n            });\n          }).then(function (_files) {\n            return _this3._handleUpload(_files);\n          });\n        } else _this3._handleUpload(files);\n      });\n    }\n  }, {\n    key: \"render\",\n    value: function render() {\n      var _this4 = this;\n\n      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"div\", {\n        className: \"editor-image-uploader\"\n      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"input\", {\n        type: \"file\",\n        ref: function ref(el) {\n          return _this4.input = el;\n        },\n        onChange: this.handleUpload\n      }), !this.state.uploading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"a\", {\n        className: \"editor-image-uploader--button\",\n        onClick: this.openDialog\n      }, _i18n__WEBPACK_IMPORTED_MODULE_2__[\"default\"].t('views.pickers.images.add')), this.state.uploading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"div\", {\n        className: \"editor-image-uploader--uploading\"\n      }, _i18n__WEBPACK_IMPORTED_MODULE_2__[\"default\"].t('views.pickers.images.upload_in_progress')));\n    }\n  }]);\n\n  return Uploader;\n}(react__WEBPACK_IMPORTED_MODULE_0__[\"Component\"]);\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (Uploader);\n\n//# sourceURL=webpack:///./app/javascript/src/locomotive/editor/views/pickers/images/uploader.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ \"./node_modules/react/index.js\");\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash */ \"./node_modules/lodash/lodash.js\");\n/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var _i18n__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../i18n */ \"./app/javascript/src/locomotive/editor/i18n.js\");\n/* harmony import */ var client_compress__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! client-compress */ \"./node_modules/client-compress/dist/index.js\");\n/* harmony import */ var client_compress__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(client_compress__WEBPACK_IMPORTED_MODULE_3__);\nfunction _typeof(obj) { \"@babel/helpers - typeof\"; if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj; }; } return _typeof(obj); }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }\n\nfunction _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function\"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }\n\nfunction _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }\n\nfunction _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }\n\nfunction _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === \"object\" || typeof call === \"function\")) { return call; } return _assertThisInitialized(self); }\n\nfunction _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\"); } return self; }\n\nfunction _isNativeReflectConstruct() { if (typeof Reflect === \"undefined\" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === \"function\") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }\n\nfunction _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }\n\n\n\n\n\n\nvar Uploader = /*#__PURE__*/function (_Component) {\n  _inherits(Uploader, _Component);\n\n  var _super = _createSuper(Uploader);\n\n  function Uploader(props) {\n    var _this;\n\n    _classCallCheck(this, Uploader);\n\n    _this = _super.call(this, props);\n    _this.state = {\n      uploading: false\n    };\n    Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"bindAll\"])(_assertThisInitialized(_this), 'openDialog', 'handleUpload');\n    return _this;\n  }\n\n  _createClass(Uploader, [{\n    key: \"openDialog\",\n    value: function openDialog() {\n      this.input.click();\n    }\n  }, {\n    key: \"_handleUpload\",\n    value: function _handleUpload(files) {\n      var _this2 = this;\n\n      this.props.uploadAssets(files).then(function (assets) {\n        _this2.setState({\n          uploading: false\n        }, function () {\n          _this2.props.handleUpload(assets[0]);\n        });\n      })[\"catch\"](function (error) {\n        alert('error!', error);\n      });\n    }\n  }, {\n    key: \"handleUpload\",\n    value: function handleUpload(event) {\n      var _this3 = this;\n\n      var files = Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"compact\"])(Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"map\"])(event.target.files, function (file) {\n        return file.size > window.Locomotive.maximum_uploaded_file_size ? null : file;\n      }));\n      if (files.length != event.target.files.length) alert(_i18n__WEBPACK_IMPORTED_MODULE_2__[\"default\"].t('views.pickers.images.too_big'));\n      if (files.length > 0) this.setState({\n        uploading: true\n      }, function () {\n        // do we have to compress the images on the browser before sending them to server?\n        // https://www.npmjs.com/package/client-compress        \n        if (_this3.props.compress !== undefined) {\n          var options = Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"mapKeys\"])(_this3.props.compress, function (_, k) {\n            return Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"camelCase\"])(k);\n          });\n          var compress = new client_compress__WEBPACK_IMPORTED_MODULE_3___default.a(options);\n          compress.compress(files).then(function (conversions) {\n            return Object(lodash__WEBPACK_IMPORTED_MODULE_1__[\"map\"])(conversions, function (conversion) {\n              return {\n                blob: conversion.photo.data,\n                filename: conversion.photo.name\n              };\n            });\n          }).then(function (_files) {\n            return _this3._handleUpload(_files);\n          });\n        } else _this3._handleUpload(files);\n      });\n    }\n  }, {\n    key: \"render\",\n    value: function render() {\n      var _this4 = this;\n\n      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"div\", {\n        className: \"editor-image-uploader\"\n      }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"input\", {\n        type: \"file\",\n        ref: function ref(el) {\n          return _this4.input = el;\n        },\n        onChange: this.handleUpload\n      }), !this.state.uploading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"a\", {\n        className: \"editor-image-uploader--button\",\n        onClick: this.openDialog\n      }, _i18n__WEBPACK_IMPORTED_MODULE_2__[\"default\"].t('views.pickers.images.add')), this.state.uploading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(\"div\", {\n        className: \"editor-image-uploader--uploading\"\n      }, _i18n__WEBPACK_IMPORTED_MODULE_2__[\"default\"].t('views.pickers.images.upload_in_progress')));\n    }\n  }]);\n\n  return Uploader;\n}(react__WEBPACK_IMPORTED_MODULE_0__[\"Component\"]);\n\n/* harmony default export */ __webpack_exports__[\"default\"] = (Uploader);\n\n//# sourceURL=webpack:///./app/javascript/src/locomotive/editor/views/pickers/images/uploader.js?");
 
 /***/ }),
 

data/app/models/locomotive/concerns/content_entry/slug.rb

@@ -21,7 +21,12 @@ module Locomotive
           self._slug = self._label.dup if self._slug.blank? && self._label.present?
 
           if self._slug.present?
-            self._slug.permalink!
+            # we can't rely on the self.site property yet (brand new entry for instance)
+            if self.content_type.site.allow_dots_in_slugs?
+              self._slug.pathify!
+            else
+              self._slug.permalink!
+            end
 
             self.find_next_unique_slug if self.slug_already_taken?
           end
@@ -29,7 +34,7 @@ module Locomotive
           # all the site locales share the same slug ONLY IF the entry is not localized.
           self.set_same_slug_for_all_site_locales if !self.localized?
         end
-
+        
         # For each locale of the site, we set the slug
         # coming from the value for the default locale.
         def set_same_slug_for_all_site_locales

data/app/models/locomotive/concerns/shared/slug.rb

@@ -23,9 +23,9 @@ module Locomotive
             self.slug = value.clone
           end
 
-          if self.slug.present?
-            self.slug.permalink!
-          end
+          return unless self.slug.present?
+
+          site&.allow_dots_in_slugs ? self.slug.pathify! : self.slug.permalink!
         end
 
       end

data/app/models/locomotive/site.rb

@@ -20,6 +20,7 @@ module Locomotive
     field :robots_txt
     field :maximum_uploaded_file_size, type: ::Integer, default: Locomotive.config.default_maximum_uploaded_file_size
     field :overwrite_same_content_assets, type: Boolean, default: false
+    field :allow_dots_in_slugs, type: Boolean, default: false
 
     mount_uploader :picture, PictureUploader, validate_integrity: true
 

data/app/policies/locomotive/site_policy.rb

@@ -60,7 +60,7 @@ module Locomotive
         :cache_enabled, :cache_control, :cache_vary,
         :asset_host, :redirect_to_first_domain, :redirect_to_https,
         :private_access, :password, :prefix_default_locale, :bypass_browser_locale,
-        :overwrite_same_content_assets,
+        :overwrite_same_content_assets, :allow_dots_in_slugs,
         :permitted_params_from_policy
       ]
       hash  = { domains: [], locales: [], url_redirections: [] }

data/app/services/locomotive/content_entry_import_service.rb

@@ -58,7 +58,7 @@ module Locomotive
     end
 
     def attributes_from_row(row)
-      attributes = {}
+      attributes = { _slug: row['_slug'] }
       content_type.entries_custom_fields.each do |field|
         next if row[field.name].blank?
         name, value = transform_attribute(field, row[field.name])

data/app/views/locomotive/content_assets/_list.html.slim

@@ -15,8 +15,8 @@
 
         .body
           .small-thumbnail
-            - if asset_with_thumbnail?(asset)
-              = image_tag asset.alternative_vignette_url
+            - if asset_with_thumbnail?(asset) && thumbnail_url = asset.alternative_vignette_url
+              = image_tag thumbnail_url
             - else
               div class="not-a-image #{asset.content_type}"
                 span= asset_text(asset)

data/app/views/locomotive/shared/account/_head.html.slim

@@ -31,3 +31,5 @@ javascript:
 = csrf_meta_tag
 
 = yield :head
+
+= render 'locomotive/shared/account/main_app_head'

data/app/views/locomotive/shared/account/_main_app_head.html.slim

@@ -0,0 +1 @@
+- # this partial can be overridden in the main app in order to include extra css or js

data/lib/generators/locomotive/install/templates/carrierwave_aws.rb

@@ -27,6 +27,11 @@ CarrierWave.configure do |config|
       config.aws_credentials[:endpoint] = ENV['S3_ENDPOINT']
     end
 
+    # For some endpoint like minio you need to rewrite path 
+    if ENV['S3_PATH_STYLE'].present?
+      config.aws_credentials[:force_path_style] = ENV['S3_PATH_STYLE']
+    end
+
     # Put your CDN host below instead
     if ENV['S3_ASSET_HOST_URL'].present?
       config.asset_host = ENV['S3_ASSET_HOST_URL']

data/lib/generators/locomotive/install/templates/locomotive.rb

@@ -23,9 +23,13 @@ Locomotive.configure do |config|
   # available locales suggested to "localize" a site. You will have to pick up at least one among that list.
   # config.site_locales = %w{en de fr pl pt pt-BR it nl nb es ru ja cs bg sk uk}
 
-  # tell if logs are enabled. Useful for debug purpose.
+  # tell if logs (back-office) are enabled. Useful for debug purpose.
   config.enable_logs = true
 
+  # setup the logger for Steam (rendering)
+  # config.steam_log_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
+  # config.steam_log_level = ::Logger::DEBUG
+
   # the API authentication requires to developer to pass 2 params in the header
   # of the request: X-Locomotive-Account-Email and X-Locomotive-Token.
   # However, to keep backward compatability with v2.x versions, you can use

data/lib/locomotive/configuration.rb

@@ -15,6 +15,8 @@ module Locomotive
       site_locales:                 @@site_locales,
       cookie_key:                   '_locomotive_session',
       enable_logs:                  false,
+      steam_log_file:               nil,
+      steam_log_level:              ::Logger::DEBUG,
       enable_admin_ssl:             false,
       delayed_job:                  false,
       default_locale:               :en,

data/lib/locomotive/core_ext.rb

@@ -30,6 +30,27 @@ class String #:nodoc
 
   alias :parameterize! :permalink!
 
+  # Very similar to the to_url from the Stringex gem
+  # except that we allow the dots.
+  def pathify
+    whitespace_replacement_token = self.index('_').nil? ? '-' : '_'
+    self
+      .convert_smart_punctuation
+      .convert_accented_html_entities
+      .convert_vulgar_fractions
+      .convert_unreadable_control_characters
+      .convert_miscellaneous_html_entities
+      .to_ascii
+      .collapse
+      .replace_whitespace(whitespace_replacement_token)
+      .collapse(whitespace_replacement_token)
+      .downcase
+  end
+
+  def pathify!
+    replace(self.pathify)
+  end
+
 end
 
 ## Hash

data/lib/locomotive/steam_adaptor.rb

@@ -44,6 +44,10 @@ Locomotive::Steam.configure do |config|
   # let the Rails engine handle the "no site" error
   config.render_404_if_no_site = false
 
+  # setup the logger
+  config.log_file = Locomotive.config.steam_log_file || ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
+  config.log_level = Locomotive.config.steam_log_level
+
   config.services_hook = -> (services) {
     services.cache  = Rails.cache
     repositories    = services.repositories
@@ -57,8 +61,8 @@ Locomotive::Steam.configure do |config|
   }
 end
 
-Locomotive::Common.reset
-Locomotive::Common.configure do |config|
-  config_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
-  config.notifier = Locomotive::Common::Logger.setup(config_file.to_s)
-end
+# Locomotive::Common.reset
+# Locomotive::Common.configure do |config|
+#   config_file = ENV['LOCOMOTIVE_STEAM_LOG'] || Rails.root.join('log', 'steam.log')
+#   config.notifier = Locomotive::Common::Logger.setup(config_file.to_s, )
+# end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive
-  VERSION = '4.1.0.rc1'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -162,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0.rc1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0.rc1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -1108,6 +1108,7 @@ files:
 - app/views/locomotive/shared/_navigation.html.slim
 - app/views/locomotive/shared/_sidebar.html.slim
 - app/views/locomotive/shared/account/_head.html.slim
+- app/views/locomotive/shared/account/_main_app_head.html.slim
 - app/views/locomotive/shared/account/_navigation.html.slim
 - app/views/locomotive/shared/rte/_image_popover.html.slim
 - app/views/locomotive/shared/rte/_link_popover.html.slim
@@ -1432,11 +1433,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 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: A platform to create, publish and edit sites