katalyst-content 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a70b3f0781f419ffa9df75a608865a3e69d4e030df242474974379928cabdc
-  data.tar.gz: cd0f95f7f8ff3d4b29e889dad3dde799b507a95820b12b7f782a602b49cf9ef9
+  metadata.gz: 9add66f2ceddd578d133b679abf018fc4af299b100ab60b12c93e701e0681c3f
+  data.tar.gz: 6432a682a93e61c38b3bbaecc3dc392c9be03070838094cbd195646e6a0bcdcf
 SHA512:
-  metadata.gz: 25b9b0794259db617629e901c24183d1a87bb0838b0a44ad123ec36702651c7aeb3c1cc6b5d39298fe08f3bc0bcba0f7440655689f86fffffb0ae5f7a5b44c3c
-  data.tar.gz: 282368127af2d0066744bcc44d2f3cfb25885f2d411420ac6c7d44f28d77424380905d7e8905854f7be2ae322e3b7e3feffe68c4eb5f85a9583e03522f7ea2d9
+  metadata.gz: 74ef81a842d28873e577a245a84a97649814d2fdd1387e25cb2fcb273fca7edf4c5fee147bcfcddf3c556a66d11bb9d58705b73e9daae383271fd1ab93ed0362
+  data.tar.gz: 1a8dd6463ff2146bf80ffaecb05adc76e866d956d89544c3257dc2a38be4f8f38d3c86090e464a2571d37108cf3a5d8ceb8e9ffa0223d83cdee435791cd5c7c6

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.1"
+    VERSION = "1.1.0"
   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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
@@ -108,11 +108,11 @@ 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
 - lib/katalyst/content/version.rb
-- lib/tasks/yarn.rake
 - spec/factories/katalyst/content/items.rb
 homepage: https://github.com/katalyst/content
 licenses:

data/lib/tasks/yarn.rake

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-namespace :yarn do
-  desc "Install npm packages with yarn"
-  task install: :environment do
-    sh "yarn install"
-  end
-
-  desc "Lint JS/SCSS files using yarn (prettier)"
-  task lint: :install do
-    sh "yarn lint"
-  end
-
-  desc "Autoformat JS/SCSS files using yarn (prettier)"
-  task format: :install do
-    sh "yarn format"
-  end
-end