katalyst-content 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f461f16b190c9c6cb7147c3ac17588a837b01726384bfa00795c416f83f369
-  data.tar.gz: a21d83642982020ee92faed0df79c0811f8b4dc9b6af1b08e86cc2fc999ec656
+  metadata.gz: 3ba3b723f228e2f561064d4c6e42db46f7dad064163a4b6e44818ef9ef893e5f
+  data.tar.gz: 302430ededc05a9a227df3d07e8a4b60b25bc0ab213504e35fcedfd8c9c8d6fa
 SHA512:
-  metadata.gz: a15304c5a37802474e1f332c05398aaaf726ba3f3afd7e9f19608895a0b4a39a5202bc96450e357d3f34ea59e1f534e6e7cbea924d20e2c93dd2fc9737775ead
-  data.tar.gz: 34617f5e64ee96aac094dd1b7c6f4a866c27d4ca4e13b1b322f742c49db283d1371ab5e1c499f2aee10a199648cf9d7d8f500b994585eb179d4257fbf3e08b5a
+  metadata.gz: 557be5c1037ddb0563142b18027fc0d5e99be80d1c54e5198546fb2cf774f97b435baf4efb11d1df1005ac8ed477998e4b3a7bb8d835ef3f74a92e66fc22d00b
+  data.tar.gz: '08cab857ca6675464b13d5c616efc213bfa9d75e55819ab217a4aef95a7fd812f24c42357ed98980b1d49cc3202ab68a947749dd56996771edf212a84a1c6050'

data/README.md

@@ -78,6 +78,35 @@ class CreatePageVersions < ActiveRecord::Migration[7.0]
 end
 ```
 
+If you don't have a pages model yet, add it before the page_versions change:
+```ruby
+class CreatePages < ActiveRecord::Migration[7.0]
+  def change
+    create_table :pages do |t|
+      t.string :title
+      t.string :slug
+      t.boolean :show_title, default: true, null: false
+
+      t.timestamps
+    end
+    add_index :pages, :slug, unique: true
+
+    create_table :page_versions do |t|
+      t.references :parent, foreign_key: { to_table: :pages }, null: false
+      t.json :nodes
+
+      t.timestamps
+    end
+
+    change_table :pages do |t|
+      t.references :published_version, foreign_key: { to_table: :page_versions }
+      t.references :draft_version, foreign_key: { to_table: :page_versions }
+    end
+  end
+end
+```
+
+
 Next, include the `Katalyst::Content` concerns into your model, and add a nested
 model for storing content version information:
 

data/app/controllers/katalyst/content/tables_controller.rb

@@ -9,7 +9,7 @@ module Katalyst
         if item.valid?
           render :update, locals: { item_editor: }
         else
-          render :update, locals: { item_editor: }, status: :unprocessable_entity
+          render :update, locals: { item_editor: }, status: :unprocessable_content
         end
       end
       alias_method :create, :update

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

@@ -31,11 +31,11 @@ module Katalyst
       private
 
       def content_table_allowed_tags
-        Katalyst::Content::Config.table_sanitizer_allowed_tags
+        Katalyst::Content.config.table_sanitizer_allowed_tags
       end
 
       def content_table_allowed_attributes
-        Katalyst::Content::Config.table_sanitizer_allowed_attributes
+        Katalyst::Content.config.table_sanitizer_allowed_attributes
       end
 
       # rubocop:disable Rails/HelperInstanceVariable

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

@@ -49,11 +49,8 @@ module Katalyst
                  dependent:  :destroy,
                  validate:   true
 
-        # Rails 7.2 dropped support for ActiveModel enums. This is a temporary workaround.
-        # Intended behaviour:
-        # attribute :state, :string
-        # enum :state, %i[published draft unpublished].index_with(&:to_s)
         attribute :state, :string
+        enum :state, %i[published draft unpublished].index_with(&:to_s)
 
         # Returns true if there is a published version. Note that this includes drafts.
         def published?

data/lib/katalyst/content/config.rb

@@ -1,20 +1,27 @@
 # frozen_string_literal: true
 
-require "active_support/configurable"
-
 module Katalyst
   module Content
     class Config
-      include ActiveSupport::Configurable
+      attr_accessor :base_controller,
+                    :default_theme,
+                    :errors_component,
+                    :heading_styles,
+                    :image_mime_types,
+                    :items,
+                    :max_image_size,
+                    :table_sanitizer_allowed_attributes,
+                    :table_sanitizer_allowed_tags,
+                    :themes
+
+      alias_attribute :backgrounds, :themes
 
-      config_accessor(:themes) { %w[light dark] }
-      config_accessor(:default_theme) { themes.first }
-      alias_method :backgrounds, :themes
-      alias_method :backgrounds=, :themes=
+      def initialize
+        self.themes        = %w[light dark]
+        self.default_theme = themes.first
 
-      config_accessor(:heading_styles) { %w[none default] }
-      config_accessor(:items) do
-        %w[
+        self.heading_styles   = %w[none default]
+        self.items            = %w[
           Katalyst::Content::Content
           Katalyst::Content::Figure
           Katalyst::Content::Table
@@ -23,21 +30,16 @@ module Katalyst
           Katalyst::Content::Column
           Katalyst::Content::Aside
         ]
-      end
-      config_accessor(:image_mime_types) { %w[image/png image/gif image/jpeg image/webp] }
-      config_accessor(:max_image_size) { 20 }
+        self.image_mime_types = %w[image/png image/gif image/jpeg image/webp]
+        self.max_image_size   = 20
+        self.errors_component = "Katalyst::Content::Editor::ErrorsComponent"
 
-      # Components
-      config_accessor(:errors_component) { "Katalyst::Content::Editor::ErrorsComponent" }
+        self.base_controller = "ApplicationController"
 
-      config_accessor(:base_controller) { "ApplicationController" }
-
-      # Sanitizer
-      config_accessor(:table_sanitizer_allowed_tags) do
-        %w[table thead tbody tr th td caption a strong em span br p text].freeze
-      end
-      config_accessor(:table_sanitizer_allowed_attributes) do
-        %w[colspan rowspan href].freeze
+        # Sanitizer
+        self.table_sanitizer_allowed_tags       = %w[table thead tbody tr th td caption a strong em span br p
+                                                     text].freeze
+        self.table_sanitizer_allowed_attributes = %w[colspan rowspan href].freeze
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Rich content page builder and editor
 test_files: []