maglevcms 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a5b69c183e753d7c6e87e9904d992bbe039901a35d5b0c2cc2c779bb1546469
-  data.tar.gz: '09c9e5973720db3a1038855d0e0e9417f8f9f5d678a7c89651941aa08afff560'
+  metadata.gz: b5f367edf49a70fcab89dd3906037a4d7e1b4711c50fd9a5b255f526f78262ec
+  data.tar.gz: e041ca5f4be377ba43ab62b8ac86835e6c2cb4079e77274a50966b231a41098d
 SHA512:
-  metadata.gz: c56abbaa2a811d82eeb9894de80a708f640f8c38689c06ffac91a4eb806484f42dfa28123daab5d5651bbc86ab934f68525f00763a339f2395030ae2454311e2
-  data.tar.gz: b08119217e120672a3da43bd56aab08399940521f0052bffe25407e4b7a99eb17fe6b23d2aac72767b02785566acd8105728c7ef21fe5cc2b6aae74a7f94e2ef
+  metadata.gz: 12e159b397754772159e3dfa9531d3cb147b7b73d2f0006452acce3f34aec256a9f66cbbcc5d054c2518dc6bcc476af5f382965835806255a4769426bfe4d1fe
+  data.tar.gz: 6837950bdf76d44df4a2ede9a4c417010714631a03b7cab000edb5ff5e8c194f913c82281915361c20680ed6bc84c1ab9799fb02efb6f137a5e734980cb8264d

data/Rakefile

@@ -20,7 +20,8 @@ require 'vite_ruby'
 ViteRuby.install_tasks
 ViteRuby.config.root # Ensure the engine is set as the root.
 
-APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
+rakefile_path = Rails::VERSION::MAJOR >= 8 ? 'spec/dummy/Rakefile' : 'spec/legacy_dummy/Rakefile'
+APP_RAKEFILE = File.expand_path(rakefile_path, __dir__)
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 

data/app/components/maglev/base_component.rb

@@ -2,6 +2,8 @@
 
 module Maglev
   class BaseComponent
+    include ::Maglev::Inspector
+
     extend Forwardable
     def_delegators :view_context, :render
 
@@ -50,5 +52,9 @@ module Maglev
     rescue NoMethodError
       raise "[Maglev] We're sorry but there is no '#{setting_id}' setting in your section/block."
     end
+
+    def site_id
+      site.id
+    end
   end
 end

data/app/components/maglev/block_component.rb

@@ -42,5 +42,15 @@ module Maglev
     def tag_data
       { maglev_block_id: id }
     end
+
+    private
+
+    def section_id
+      section.id
+    end
+
+    def inspect_fields
+      %w[id site_id section_id name type].map { |field| [field, send(field)] }
+    end
   end
 end

data/app/components/maglev/content/base.rb

@@ -3,6 +3,8 @@
 module Maglev
   module Content
     class Base
+      include ::Maglev::Inspector
+
       extend Forwardable
       def_delegators :scope, :site, :config
 
@@ -47,6 +49,12 @@ module Maglev
           instance_exec(site, &config.asset_host)
         end
       end
+
+      private
+
+      def inspect_fields
+        %w[scope tag_id].map { |field| [field, send(field).inspect] }
+      end
     end
   end
 end

data/app/components/maglev/inspector.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Inspector
+    def inspect
+      string = "#<#{self.class.name}:#{object_id} "
+      string << inspect_fields
+                .map { |(name, value)| "#{name}: #{value}" }
+                .join(', ') << '>'
+    end
+
+    private
+
+    def inspect_fields
+      []
+    end
+  end
+end

data/app/components/maglev/page_component.rb

@@ -42,5 +42,9 @@ module Maglev
         rendering_mode: rendering_mode
       )
     end
+
+    def inspect_fields
+      [['site_id', site.id], ['page_id', page.id], ['theme', theme.id]]
+    end
   end
 end

data/app/components/maglev/section_component.rb

@@ -122,5 +122,9 @@ module Maglev
         </div>
       HTML
     end
+
+    def inspect_fields
+      %w[id site_id type].map { |field| [field, send(field)] }
+    end
   end
 end

data/app/frontend/editor/assets/remixicons/format-superscript.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5.59567 5L10.5 10.9283L15.4043 5H18L11.7978 12.4971L18 19.9943V20H15.4091L10.5 14.0659L5.59092 20H3V19.9943L9.20216 12.4971L3 5H5.59567ZM21.5507 6.5803C21.7042 6.43453 21.8 6.22845 21.8 6C21.8 5.55817 21.4418 5.2 21 5.2C20.5582 5.2 20.2 5.55817 20.2 6C20.2 6.07624 20.2107 6.14999 20.2306 6.21983L19.0765 6.54958C19.0267 6.37497 19 6.1906 19 6C19 4.89543 19.8954 4 21 4C22.1046 4 23 4.89543 23 6C23 6.57273 22.7593 7.08923 22.3735 7.45384L20.7441 9H23V10H19V9L21.5507 6.5803V6.5803Z"></path></svg>

data/app/frontend/editor/components/dynamic-form/dynamic-input.vue

@@ -29,7 +29,7 @@
       :isFocused="isFocused"
       :lineBreak="options.lineBreak"
       :rows="options.nbRows"
-      :table="options.htmlTable"
+      :extraExtensions="options.extraExtensions" 
       @blur="$emit('blur')"
       v-model="inputValue"
       v-if="setting.type == 'text' && options.html"

data/app/frontend/editor/components/kit/rich-text-input/extensions/marks/Superscript.js

@@ -0,0 +1,43 @@
+import { Mark } from 'tiptap'
+import { toggleMark, markInputRule, markPasteRule } from 'tiptap-commands'
+
+export default class Superscript extends Mark {
+
+  get name() {
+    return 'sup'
+  }
+
+  get schema() {
+    return {
+      parseDOM: [
+        {
+          tag: 'sup',
+        },        
+      ],
+      toDOM: () => ['sup', 0],
+    }
+  }
+
+  keys({ type }) {
+    return {
+      'Mod-^': toggleMark(type),
+    }
+  }
+
+  commands({ type }) {
+    return () => toggleMark(type)
+  }
+
+  // NOTE: "^^" are used as delimiters to trigger the superscript formatting
+  inputRules({ type }) {
+    return [
+      markInputRule(/(?:\^\^|__)([^\^*_]+)(?:\^\^|__)$/, type),
+    ]
+  }
+
+  pasteRules({ type }) {
+    return [
+      markPasteRule(/(?:\^\^|__)([^\^*_]+)(?:\^\^|__)/g, type),
+    ]
+  }
+}

data/app/frontend/editor/components/kit/rich-text-input/format-buttons.vue

@@ -22,6 +22,13 @@
       :isActive="isActive.strike()"
       @click="commands.strike"
     />
+    <editor-menu-button
+      iconName="format-superscript"
+      class="rounded-r-sm"
+      :isActive="isActive.sup()"
+      @click="commands.sup"
+      v-if="extraExtensions.superscript"
+    />
   </div>
 </template>
 
@@ -34,6 +41,7 @@ export default {
   props: {
     commands: { type: Object, required: true },
     isActive: { type: Object, required: true },
-  },
+    extraExtensions: { type: Object, default: () => ({ table: false, superscript: false }) },
+  }
 }
 </script>

data/app/frontend/editor/components/kit/rich-text-input.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="mt-1">
       <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
-        <div class="flex sticky top-0 z-10 pb-2 bg-white space-x-1">
+        <div class="flex sticky top-0 z-10 pb-2 bg-white space-x-1 overflow-x-auto">
           <editor-block-button
             :commands="commands"
             :isActive="isActive"
@@ -17,7 +17,11 @@
             v-if="!lineBreak"
           />
 
-          <editor-format-buttons :commands="commands" :isActive="isActive" />
+          <editor-format-buttons 
+            :commands="commands" 
+            :isActive="isActive"
+            :extraExtensions="extraExtensions"
+          />
 
           <editor-list-buttons
             :commands="commands"
@@ -35,7 +39,7 @@
             :commands="commands"
             :isActive="isActive"
             class="relative"
-            v-if="!lineBreak && table"
+            v-if="!lineBreak && extraExtensions.table"
           />
         </div>
       </editor-menu-bar>
@@ -69,11 +73,12 @@ import {
   Table,
   TableHeader,
   TableCell,
-  TableRow,
+  TableRow
 } from 'tiptap-extensions'
 import Doc from './rich-text-input/extensions/Doc'
 import LineBreak from './rich-text-input/extensions/LineBreak'
 import Link from './rich-text-input/extensions/marks/Link'
+import Superscript from './rich-text-input/extensions/marks/Superscript'
 import EditorBlockButton from './rich-text-input/block-button.vue'
 import EditorFormatButtons from './rich-text-input/format-buttons.vue'
 import EditorListButtons from './rich-text-input/list-buttons.vue'
@@ -98,7 +103,7 @@ export default {
     value: { type: String },
     lineBreak: { type: Boolean, default: false },
     rows: { type: Number, default: 2 },
-    table: { type: Boolean, default: false },
+    extraExtensions: { type: Object, default: () => ({ table: false, superscript: false }) },
   },
   data() {
     return { editor: null }
@@ -151,6 +156,7 @@ export default {
         new Underline(),
         new Strike(),
         new Link({ openOnClick: false, target: null }),
+        new Superscript(),
         new History(),
       ]
     },

data/app/frontend/editor/plugins/maglev_dummy.js

@@ -0,0 +1,2 @@
+  import setup from 'maglev_dummy'
+  setup()

data/app/models/maglev/site/locales_concern.rb

@@ -6,7 +6,7 @@ module Maglev::Site::LocalesConcern
 
   included do
     ## serializers ##
-    if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR.positive?
+    if Rails::VERSION::MAJOR >= 8 || (Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR.positive?)
       serialize :locales, coder: LocalesSerializer
     else
       serialize :locales, LocalesSerializer

data/config/routes.rb

@@ -33,7 +33,7 @@ Maglev::Engine.routes.draw do
   # Admin
   namespace :admin do
     root to: 'dashboard#index'
-    resource :theme, only: %i[index show]
+    resource :theme, only: %i[show]
     namespace :sections, path: 'sections/:id' do
       get :preview, to: 'previews#show'
       get :preview_in_frame, to: 'previews#iframe_show'

data/lib/maglev/preview_constraint.rb

@@ -4,7 +4,7 @@ require 'uri'
 
 module Maglev
   class PreviewConstraint
-    CRAWLER_USER_AGENTS = /Googlebot|Twitterbot|facebookexternalhit|LinkedInBot/o.freeze
+    CRAWLER_USER_AGENTS = /Googlebot|Twitterbot|facebookexternalhit|LinkedInBot/o
 
     attr_reader :preview_host
 

data/lib/maglev/version.rb

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

data/lib/tasks/maglev_tasks.rake

@@ -125,11 +125,6 @@ unless ENV['VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION'] == 'true'
     Rake::Task.define_task("assets:precompile": ['maglev:vite:install_dependencies', 'maglev:vite:build_all'])
   end
 
-  Rake::Task.define_task('assets:clean', %i[keep age]) unless Rake::Task.task_defined?('assets:clean')
-  Rake::Task['assets:clean'].enhance do |_, args|
-    Rake::Task['maglev:vite:clean'].invoke(*args.to_h.values)
-  end
-
   if Rake::Task.task_defined?('assets:clobber')
     Rake::Task['assets:clobber'].enhance do
       Rake::Task['maglev:vite:clobber'].invoke

data/tailwind.config.js

@@ -6,7 +6,7 @@ try {
   console.log('No extra Maglev Pro Tailwindcss config');
 } 
 
-module.exports = {
+export default {
   content: [
     './**/*.html.erb',
     './app/helpers/**/*.rb',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '9'
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '9'
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 1.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 1.5.9
 description: "  MaglevCMS integrates a powerful website/page builder with a polished
   UX/UI into your Ruby on Rails application, backed by a flexible and robust CMS engine.\n"
 email:
@@ -150,6 +150,7 @@ files:
 - app/components/maglev/content/select.rb
 - app/components/maglev/content/text.rb
 - app/components/maglev/content/void.rb
+- app/components/maglev/inspector.rb
 - app/components/maglev/page_component.rb
 - app/components/maglev/section_component.rb
 - app/components/maglev/tag_helper.rb
@@ -208,6 +209,7 @@ files:
 - app/frontend/editor/assets/remixicons/format-list-unordered.svg
 - app/frontend/editor/assets/remixicons/format-paragraph.svg
 - app/frontend/editor/assets/remixicons/format-strikethrough.svg
+- app/frontend/editor/assets/remixicons/format-superscript.svg
 - app/frontend/editor/assets/remixicons/format-underline.svg
 - app/frontend/editor/assets/remixicons/home-4-line.svg
 - app/frontend/editor/assets/remixicons/image-line.svg
@@ -290,6 +292,7 @@ files:
 - app/frontend/editor/components/kit/rich-text-input/extensions/Doc.js
 - app/frontend/editor/components/kit/rich-text-input/extensions/LineBreak.js
 - app/frontend/editor/components/kit/rich-text-input/extensions/marks/Link.js
+- app/frontend/editor/components/kit/rich-text-input/extensions/marks/Superscript.js
 - app/frontend/editor/components/kit/rich-text-input/format-buttons.vue
 - app/frontend/editor/components/kit/rich-text-input/link-buttons.vue
 - app/frontend/editor/components/kit/rich-text-input/list-buttons.vue
@@ -362,6 +365,7 @@ files:
 - app/frontend/editor/plugins/filters.js
 - app/frontend/editor/plugins/i18n.js
 - app/frontend/editor/plugins/index.js
+- app/frontend/editor/plugins/maglev_dummy.js
 - app/frontend/editor/plugins/tooltip.js
 - app/frontend/editor/router/index.js
 - app/frontend/editor/router/routes/base.js
@@ -576,7 +580,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="