katalyst-content 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1be194d961a873a0cdb20f871b5ff57f57ff1b5b503dfc8716b1004b6b6a4e6
-  data.tar.gz: b3f45e0d9e23450e39055da1cd5b15b3b93865fa7b37b6cc632ff900041e0d60
+  metadata.gz: 5e38cbf36ab348007822df1209895dd018187732543a5e30a415b45c6c76eea2
+  data.tar.gz: 1594f99bc385122dec95d1193579de7f7405981233fdff7d304f8628295883fc
 SHA512:
-  metadata.gz: 647b389cbc0c4b8c27227c377a910c04906cb46e34be09d12914f368d2699a0d778b73b7a2e5d493dd45c4f6de9303a366f45f4246984db6b3764294ab2f794b
-  data.tar.gz: af45914d0047b3b13d4ea19051fb2914cfa4aebf81809af22d14ef022332dd51683d49f10fc5685e9e32e8225bd3712d2c0b51c85df7c033cf1d5457458e4e55
+  metadata.gz: 5881d775194f04bb5ac2b53b7585281661c5633306cbf91dbae7c08853ee1e5eba22c92366c65152836543c3c01bbd0952610c77330a2630d0f9cd4c776a9842
+  data.tar.gz: 425ca40e2cd4b354e792e09a25dc6ec3cd0a99a4725ee5ce862f7ff9886d4d07fe161882be1a5c209dc5137cd09ef1b2412769a9883c7482a93f83e16fb8866b

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/assets/stylesheets/katalyst/content/frontend/frontend.css

@@ -34,22 +34,18 @@
 }
 
 .content-item [data-content-theme] {
+  background: var(--background, unset);
+  color: var(--text-color);
   padding-inline: var(--content-inline-gutter);
 }
 
 [data-content-theme="light"] {
-  background: var(--background, var(--background-color));
-  color: var(--text-color);
-
   --text-color: var(--color-dark, black);
   --background: var(--color-light, black);
   --link-color: var(--color-dark, black);
 }
 
 [data-content-theme="dark"] {
-  background: var(--background, var(--background-color));
-  color: var(--text-color);
-
   --text-color: var(--color-light, white);
   --background: var(--color-dark, black);
   --link-color: var(--color-light, white);

data/app/components/katalyst/content/editor/base_component.rb

@@ -14,7 +14,7 @@ module Katalyst
           super(**)
 
           @container = container
-          @item = item
+          @item      = item
         end
 
         def call; end

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

@@ -50,7 +50,7 @@ module Katalyst
 
       def item_params_type
         requested_type = params.require(:item).fetch(:type, "")
-        if (type = Katalyst::Content.config.items.find { |t| t == requested_type })
+        if (type       = Katalyst::Content.config.items.find { |t| t == requested_type })
           type.safe_constantize
         else
           Item
@@ -70,9 +70,9 @@ module Katalyst
       end
 
       def set_item
-        @item      = Item.find(params[:id])
+        @item      = Item.find(params.expect(:id))
         @container = @item.container
-        @editor = Katalyst::Content::EditorComponent.new(container:, item:)
+        @editor    = Katalyst::Content::EditorComponent.new(container:, item:)
       end
 
       def set_editor_variant

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

@@ -53,7 +53,7 @@ module Katalyst
 
           return unless @node
 
-          @heading_rows = @table.heading_rows.clamp(0..css("tr").length)
+          @heading_rows    = @table.heading_rows.clamp(0..css("tr").length)
           @heading_columns = @table.heading_columns.clamp(0..)
         end
 
@@ -94,7 +94,7 @@ module Katalyst
               # e.g. colspan=2 rowspan=3 would occupy 6 cells
               row_range(cell, y).each do |ty|
                 col_range(cell, x).each do |tx|
-                  matrix[ty] ||= []
+                  matrix[ty]   ||= []
                   matrix[ty][tx] = cell.text
                 end
               end

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?
@@ -154,7 +151,7 @@ module Katalyst
       private
 
       def unset_versions
-        self.draft_version_id = nil
+        self.draft_version_id     = nil
         self.published_version_id = nil
         save!(validate: false)
       end

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

@@ -57,7 +57,7 @@ module Katalyst
 
         # Add node to the top of builder stacks
         def push(node)
-          self.depth += 1
+          self.depth   += 1
           self.current  = node
           self.children = node.children = []
           node
@@ -65,7 +65,7 @@ module Katalyst
 
         # Remove current from builder stack
         def pop
-          previous = current
+          previous    = current
           self.depth -= 1
           if depth.zero?
             self.current  = nil

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

@@ -36,7 +36,7 @@ module Katalyst
       end
 
       def text
-        items.filter_map(&:to_plain_text).join("\n")
+        tree.filter_map(&:to_plain_text).join("\n")
       end
     end
   end

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

@@ -3,6 +3,11 @@
 module Katalyst
   module Content
     class Layout < Item
+      def to_plain_text
+        return unless visible?
+
+        [super, *children.filter_map(&:to_plain_text)].join("\n").presence
+      end
     end
   end
 end

data/app/models/katalyst/content/tables/importer.rb

@@ -77,7 +77,7 @@ module Katalyst
 
         def header_row_caption?
           !at_css("caption") &&
-            (tr = at_css("thead > tr:first-child"))&.elements&.one? &&
+            (tr      = at_css("thead > tr:first-child"))&.elements&.one? &&
             (colspan = tr.elements.first.attributes["colspan"]&.value) &&
             colspan.to_i > 1
         end
@@ -130,10 +130,10 @@ module Katalyst
 
         # Promotes the first row to a caption if it only has one cell.
         def promote_header_row_caption!
-          tr   = at_css("thead > tr:first-child")
-          cell = tr.elements.first
+          tr                           = at_css("thead > tr:first-child")
+          cell                         = tr.elements.first
           tr.remove
-          thead = at_css("thead")
+          thead                        = at_css("thead")
           thead.before("<caption></caption>")
           thead.remove if thead.elements.empty?
           at_css("caption").inner_html = cell.inner_html.strip
@@ -141,7 +141,7 @@ module Katalyst
 
         # Set heading from caption and remove the caption from the table.
         def set_heading!
-          caption = at_css("caption")
+          caption             = at_css("caption")
           table.heading       = caption.text.strip
           table.heading_style = "default"
           caption.remove

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 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.10
 specification_version: 4
 summary: Rich content page builder and editor
 test_files: []