katalyst-content 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 433c0f1ad7f53e425f5feaeacde9ad27ec1303062aeda91dcae10e8ef326679c
-  data.tar.gz: f49acc4f588d226dddca67f181604605b44f353d67e0a38c5d7a578e1c835c9a
+  metadata.gz: 87e4bd83eeac48370da7a9d48165db46776c97be76b76e08fccf16f7b3890493
+  data.tar.gz: ab1893973d8a60e5db8eddfaab2fe7251f7df21b7bcb2e5ba34f5408bf438d3a
 SHA512:
-  metadata.gz: bd55fbd95ac4e58a8e6860b3f278f4b17fd1752ec777b4ce1cbfc7fe9998155ff5c7b8cbc409e60d4cd33ed824390e3d5f9efe5d098d332e41965502e3095724
-  data.tar.gz: a0c9151ed9800288dd8a8b56ed121e523a9cca2bcc64c73ff58368ce2c32c87738539fad679816bdfb3c431eaf90b9f8c098057f83e0b60c92590b4af528fe54
+  metadata.gz: a0ea63540fe34c71e88405905054b5ed27d36d7232583f5fe5270d2daf1b40ce7c0a27d42a7fc0d6963c44f1353147d251d406ae1d4cdc4f4d231bfac49d6167
+  data.tar.gz: 2e41d43a9122257aab1df8c274c7ad09a77e253a48a0c34157fcd08d74ecafd4cc6a113d54cb56f2bc6bf44a53ac9f31755dbc5e835d842ec09d83f6145cc778

data/app/assets/javascripts/controllers/content/editor/trix_controller.js

@@ -1,5 +1,10 @@
 import { Controller } from "@hotwired/stimulus";
-import Trix from "trix";
+import "trix";
+
+// Note, action_text 7.1.2 changes how Trix is bundled and loaded. This
+// seems to have broken the default export from trix. This is a workaround
+// that relies on the backwards compatibility of the old export to window.Trix.
+const Trix = window.Trix;
 
 // Stimulus controller doesn't do anything, but having one ensures that trix
 // will be lazy loaded when a trix-editor is added to the dom.

data/app/helpers/katalyst/content/editor_helper.rb

@@ -5,7 +5,7 @@ module Katalyst
     module EditorHelper
       def content_editor_new_items(container:)
         Katalyst::Content.config.items.map do |item_class|
-          item_class = item_class.is_a?(String) ? item_class.safe_constantize : item_class
+          item_class = item_class.safe_constantize if item_class.is_a?(String)
           item_class.new(container: container)
         end
       end
@@ -55,8 +55,8 @@ module Katalyst
         defaults.deep_merge(options)
       end
 
-      def content_editor_image_field(item:, method:, **options, &block)
-        Editor::ImageField.new(self, item.container).build(item, method, **options, &block)
+      def content_editor_image_field(...)
+        Editor::ImageField.new(self, item.container).build(...)
       end
 
       # When rendering item forms do not include the controller namespace prefix (katalyst/content)

data/app/helpers/katalyst/content/frontend_helper.rb

@@ -25,8 +25,8 @@ module Katalyst
         end
       end
 
-      def content_item_tag(item, **options, &block)
-        FrontendBuilder.new(self, item).render(**options, &block)
+      def content_item_tag(item, ...)
+        FrontendBuilder.new(self, item).render(...)
       end
 
       private

data/app/models/katalyst/content/figure.rb

@@ -26,7 +26,7 @@ module Katalyst
       end
 
       def self.permitted_params
-        super - %i[show_heading] + %i[image caption]
+        super - %i[heading_style] + %i[image caption]
       end
 
       alias_attribute :alt, :heading

data/app/models/katalyst/content/item.rb

@@ -8,12 +8,16 @@ module Katalyst
         Katalyst::Content.config
       end
 
+      enum heading_style: config.heading_styles, _prefix: :heading
+
       belongs_to :container, polymorphic: true
 
       validates :heading, presence: true
+      validates :heading_style, inclusion: { in: config.heading_styles }
       validates :background, presence: true, inclusion: { in: config.backgrounds }, if: :validate_background?
 
       after_initialize :initialize_tree
+      before_validation :set_defaults
 
       attr_accessor :parent, :children, :index, :depth
 
@@ -23,7 +27,7 @@ module Katalyst
           container_id
           type
           heading
-          show_heading
+          heading_style
           background
           visible
         ]
@@ -33,6 +37,14 @@ module Katalyst
         heading if show_heading? && visible?
       end
 
+      def show_heading?
+        !heading_none?
+      end
+
+      def heading_style_class
+        heading_style unless heading_default?
+      end
+
       def layout?
         is_a? Layout
       end
@@ -44,6 +56,10 @@ module Katalyst
         self.children ||= []
       end
 
+      def set_defaults
+        self.heading_style = "none" if heading_style.blank?
+      end
+
       def validate_background?
         true
       end

data/app/views/katalyst/content/asides/_aside.html+form.erb

@@ -8,8 +8,8 @@
   </div>
 
   <div class="field">
-    <%= form.label :show_heading %>
-    <%= form.check_box :show_heading %>
+    <%= form.label :heading_style %>
+    <%= form.collection_radio_buttons :heading_style, Katalyst::Content.config.heading_styles, :itself, :itself %>
   </div>
 
   <div class="field">

data/app/views/katalyst/content/asides/_aside.html.erb

@@ -1,5 +1,5 @@
 <%= content_item_tag aside do %>
-  <%= tag.h3 aside.heading if aside.show_heading? %>
+  <%= tag.h3 aside.heading, class: aside.heading_style_class if aside.show_heading? %>
 
   <% items = aside.children.select(&:visible?) %>
   <% last = items.pop %>

data/app/views/katalyst/content/columns/_column.html+form.erb

@@ -8,8 +8,8 @@
   </div>
 
   <div class="field">
-    <%= form.label :show_heading %>
-    <%= form.check_box :show_heading %>
+    <%= form.label :heading_style %>
+    <%= form.collection_radio_buttons :heading_style, Katalyst::Content.config.heading_styles, :itself, :itself %>
   </div>
 
   <div class="field">

data/app/views/katalyst/content/columns/_column.html.erb

@@ -1,14 +1,18 @@
 <%= content_item_tag column do %>
-  <%= tag.h3 column.heading if column.show_heading? %>
+  <%= tag.h3 column.heading, class: column.heading_style_class if column.show_heading? %>
 
   <% items = column.children.select(&:visible?) %>
   <% last = items.pop %>
   <div class="columns-container">
     <div class="column">
-      <%= render_content_items items %>
+      <% if items.any? %>
+        <%= render_content_items items %>
+      <% elsif last %>
+        <%= render_content_items [last] %>
+      <% end %>
     </div>
     <div class="column">
-      <%= render_content_items [last] if last %>
+      <%= render_content_items [last] if last && items.any? %>
     </div>
   </div>
 <% end %>

data/app/views/katalyst/content/contents/_content.html+form.erb

@@ -8,8 +8,8 @@
   </div>
 
   <div class="field">
-    <%= form.label :show_heading %>
-    <%= form.check_box :show_heading %>
+    <%= form.label :heading_style %>
+    <%= form.collection_radio_buttons :heading_style, Katalyst::Content.config.heading_styles, :itself, :itself %>
   </div>
 
   <div class="field">

data/app/views/katalyst/content/contents/_content.html.erb

@@ -1,5 +1,5 @@
 <%= content_item_tag content do %>
-  <%= tag.h3 content.heading if content.show_heading? %>
+  <%= tag.h3 content.heading, class: content.heading_style_class if content.show_heading? %>
 
   <%= content.content %>
 <% end %>

data/app/views/katalyst/content/groups/_group.html+form.erb

@@ -8,8 +8,8 @@
   </div>
 
   <div class="field">
-    <%= form.label :show_heading %>
-    <%= form.check_box :show_heading %>
+    <%= form.label :heading_style %>
+    <%= form.collection_radio_buttons :heading_style, Katalyst::Content.config.heading_styles, :itself, :itself %>
   </div>
 
   <div class="field">

data/app/views/katalyst/content/groups/_group.html.erb

@@ -1,5 +1,5 @@
 <%= content_item_tag group do %>
-  <%= tag.h3 group.heading if group.show_heading? %>
+  <%= tag.h3 group.heading, class: group.heading_style_class if group.show_heading? %>
 
   <div>
     <%= render_content_items group.children %>

data/app/views/katalyst/content/items/_item.html+form.erb

@@ -8,8 +8,8 @@
   </div>
 
   <div class="field">
-    <%= form.label :show_heading %>
-    <%= form.check_box :show_heading %>
+    <%= form.label :heading_style %>
+    <%= form.collection_radio_buttons :heading_style, Katalyst::Content.config.heading_styles, :itself, :itself %>
   </div>
 
   <div class="field">

data/app/views/katalyst/content/sections/_section.html+form.erb

@@ -8,8 +8,8 @@
   </div>
 
   <div class="field">
-    <%= form.label :show_heading %>
-    <%= form.check_box :show_heading %>
+    <%= form.label :heading_style %>
+    <%= form.collection_radio_buttons :heading_style, Katalyst::Content.config.heading_styles, :itself, :itself %>
   </div>
 
   <div class="field">

data/app/views/katalyst/content/sections/_section.html.erb

@@ -1,5 +1,5 @@
 <%= content_item_tag section do %>
-  <%= tag.h2 section.heading if section.show_heading? %>
+  <%= tag.h2 section.heading, class: section.heading_style_class if section.show_heading? %>
 
   <div>
     <%= render_content_items section.children %>

data/db/migrate/20230515151440_change_katalyst_content_items_show_heading_column.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ChangeKatalystContentItemsShowHeadingColumn < ActiveRecord::Migration[7.0]
+  def up
+    add_column :katalyst_content_items, :heading_style, :integer, null: false, default: 0
+    Katalyst::Content::Item.where(show_heading: true).update_all(heading_style: 1)
+    remove_column :katalyst_content_items, :show_heading, :boolean
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/katalyst/content/config.rb

@@ -8,6 +8,7 @@ module Katalyst
       include ActiveSupport::Configurable
 
       config_accessor(:backgrounds) { %w[light dark] }
+      config_accessor(:heading_styles) { %w[none default] }
       config_accessor(:items) do
         %w[
           Katalyst::Content::Content

data/lib/katalyst/content/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Content
-    VERSION = "1.0.2"
+    VERSION = "1.1.1"
   end
 end

data/spec/factories/katalyst/content/items.rb

@@ -3,7 +3,7 @@
 FactoryBot.define do
   trait :content_item_defaults do
     heading { Faker::Lorem.word }
-    show_heading { true }
+    heading_style { "default" }
     background { Katalyst::Content.config.backgrounds.sample }
     depth { 0 }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
@@ -108,6 +108,7 @@ files:
 - config/routes.rb
 - db/migrate/20220913003839_create_katalyst_content_items.rb
 - db/migrate/20220926061535_add_fields_for_figure_to_katalyst_content_items.rb
+- db/migrate/20230515151440_change_katalyst_content_items_show_heading_column.rb
 - lib/katalyst/content.rb
 - lib/katalyst/content/config.rb
 - lib/katalyst/content/engine.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Rich content page builder and editor