katalyst-content 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92decbb40f9e511b798074401535eeb7bbf36ce0a556b77cd3b90d59c7452260
-  data.tar.gz: 9835da841a102376f85accea98799c7bd9660cfab3c04555ed13e34081c03edb
+  metadata.gz: bdabab79e4bf2448d8557d5e4f6b1f62655b6be942237bf6d0b0846dccb9862d
+  data.tar.gz: 5504a62e8a0cca3f748e3eb4568cef6453588d74c5413f81b8cc586c1052f584
 SHA512:
-  metadata.gz: 673346f320e559088c4d646504f9ea492c98ed3c5d95749479e4c742381d0690774d063b3c10cbd04e952040be69616f3cc579afcaeca646d8fbcbe304288883
-  data.tar.gz: 905ebe2d3d4c216492359a2cb53532bee45db92a29223ef7ecf0a7ba03f0425f94a7b3b923763fc7196a746d7527bd6b827f968cdefcc39a2dda562bbf3e1cb4
+  metadata.gz: f96d013e1b4bfe1c1bcd76d3433e789c2b23c74276f65924fa83977a9147930d80352378c15a58a6961bf477caaa088a3a9926c0c6137db85e05863436a983bd
+  data.tar.gz: 869e112cbd54113bf565869e753cddbc6e23a9088a666d39748fe49b67ecbd6f83ddd1edfbed8832d2ab66db458146a17838be7a91b65258d18642fb6a07f0cb

data/app/assets/stylesheets/katalyst/content/editor/_index.scss

@@ -11,6 +11,8 @@
 @use "trix";
 @use "trix-rails";
 
+$max-nesting: 8 !default;
+
 [data-controller="content--editor--container"] {
   --row-height: #{$row-height};
   --row-inset: #{$row-inset};
@@ -67,7 +69,7 @@
     }
 
     // Depth spacing
-    @for $i from 1 through 6 {
+    @for $i from 1 through $max-nesting {
       &[data-content-depth="#{$i}"] .tree {
         padding-left: calc(var(--row-inset) * #{$i});
       }

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

@@ -87,15 +87,32 @@ module Katalyst
       #
       # This mimics the behaviour of direct uploads without requiring the JS
       # integration.
+      #
+      # Note: this idea comes from various blogs who have documented this approach, such as
+      # https://medium.com/@TETRA2000/active-storage-how-to-retain-uploaded-files-on-form-resubmission-91b57be78d53
+      #
+      # In Rails 7.2 the simple version of this approach was broken to work around a bug that Rails plans to address
+      # in a future release.
+      # https://github.com/rails/rails/commit/82d4ad5da336a18a55a05a50b851e220032369a0
+      #
+      # The work around is to decouple the blobs from their attachments before saving by duping
+      # them. This approach feels a bit hairy and might need to be replaced by a 'standard' direct upload approach
+      # in the future.
+      #
+      # The reason we use this approach currently is to avoid needing a separate direct upload controller for
+      # content which would potentially introduce a back door where un-trusted users are allowed to upload
+      # attachments.
       def store_attachments(item)
         item.attachment_changes.each_value do |change|
           case change
           when ActiveStorage::Attached::Changes::CreateOne
             change.upload
-            change.blob.save!
+            change.attachment.blob = change.blob.dup.tap(&:save!)
           when ActiveStorage::Attached::Changes::CreateMany
             change.upload
-            change.blobs.each(&:save!)
+            change.attachments.zip(change.blobs).each do |attachment, blob|
+              attachment.blob = blob.dup.tap(&:save!)
+            end
           end
         end
       end

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

@@ -49,8 +49,24 @@ 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?
+          %w[published draft].include?(state)
+        end
+
+        def draft?
+          state == "draft"
+        end
+
+        def unpublished?
+          state == "unpublished"
+        end
 
         # Find records by their state
         scope :state, ->(values) do
@@ -98,11 +114,6 @@ module Katalyst
           order(stmt.public_send(dir)).order(updated_at: dir)
         end
 
-        # Returns true if there is a published version. Note that this includes drafts.
-        def published?
-          super || draft?
-        end
-
         def state=(_)
           raise NotImplementedError, "state cannot be set directly, use publish!, revert! etc"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '0'
   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'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Rich content page builder and editor