locomotivecms 4.1.1 → 4.2.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70460310fb05f52fee938829d69cdbd5a93224226d82f0c9610efb49ae7a1e1f
-  data.tar.gz: 403506af7c828c918b2149e70ec330ba7e458d15d662d9c86a73f0c9d816276f
+  metadata.gz: 125c005edc4d73f9bcf75bf02e36e36786d47d27a55e3d858afce33ec04eef34
+  data.tar.gz: e337583e4f49f352c4ff5b1b94cb417cc4845e5483e2e2b184f4164a29ef5d46
 SHA512:
-  metadata.gz: 6c1cb4955784a9469695e2040f4ad8f5959b9217e5731eb7390df6838cab6c157cccedc4e97df96be1ca7deffea84acc787d02d2f005076194c26f6e702069cc
-  data.tar.gz: ae5118f9354d2715d9a49e239dd283463aa8a37aa33947c3213e9f9f2ea8ea6e7e2465937b65fdff37cb996f61d9205256a316cc0488be210038cda3c1bed652
+  metadata.gz: 6ff8971a009e04c1fa4ed523e85a9b940a89c8b5acfef33ab9c5b11d9c69180f8d1ede1c992463e55f14cff967eb575d40d48f92856225fc0b06290168187a94
+  data.tar.gz: c9b63ae75baa1ede9821cb8b62cf6e27e0a5f7b1b2f4b0350f7a9be932abbfa6fa563251742b3b682f4436e88a672c13aa9e4ebe227d0ca2047f9c02e7ca486a

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 == MIT License
 
-Copyright (c) 2010-2020, NoCoffee.
+Copyright (c) 2010-2023, 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

data/README.md

@@ -39,9 +39,10 @@ Have a look at our [Trello](https://trello.com/b/kRiy1dZu/locomotive-v3) board t
 
 Here is a list of the main gems used to power the Locomotive platform:
 
-- Rails 5     - *web framework*
+- Ruby 3+
+- Rails 7     - *web framework*
 - Bootstrap   - *UI framework*
-- Mongoid 6   - *Object-Document-Mapper for MongoDB 3*
+- Mongoid 7   - *Object-Document-Mapper for MongoDB 6*
 - Devise 4    - *Authentication*
 - Carrierwave - *Upload*
 - Pundit      - *Permissions*
@@ -71,4 +72,4 @@ Locomotive is an open source project, we encourage contributions. If you have fo
 
 Feel free to contact me at didier at nocoffee dot fr.
 
-Copyright (c) 2020 NoCoffee, released under the MIT license
+Copyright (c) 2010-2024 NoCoffee, released under the MIT license

data/Rakefile

@@ -14,6 +14,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
+load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
@@ -24,6 +26,8 @@ begin
 rescue LoadError
 end
 
+# load './lib/tasks/development_tasks.rake'
+
 require 'webdrivers'
 load 'webdrivers/Rakefile'
 

data/app/api/locomotive/api.rb

@@ -19,7 +19,7 @@ module Locomotive
 
     class Dispatch < Grape::API
 
-      helpers Pundit
+      helpers Pundit::Authorization
       helpers API::Helpers::AuthenticationHelper
       helpers API::Helpers::ParamsHelper
       helpers API::Helpers::PersistenceHelper

data/app/assets/config/locomotive_manifest.js

@@ -0,0 +1,2 @@
+//= link_tree ../images
+//= link locomotive/application.css

data/app/assets/javascripts/locomotive.js

@@ -8,8 +8,8 @@
 //= require jquery-ui
 //= require jquery_ujs
 //= require bootstrap-sprockets
-//= require codemirror
-//= require codemirror/modes/markdown
+//= require locomotive/codemirror
+//= require locomotive/codemirror/modes/markdown
 //= require locomotive/vendor
 //= require ./locomotive/application
 

data/app/assets/stylesheets/locomotive/account.scss

@@ -16,7 +16,6 @@
 // Reset and dependencies
 
 @import "bootstrap/normalize";
-@import "font-awesome-sprockets";
 @import "font-awesome";
 
 // Core CSS

data/app/assets/stylesheets/locomotive/application.scss

@@ -20,7 +20,6 @@
 // Reset and dependencies
 
 @import "bootstrap/normalize";
-@import "font-awesome-sprockets";
 @import "font-awesome";
 
 // Core CSS

data/app/assets/stylesheets/locomotive/live_editing_error.scss

@@ -6,7 +6,6 @@
 // Reset and dependencies
 
 @import "bootstrap/normalize";
-@import "font-awesome-sprockets";
 @import "font-awesome";
 
 // Core CSS

data/app/assets/stylesheets/locomotive/live_editing_iframe.scss

@@ -1,4 +1,3 @@
-@import "font-awesome-sprockets";
 @import "font-awesome";
 
 $button-background:     #1c77c3;

data/app/controllers/locomotive/base_controller.rb

@@ -9,7 +9,7 @@ module Locomotive
     include Locomotive::Concerns::StoreLocationController
     include Locomotive::Concerns::WithinSiteController
 
-    layout '/locomotive/layouts/application'
+    layout 'locomotive/layouts/application'
 
     helper Locomotive::BaseHelper, Locomotive::ErrorsHelper
 

data/app/controllers/locomotive/concerns/authorization_controller.rb

@@ -3,7 +3,7 @@ module Locomotive
     module AuthorizationController
 
       extend ActiveSupport::Concern
-      include Pundit
+      include Pundit::Authorization
 
       included do
         rescue_from Pundit::NotAuthorizedError, with: :render_access_denied

data/app/controllers/locomotive/concerns/redirect_to_main_host_controller.rb

@@ -19,7 +19,7 @@ module Locomotive
           options = { host: Locomotive.config.host }
           options[:port] = request.port if request.port != 80
 
-          redirect_to root_url(options)
+          redirect_to(root_url(**options), allow_other_host: true)
         end
       end
 

data/app/controllers/locomotive/concerns/site_dispatcher_controller.rb

@@ -29,7 +29,7 @@ module Locomotive
       def render_no_site_error
         respond_to do |format|
           format.html do
-            redirect_to sites_path
+            redirect_to locomotive.sites_path
           end
           format.json do
             render json: { error: 'No site found' }, status: :not_found

data/app/controllers/locomotive/errors_controller.rb

@@ -1,7 +1,7 @@
 module Locomotive
   class ErrorsController < ApplicationController
 
-    layout '/locomotive/layouts/error'
+    layout 'locomotive/layouts/error'
 
     helper Locomotive::BaseHelper
 

data/app/controllers/locomotive/my_account_controller.rb

@@ -7,7 +7,7 @@ module Locomotive
 
     before_action :load_account
 
-    layout '/locomotive/layouts/account'
+    layout 'locomotive/layouts/account'
 
     def edit
       authorize @account

data/app/controllers/locomotive/passwords_controller.rb

@@ -7,10 +7,12 @@ module Locomotive
 
     within_site_only_if_existing true
 
-    layout '/locomotive/layouts/account'
+    layout 'locomotive/layouts/account'
 
     helper Locomotive::BaseHelper
 
+    respond_to :html, :json
+
     before_action :set_locale
 
     def update

data/app/controllers/locomotive/registrations_controller.rb

@@ -4,12 +4,14 @@ module Locomotive
     include Locomotive::Concerns::SslController
     include Locomotive::Concerns::RedirectToMainHostController
 
-    layout '/locomotive/layouts/account'
+    layout 'locomotive/layouts/account'
 
     before_action :configure_permitted_parameters
 
     helper Locomotive::BaseHelper
 
+    respond_to :html, :json
+
     before_action :set_locale
 
     private

data/app/controllers/locomotive/sessions_controller.rb

@@ -7,10 +7,12 @@ module Locomotive
 
     within_site_only_if_existing true # Note: do not validate the membership
 
-    layout '/locomotive/layouts/account'
+    layout 'locomotive/layouts/account'
 
     before_action :set_locale
 
+    respond_to :html, :json
+
     helper Locomotive::BaseHelper
 
     private

data/app/controllers/locomotive/sites_controller.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     account_required
 
-    layout '/locomotive/layouts/account'
+    layout 'locomotive/layouts/account'
 
     def index
       authorize Site

data/app/helpers/locomotive/base_helper.rb

@@ -276,13 +276,13 @@ module Locomotive
 
     def cache_key_for_sidebar_pages
       count          = current_site.pages.count
-      max_updated_at = current_site.pages.max(:updated_at).try(:utc).try(:to_s, :number).to_i
+      max_updated_at = current_site.pages.max(:updated_at).try(:utc).try(:to_fs, :number).to_i
       base_cache_key_for_sidebar + ['pages', count, max_updated_at, current_content_locale]
     end
 
     def cache_key_for_sidebar_content_types
       count          = current_site.content_types.count
-      max_updated_at = current_site.content_types.max(:updated_at).try(:utc).try(:to_s, :number).to_i
+      max_updated_at = current_site.content_types.max(:updated_at).try(:utc).try(:to_fs, :number).to_i
       base_cache_key_for_sidebar + ['content_types', count, max_updated_at]
     end
 

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -55,7 +55,7 @@ module Locomotive
       {
         name:     field.name,
         label:    label_for_custom_field(form.object, field),
-        hint:     field.hint,
+        hint:     raw(field.hint),
         required: field.required,
         input_html: {
           class: "#{'input-lg' if highlighted}"
@@ -225,7 +225,7 @@ module Locomotive
     end
 
     def custom_field_t(name, type, interpolation = {})
-      t(name, { scope: ['locomotive.custom_fields.types', type] }.merge(interpolation))
+      t(name, **{ scope: ['locomotive.custom_fields.types', type] }.merge(interpolation))
     end
 
   end

data/app/helpers/locomotive/shared/activities_helper.rb

@@ -42,7 +42,7 @@ module Locomotive
       end
 
       def activity_key_to_sentence(key, options = nil)
-        I18n.t(key, (options || {}).merge(scope: 'locomotive.activity')).html_safe
+        I18n.t(key, **(options || {}).merge(scope: 'locomotive.activity')).html_safe
       end
 
       def activity_emphasize(text)

data/app/inputs/locomotive/api_key_input.rb

@@ -1,5 +1,5 @@
 module Locomotive
-  class ApiKeyInput < ::SimpleForm::Inputs::Base
+  class APIKeyInput < ::SimpleForm::Inputs::Base
 
     include Locomotive::SimpleForm::Inputs::FasterTranslate
 

data/app/mailers/locomotive/notifications.rb

@@ -31,7 +31,7 @@ module Locomotive
 
     def new_content_entry_subject(entry, options)
       if entry.content_type.public_submission_title_template.blank?
-        t('locomotive.notifications.new_content_entry.subject', options)
+        t('locomotive.notifications.new_content_entry.subject', **options)
       else
         entry.content_type.public_submission_title(entry, options)
       end

data/app/models/locomotive/account.rb

@@ -4,7 +4,7 @@ module Locomotive
     include Locomotive::Mongoid::Document
     devise *Locomotive.config.devise_modules
     acts_as_token_authenticatable
-    include Locomotive::Concerns::Account::ApiKey
+    include Locomotive::Concerns::Account::APIKey
 
     ## devise fields (need to be declared since 2.x) ##
     field :remember_created_at,     type: Time

data/app/models/locomotive/concerns/account/api_key.rb

@@ -3,7 +3,7 @@ module Locomotive
     module Account
 
       # More information here: https://github.com/mongoid/mongoid/issues/3626
-      module ApiKey
+      module APIKey
 
         extend ActiveSupport::Concern
 

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

@@ -68,7 +68,7 @@ module Locomotive
             fields = content_type.ordered_entries_custom_fields
             labels = fields.map(&:label) << I18n.t('mongoid.attributes.locomotive/content_entry.created_at')
 
-            CSV.generate(csv_options) do |csv|
+            CSV.generate(**csv_options) do |csv|
               # header
               csv << labels
               # body

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

@@ -67,14 +67,14 @@ module Locomotive
         end
 
         def similar_slug(slug)
-          _last = self.class.where(_slug: /^#{slug}-?\d*$/i)
+          _last_slug = self.class.where(_slug: /^#{slug}-?\d*$/i)
                     .excludes(_id: self._id)
-                    .only(:_slug)
-                    .order_by(:_id.desc)
+                    .order_by(:created_at.desc)
+                    .pluck(:_slug)
                     .first
 
-          if _last
-            _last['_slug'][::Mongoid::Fields::I18n.locale.to_s]
+          if _last_slug
+            _last_slug[::Mongoid::Fields::I18n.locale.to_s]
           else
             nil
           end

data/app/models/locomotive/concerns/content_type/entry_template.rb

@@ -27,9 +27,9 @@ module Locomotive
 
           steam_repositories.content_entry.with(to_steam).build(entry_attributes).tap do |entity|
             # copy error messages
-            entry.errors.each do |name, message|
-              next if name == :_slug
-              entity.errors.add(name, message)
+            entry.errors.each do |error|
+              next if error.attribute == :_slug
+              entity.errors.add(error.attribute, error.message)
             end
           end
         end

data/app/models/locomotive/concerns/page/templatized.rb

@@ -188,7 +188,7 @@ module Locomotive
         # attribute got changed.
         #
         def propagate_templatized
-          return unless self.templatized_changed?
+          return unless self.templatized_previously_changed?
 
           selector = { 'parent_ids' => { '$in' => [self._id] } }
           operations  = {

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

@@ -9,7 +9,10 @@ module Locomotive
 
           def json_attribute(name)
             validate { |record| record.send(:json_attribute_must_be_valid, name) }
-            before_validation { |record| record.send(:add_json_parsing_error, name) }
+            before_validation do |record| 
+              record.send(:add_json_uncastable_values_error, name)
+              record.send(:add_json_parsing_error, name)
+            end
 
             define_method(:"#{name}=") do |json|
               super(decode_json(name, json))
@@ -22,7 +25,7 @@ module Locomotive
 
         def decode_json(name, json)
           begin
-            value = json.is_a?(String) ? ActiveSupport::JSON.decode(URI.unescape(json)) : json
+            value = json.is_a?(String) ? ActiveSupport::JSON.decode(CGI.unescape(json)) : json
             instance_variable_set(:"@#{name}_json_parsing_error", nil)
             value
           rescue ActiveSupport::JSON.parse_error
@@ -44,6 +47,22 @@ module Locomotive
           end
         end
 
+        # https://www.mongodb.com/docs/mongoid/current/reference/fields/#uncastable-values
+        def add_json_uncastable_values_error(name)
+          value_before = attributes_before_type_cast[name.to_s]
+          value_now = self.send(name)
+
+          return if value_now
+
+          # if the field is localized, take the translated value (current locale)
+          if value_before && fields[name.to_s].try(:localized?) && value_before.respond_to?(:key?)
+            value_before = value_before[::Mongoid::Fields::I18n.locale] 
+          end
+            
+          # Uncastable value detected!
+          self.errors.add(name, 'has a wrong object type') if !value_before.nil?
+        end
+
         def add_json_parsing_error(name)
           error = instance_variable_get(:"@#{name}_json_parsing_error")
 

data/app/models/locomotive/concerns/site/routes.rb

@@ -12,7 +12,7 @@ module Locomotive
           field :routes, type: Array, default: []
 
           ## behaviours ##
-          json_attribute  :routes
+          json_attribute :routes
         end
 
         private

data/app/models/locomotive/content_entry.rb

@@ -38,8 +38,8 @@ module Locomotive
     scope :latest_updated, -> { order_by(updated_at: :desc).limit(Locomotive.config.ui[:latest_entries_nb]) }
     scope :next_or_previous,
       ->(condition, order_by) { where({ _visible: true }.merge(condition)).limit(1).order_by(order_by) }
-    scope :by_id_or_slug, ->(id_or_slug) { all.or({ _id: id_or_slug }, { _slug: id_or_slug }) }
-    scope :by_ids_or_slugs, ->(ids_or_slugs) { all.any_of({ :_slug.in => [*ids_or_slugs] }, { :_id.in => [*ids_or_slugs] }) }
+    scope :by_id_or_slug, ->(id_or_slug) { where('$or' => [{ _id: id_or_slug }, { _slug: id_or_slug }]) }
+    scope :by_ids_or_slugs, ->(ids_or_slugs) { where('$or' => [{ :_slug.in => [*ids_or_slugs] }, { :_id.in => [*ids_or_slugs] }]) }
 
     ## indexes ##
     index _type: 1

data/app/models/locomotive/page.rb

@@ -64,7 +64,7 @@ module Locomotive
     scope :handle,              ->(handle) { where(handle: handle) }
     scope :minimal_attributes,  -> { without(:raw_template, :template) }
     scope :dependent_from,      ->(id) { where(:template_dependencies.in => [id]) }
-    scope :by_id_or_fullpath,   ->(id_or_fullpath) { all.or({ _id: id_or_fullpath }, { fullpath: id_or_fullpath }) }
+    scope :by_id_or_fullpath,   ->(id_or_fullpath) { any_of({ _id: id_or_fullpath }, { fullpath: id_or_fullpath }) }
 
     delegate :fullpath, to: :parent, prefix: true
 
@@ -111,7 +111,7 @@ module Locomotive
     end
 
     def touch_site_attribute
-      self.raw_template_changed? ? :template_version : :content_version
+      self.raw_template_previously_changed? ? :template_version : :content_version
     end
 
     protected
@@ -145,7 +145,7 @@ module Locomotive
     end
 
     def update_children
-      self.children.map(&:save) if self.slug_changed? or self.fullpath_changed?
+      self.children.map(&:save) if self.slug_previously_changed? or self.fullpath_previously_changed?
     end
 
     def record_current_locale

data/app/models/locomotive/section.rb

@@ -17,7 +17,7 @@ module Locomotive
     validates_uniqueness_of :slug, scope: :site_id
 
     ## named scopes ##
-    scope :by_id_or_slug, ->(id_or_slug) { all.or({ _id: id_or_slug }, { slug: id_or_slug }) }
+    scope :by_id_or_slug, ->(id_or_slug) { where('$or' => [{ _id: id_or_slug }, { slug: id_or_slug }]) }
 
     ## behaviours ##
     slugify_from    :name

data/app/models/locomotive/snippet.rb

@@ -15,7 +15,7 @@ module Locomotive
     validates_uniqueness_of :slug, scope: :site_id
 
     ## named scopes ##
-    scope :by_id_or_slug, ->(id_or_slug) { all.or({ _id: id_or_slug }, { slug: id_or_slug }) }
+    scope :by_id_or_slug, ->(id_or_slug) { where('$or' => [{ _id: id_or_slug }, { slug: id_or_slug }]) }
 
     ## behaviours ##
     slugify_from :name

data/app/models/locomotive/translation.rb

@@ -16,7 +16,7 @@ module Locomotive
 
     ## named scopes ##
     scope :ordered,       -> { order_by(key: :asc) }
-    scope :by_id_or_key,  ->(id_or_key) { all.or({ _id: id_or_key }, { key: id_or_key }) }
+    scope :by_id_or_key,  ->(id_or_key) { where('$or' => [{ _id: id_or_key }, { key: id_or_key }]) }
 
     ## callbacks ##
     before_validation :underscore_key

data/app/services/locomotive/content_entry_import_service.rb

@@ -71,7 +71,7 @@ module Locomotive
       csv_options = { headers: true, col_sep: ';', quote_char: "\"" }.merge(csv_options || {})
       asset = content_assets.where(id: csv_asset_id).first
       raise 'The CSV file doesn\'t exist anymore' unless asset
-      CSV.parse(asset.source.read, csv_options)
+      CSV.parse(asset.source.read, **csv_options)
     rescue Exception => e
       raise WrongImportFileException.new e.message
     end

data/app/services/locomotive/content_entry_service.rb

@@ -169,10 +169,10 @@ module Locomotive
     def send_notifications(entry, emails = nil)
       return unless self.content_type.public_submission_enabled?
 
-      Locomotive::Account.any_of(
+      Locomotive::Account.where('$or' => [
         { :_id.in   => self.content_type.public_submission_accounts || [] },
         { :email.in => emails || [] }
-      ).each do |account|
+      ]).each do |account|
         Locomotive::Notifications.new_content_entry(site, account, entry).deliver
       end
     end

data/app/services/locomotive/content_type_service.rb

@@ -2,9 +2,19 @@ module Locomotive
   class ContentTypeService < Struct.new(:site)
 
     def list
-      site.content_types
-        .only(:_id, :name, :slug, :number_of_entries, :display_settings)
-        .order_by(:'display_settings.position'.asc, :name.asc).to_a
+      site
+      .content_types
+      .order_by(:'display_settings.position'.asc, :name.asc)
+      .pluck(:_id, :name, :slug, :number_of_entries, :display_settings)
+      .map do |(_id, name, slug, number_of_entries, display_settings)|
+        Locomotive::ContentType.new(
+          _id: _id,
+          name: name,
+          slug: slug,
+          number_of_entries: number_of_entries,
+          display_settings: display_settings
+        )
+      end
     end
 
     def find_by_slug(slug)

data/app/services/locomotive/custom_field_service.rb

@@ -27,10 +27,10 @@ module Locomotive
       if include_new_options && locale != default_locale
         ::Mongoid::Fields::I18n.with_locale(default_locale) do
           self.field.reload.select_options.each do |option|
-            next unless option.attributes[:name][default_locale].blank?
+            next unless option.attributes['name'][default_locale.to_s].blank?
 
             # force the name in the default locale
-            option.name = option.attributes[:name].values.first
+            option.name = option.attributes['name'].values.first
           end
         end
 

data/app/services/locomotive/editor_service.rb

@@ -38,7 +38,7 @@ module Locomotive
       site.pages
       .only(:_id, :title, :sections_dropzone_content, :sections_content)
       .where(is_layout: false, target_klass_name: nil, :slug.ne => '404')
-      .or({ title: /#{query}/i }, { _id: query })
+      .and(Locomotive::Page.or({ title: /#{query}/i }, { _id: query }))
       .limit(max_results)
       .sort(title: 1).map do |page|
         {

data/app/uploaders/locomotive/base_uploader.rb

@@ -2,15 +2,5 @@
 
 module Locomotive
   class BaseUploader < ::CarrierWave::Uploader::Base
-    include ::CarrierWave::ImageOptim
-
-    if Locomotive.config.optimize_uploaded_files
-      process optimize: [{
-        gifsicle:   true,
-        jpegoptim:  { allow_lossy: true, max_quality: 75 },
-        optipng:    { level: 4 }
-      }]
-    end
-
   end
 end

data/app/views/locomotive/dashboard/_activity.html.slim

@@ -12,7 +12,7 @@ ul.activity-feed
         |  
         | ·
         |  
-        span.time= activity.created_at.to_s(:humanized_ago)
+        span.time= activity.created_at.to_fs(:humanized_ago)
         |  
         | ·
         |