maglevcms 1.2.2 → 1.4.0

data/app/models/maglev/site.rb

@@ -21,5 +21,9 @@ module Maglev
     def find_section(type)
       sections&.find { |section| section['type'] == type }
     end
+
+    def translate_in(locale, source_locale)
+      translate_attr_in(:sections, locale, source_locale)
+    end
   end
 end

data/app/models/maglev/theme/style_setting.rb

@@ -10,7 +10,7 @@ class Maglev::Theme::StyleSetting
 
   ## validations ##
   validates :id, :label, :type, :default, 'maglev/presence': true
-  validates :type, inclusion: { in: %w[text color select checkbox] }
+  validates :type, inclusion: { in: %w[text color select checkbox divider hint] }
 
   ## methods ##
 

data/app/models/maglev/theme.rb

@@ -12,5 +12,40 @@ module Maglev
     validates :id, :name, presence: true
 
     ## methods ##
+
+    def find_setting!(section_id, block_id, setting_id)
+      setting = find_setting(section_id, block_id, setting_id)
+      raise Maglev::Errors::UnknownSetting.new(section_id, block_id, setting_id) if setting.nil?
+
+      setting
+    end
+
+    def find_setting(section_id, block_id, setting_id)
+      key = [section_id, block_id, setting_id].compact.join('.')
+      section_setting_types[key]
+    end
+
+    private
+
+    def section_setting_types
+      @section_setting_types ||= build_section_setting_types
+    end
+
+    def build_section_setting_types
+      hash = {}
+      sections.each do |section|
+        build_section_setting_types_from_settings(hash, section.id, section.settings)
+        section.blocks.each do |block|
+          build_section_setting_types_from_settings(hash, "#{section.id}.#{block.type}", block.settings)
+        end
+      end
+      hash
+    end
+
+    def build_section_setting_types_from_settings(hash, parent_key, settings)
+      settings.each do |setting|
+        hash["#{parent_key}.#{setting.id}"] = setting
+      end
+    end
   end
 end

data/app/services/maglev/add_site_locale.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Maglev
+  # Add a locale (instace of Maglev::Site::Locale) to a site
+  class AddSiteLocale
+    include Injectable
+
+    argument :site
+    argument :locale
+
+    def call
+      return if locale.blank? || !site.add_locale(locale)
+
+      ActiveRecord::Base.transaction do
+        unsafe_call
+      end
+    end
+
+    protected
+
+    def unsafe_call
+      # Set a default content for site_scoped sections
+      apply_to_site
+
+      site.save! # persist the new locale
+
+      # add a default content in the new locale to all the pages of the site
+      # based on the default locale. Also take care of the path.
+      apply_to_pages
+
+      true
+    end
+
+    def apply_to_site
+      Maglev::I18n.with_locale(locale.prefix) do
+        site.translate_in(locale.prefix, site.default_locale_prefix)
+      end
+    end
+
+    def apply_to_pages
+      resources.find_each do |page|
+        # the path will be the same as in the default locale
+        Maglev::I18n.with_locale(locale.prefix) do
+          page.path = default_page_path(page)
+        end
+
+        # set a default content which will be the same as in the default locale
+        page.translate_in(locale.prefix, site.default_locale_prefix)
+
+        page.save!
+      end
+    end
+
+    def default_page_path(page)
+      # we can't rely on page.default_path because the service can be called outside a HTTP request
+      # and so we don't know for sure if Maglev::I18n.default_locale has been correctly set.
+      page.paths.find_by(locale: site.default_locale.prefix)&.value
+    end
+
+    def resources
+      ::Maglev::Page
+    end
+  end
+end

data/app/services/maglev/app_container.rb

@@ -31,6 +31,7 @@ module Maglev
     dependency :persist_section_screenshot, class: Maglev::PersistSectionScreenshot,
                                             depends_on: %i[fetch_theme fetch_section_screenshot_path]
 
+    dependency :add_site_locale,            class: Maglev::AddSiteLocale
     dependency :change_site_locales,        class: Maglev::ChangeSiteLocales
 
     dependency :fetch_page,                 class: Maglev::FetchPage, depends_on: :fetch_site

data/app/services/maglev/change_site_locales.rb

@@ -2,7 +2,7 @@
 
 module Maglev
   # Change the locales of a site.
-  # The new locales are an array of maps with 2 required keys: :name & :prefix.
+  # The new locales are an array of Maglev::Site::Locale objects
   class ChangeSiteLocales
     include Injectable
 

data/app/services/maglev/fetch_page.rb

@@ -10,6 +10,7 @@ module Maglev
     argument :locale
     argument :default_locale
     argument :fallback_to_default_locale, default: false
+    argument :only_visible, default: false
 
     def call
       page = fetch_page(path, locale)
@@ -20,7 +21,12 @@ module Maglev
     protected
 
     def fetch_page(path, locale)
-      Maglev::Page.by_path(path || 'index', locale).first
+      page = pages.by_path(path || 'index', locale).first
+      !only_visible || (page&.visible? && only_visible) ? page : nil
+    end
+
+    def pages
+      Maglev::Page
     end
   end
 end

data/app/services/maglev/fetch_section_screenshot_path.rb

@@ -11,7 +11,7 @@ module Maglev
 
     def call
       path = "#{fetch_sections_path.call(theme: theme)}/#{section.category}/#{section.id}.jpg"
-      absolute ? "#{Rails.root}/public/#{path}" : "/#{path}"
+      absolute ? Rails.root.join("public/#{path}").to_s : "/#{path}"
     end
   end
 end

data/app/services/maglev/get_page_fullpath.rb

@@ -44,7 +44,7 @@ module Maglev
 
     def build_fullpath(base_url, path)
       fullpath = [base_url]
-      fullpath.push(locale) unless same_as_default_locale?
+      fullpath.push(locale) if prefix_by_default_locale?
       fullpath.push(path) unless path == 'index' # for SEO purpose)
       fullpath.push(nil) if fullpath == [nil] # avoid "" as the fullpath
       fullpath.join('/')
@@ -54,6 +54,10 @@ module Maglev
       @site ||= fetch_site.call
     end
 
+    def prefix_by_default_locale?
+      !same_as_default_locale?
+    end
+
     def same_as_default_locale?
       locale.to_s == default_locale.to_s
     end

data/app/services/maglev/persist_page.rb

@@ -29,9 +29,9 @@ module Maglev
       # the sections_translations attribute is put by the SetupPages service
       # when we generate a brand new site
       if page_attributes.key?(:sections_translations)
-        page.prepare_sections_translations
+        page.prepare_sections_translations(theme)
       else
-        page.prepare_sections
+        page.prepare_sections(theme)
       end
 
       page.save!
@@ -40,15 +40,7 @@ module Maglev
     def persist_site!
       return unless can_persist_site?
 
-      # the sections_translations attribute is put by the SetupPages service
-      # when we generate a brand new site
-      if site_attributes.key?(:sections_translations)
-        site.attributes = site_attributes
-        site.prepare_sections_translations
-      else
-        site.attributes = site_attributes_with_consistent_sections
-        site.prepare_sections
-      end
+      assign_sections_to_site
 
       site.save!
     end
@@ -89,5 +81,17 @@ module Maglev
         site_attributes[:sections_translations].present?
       )
     end
+
+    def assign_sections_to_site
+      # the sections_translations attribute is put by the SetupPages service
+      # when we generate a brand new site
+      if site_attributes.key?(:sections_translations)
+        site.attributes = site_attributes
+        site.prepare_sections_translations(theme)
+      else
+        site.attributes = site_attributes_with_consistent_sections
+        site.prepare_sections(theme)
+      end
+    end
   end
 end

data/lib/maglev/active_storage.rb

@@ -5,10 +5,10 @@ module Maglev
     extend ActiveSupport::Concern
 
     included do
-      after_commit :save_metadata_now, on: :create
-
       has_one_attached :file
 
+      after_commit :save_metadata_now, on: :create, prepend: true
+
       delegate :url, :download, to: :file
     end
 

data/lib/maglev/engine.rb

@@ -54,7 +54,9 @@ module Maglev
                                     urls: ["/#{vite_ruby.config.public_output_dir}"],
                                     root: root.join(vite_ruby.config.public_dir),
                                     header_rules: [
-                                      [:all, { "Access-Control-Allow-Origin": '*' }]
+                                      # rubocop:disable Style/StringHashKeys
+                                      [:all, { 'Access-Control-Allow-Origin' => '*' }]
+                                      # rubocop:enable Style/StringHashKeys
                                     ]
       else
         # mostly when running the application in production behind NGINX or APACHE
@@ -63,7 +65,9 @@ module Maglev
                                      urls: ["/#{vite_ruby.config.public_output_dir}"],
                                      root: root.join(vite_ruby.config.public_dir),
                                      header_rules: [
-                                       [:all, { "Access-Control-Allow-Origin": '*' }]
+                                       # rubocop:disable Style/StringHashKeys
+                                       [:all, { 'Access-Control-Allow-Origin' => '*' }]
+                                       # rubocop:enable Style/StringHashKeys
                                      ]
       end
     end

data/lib/maglev/errors.rb

@@ -4,5 +4,12 @@ module Maglev
   module Errors
     class NotAuthorized < StandardError; end
     class UnknownSection < StandardError; end
+
+    class UnknownSetting < StandardError
+      def initialize(section_id, block_id, setting_id)
+        key = [section_id, block_id].compact.join('.')
+        super("[#{key}] The #{setting_id} setting is undeclared OR its type is unknown.")
+      end
+    end
   end
 end

data/lib/maglev/preview_constraint.rb

@@ -4,6 +4,8 @@ require 'uri'
 
 module Maglev
   class PreviewConstraint
+    CRAWLER_USER_AGENTS = /Googlebot|Twitterbot|facebookexternalhit/o.freeze
+
     attr_reader :preview_host
 
     def initialize(preview_host: nil)
@@ -11,7 +13,7 @@ module Maglev
     end
 
     def matches?(request)
-      %i[html xml].include?(request.format.symbol) && (!preview_host || preview_host == request.host)
+      (accepted_format?(request) || crawler?(request)) && match_host?(request)
     end
 
     protected
@@ -21,5 +23,17 @@ module Maglev
 
       URI.parse(Maglev.config.preview_host).host # make sure we get only the host here
     end
+
+    def accepted_format?(request)
+      %i[html xml].include?(request.format.symbol)
+    end
+
+    def crawler?(request)
+      request.format.symbol.nil? && CRAWLER_USER_AGENTS.match?(request.user_agent)
+    end
+
+    def match_host?(request)
+      !preview_host || preview_host == request.host
+    end
   end
 end

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '1.2.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -56,9 +56,9 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
@@ -66,9 +66,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
@@ -133,6 +133,7 @@ files:
 - app/components/maglev/content/link.rb
 - app/components/maglev/content/select.rb
 - app/components/maglev/content/text.rb
+- app/components/maglev/content/void.rb
 - app/components/maglev/page_component.rb
 - app/components/maglev/section_component.rb
 - app/components/maglev/tag_helper.rb
@@ -551,7 +552,9 @@ files:
 - app/frontend/editor/components/kit/color-input/preset-button.vue
 - app/frontend/editor/components/kit/color-input/preset-dropdown.vue
 - app/frontend/editor/components/kit/confirmation-button.vue
+- app/frontend/editor/components/kit/divider.vue
 - app/frontend/editor/components/kit/dropdown.vue
+- app/frontend/editor/components/kit/hint.vue
 - app/frontend/editor/components/kit/icon-input.vue
 - app/frontend/editor/components/kit/icon.vue
 - app/frontend/editor/components/kit/image-input.vue
@@ -625,6 +628,7 @@ files:
 - app/frontend/editor/locales/editor.en.json
 - app/frontend/editor/locales/editor.es.json
 - app/frontend/editor/locales/editor.fr.json
+- app/frontend/editor/locales/editor.pt-BR.json
 - app/frontend/editor/locales/index.js
 - app/frontend/editor/main.js
 - app/frontend/editor/misc/__tests__/utils.spec.js
@@ -719,6 +723,17 @@ files:
 - app/models/maglev/section/block.rb
 - app/models/maglev/section/content_concern.rb
 - app/models/maglev/section/setting.rb
+- app/models/maglev/setting_types/base.rb
+- app/models/maglev/setting_types/checkbox.rb
+- app/models/maglev/setting_types/collection_item.rb
+- app/models/maglev/setting_types/color.rb
+- app/models/maglev/setting_types/divider.rb
+- app/models/maglev/setting_types/hint.rb
+- app/models/maglev/setting_types/icon.rb
+- app/models/maglev/setting_types/image.rb
+- app/models/maglev/setting_types/link.rb
+- app/models/maglev/setting_types/select.rb
+- app/models/maglev/setting_types/text.rb
 - app/models/maglev/site.rb
 - app/models/maglev/site/locale.rb
 - app/models/maglev/site/locales_concern.rb
@@ -730,6 +745,7 @@ files:
 - app/services/concerns/maglev/get_page_sections/transform_collection_item_concern.rb
 - app/services/concerns/maglev/get_page_sections/transform_link_concern.rb
 - app/services/concerns/maglev/get_page_sections/transform_text_concern.rb
+- app/services/maglev/add_site_locale.rb
 - app/services/maglev/app_container.rb
 - app/services/maglev/change_site_locales.rb
 - app/services/maglev/clone_page.rb
@@ -845,7 +861,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Page builder Ruby on Rails