katalyst-content 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6a6f54f7d667a7f22b554a812d4eeaccdf177441f9aa472b39f9cf6ecf9391f
-  data.tar.gz: c9d797a85f1a2fa139c4aa275c55840621b76da138db1f01deb5ada1239d4a08
+  metadata.gz: 57fa137dad1c3a60f7f6689ef806fac3ae17a0dbb4fc21d2e1b4392e1bf47d7f
+  data.tar.gz: 5e528a67bcc761b93a639671132cd554b33b25632840aada6453af58b5866ff6
 SHA512:
-  metadata.gz: 62adedcdf33603f1afe25a51bb3f44a7b956e400a58c7820fc2a09887fafd713034dc9eea56088d124e259753e99e1914cac83dd0fba9a1e70c4a1c6c40d4787
-  data.tar.gz: 790ec607c8ce81d4bfe522f6a95dce04ed8c9c238161752446a05edaecb5ab62297cf0ea1df9cf060d4bb47fff4b75ac74da41e2e8c407b20bb51c363bae1a13
+  metadata.gz: '0785c75b21825b29dae88e7cec9ec3fe409e683a5a28ff08a9a27ada05129045409df9a0e07e52f23b6361d717b1562254a88151c03c23c4eab1c7caa3d659fe'
+  data.tar.gz: 95c86f1111d721bff45326298f256289032d0f4fae91d4d0302c3261c28c61cc5bf240241959e9dd05247b417c96581c14c08fea14598eadf5d6e79e39a60a21

data/app/models/concerns/katalyst/content/has_style.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module Content
+    module HasStyle
+      extend ActiveSupport::Concern
+
+      # Style attribute allows items to define their own attributes for use in
+      # content styles. These attribute will be automatically mapped to json
+      # data which is stored and deserialized without needing to add columns.
+      class_methods do
+        def style_attributes(&)
+          style_class = Class.new(Katalyst::Content::HasStyle::StyleBase, &)
+          const_set(:Style, style_class)
+          attribute(:style, Katalyst::Content::Types::StyleType.new(style_class), default: -> { style_class.new })
+
+          style_class.attribute_names.each do |name|
+            define_method(name) { style.public_send(name) }
+            define_method(:"#{name}=") { |value| style.public_send(:"#{name}=", value) }
+          end
+
+          validate do
+            style.validate(validation_context)
+            style.errors.each do |error|
+              errors.add(error.attribute, error.type)
+            end
+          end
+        end
+      end
+
+      class StyleBase
+        include ActiveModel::Model
+        include ActiveModel::Attributes
+      end
+    end
+  end
+end

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

@@ -3,6 +3,13 @@
 module Katalyst
   module Content
     class Aside < Layout
+      style_attributes do
+        attribute :reverse, :boolean, default: false
+      end
+
+      def self.permitted_params
+        super + %i[reverse]
+      end
     end
   end
 end

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

@@ -4,11 +4,13 @@ module Katalyst
   module Content
     # STI base class for content items
     class Item < ApplicationRecord
+      include HasStyle
+
       def self.config
         Katalyst::Content.config
       end
 
-      enum heading_style: config.heading_styles, _prefix: :heading
+      enum :heading_style, config.heading_styles, prefix: :heading
 
       belongs_to :container, polymorphic: true
 

data/app/models/katalyst/content/types/style_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module Content
+    module Types
+      # Data serialization/deserialization for Katalyst::Content::Item style data
+      class StyleType < ActiveRecord::Type::Json
+        def initialize(type)
+          super()
+
+          @type = type
+        end
+
+        def serialize(value)
+          super(value.attributes)
+        end
+
+        def deserialize(value)
+          case value
+          when String
+            decoded = super
+            @type.new(**decoded) unless decoded.nil?
+          when Hash
+            @type.new(**value)
+          when HasStyle::StyleBase
+            value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -22,6 +22,11 @@
     <%= form.check_box :visible %>
   </div>
 
+  <div class="field">
+    <%= form.label :reverse %>
+    <%= form.check_box :reverse %>
+  </div>
+
   <%= form.submit "Done" %>
   <%= link_to "Discard", :back %>
 <% end %>

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

@@ -4,7 +4,7 @@
   <% if aside.children.any? %>
     <% items = aside.children.select(&:visible?) %>
     <% last = items.pop %>
-    <div role="aside-container">
+    <div role="aside-container" <%= "class=reverse" if aside.reverse %>>
       <div>
         <%= render_content_items items %>
       </div>

data/db/migrate/20240826042004_add_style_to_content_items.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStyleToContentItems < ActiveRecord::Migration[7.1]
+  def change
+    add_column :katalyst_content_items, :style, :json, null: false, default: {}
+  end
+end

data/lib/katalyst/content/engine.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
-require "rails"
+require "katalyst/html_attributes"
+require "katalyst/kpop"
+require "rails/engine"
 
 module Katalyst
   module Content
     class Engine < ::Rails::Engine
       isolate_namespace Katalyst::Content
+      config.eager_load_namespaces << Katalyst::Content
 
       initializer "katalyst-content.factories", after: "factory_bot.set_factory_paths" do
         FactoryBot.definition_file_paths << Engine.root.join("spec/factories") if defined?(FactoryBot)

data/lib/katalyst/content.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
 require "active_support"
-require "katalyst/html_attributes"
-require "katalyst/kpop"
-
-require "katalyst/content/config"
-require "katalyst/content/engine"
 
 module Katalyst
   module Content
+    extend ActiveSupport::Autoload
     extend self
 
+    autoload :Config
+
     def config
       @config ||= Config.new
     end
@@ -20,3 +18,5 @@ module Katalyst
     end
   end
 end
+
+require "katalyst/content/engine"

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +148,7 @@ files:
 - app/javascript/content/editor/trix_controller.js
 - app/models/concerns/katalyst/content/container.rb
 - app/models/concerns/katalyst/content/garbage_collection.rb
+- app/models/concerns/katalyst/content/has_style.rb
 - app/models/concerns/katalyst/content/has_tree.rb
 - app/models/concerns/katalyst/content/version.rb
 - app/models/katalyst/content/aside.rb
@@ -142,6 +163,7 @@ files:
 - app/models/katalyst/content/table.rb
 - app/models/katalyst/content/tables/importer.rb
 - app/models/katalyst/content/types/nodes_type.rb
+- app/models/katalyst/content/types/style_type.rb
 - app/views/active_storage/blobs/_blob.html.erb
 - app/views/katalyst/content/asides/_aside.html+form.erb
 - app/views/katalyst/content/asides/_aside.html.erb
@@ -172,6 +194,7 @@ files:
 - 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
+- db/migrate/20240826042004_add_style_to_content_items.rb
 - lib/katalyst/content.rb
 - lib/katalyst/content/config.rb
 - lib/katalyst/content/engine.rb