kithe 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0ca2d6002aec0accb7264e06f3abcb71f33cf5673fa3ef27bfa035cbca67195
-  data.tar.gz: 9c5ffce36b1ff7a318059babe307627e23ccc00f6997f22a1fdc0d547cfd8a0f
+  metadata.gz: 9f8937387847f42ce3ae1327cd25ac029e38be0a5b821ef0dc45aeeef04d6de7
+  data.tar.gz: 1417b0de61a7a78e1f9ad8b162d766e667b52f89d18b87878390ffbd05b8011b
 SHA512:
-  metadata.gz: 42129dea71f6944d2a70ca69cde8c5f1802c8915ce32cf1b237dbc6223edfcd9cefe776255cb2321c1978da8906a322e88ca443240915b6b2ee1eee53063cd42
-  data.tar.gz: 44478b610e5eb8abda0b385932fb8528c3f6b962f77be9168391d940dac26b739c4c9ec81f1b0912123f178c19b2e2837b1cc6e68483b7c8c59d67e40f1bb8dc
+  metadata.gz: cfd282cf508978df374b23f51ee90f3389b5f5a061ad15a03bb12555776232c0bc8f9f825cc9ea9854dac0954528829d0eccc430aa76fb9eb30694c16f83fc84
+  data.tar.gz: 7d6833edbdb186b547d5d4f57e38fa39224ad797cbfd760c309d9a23bdb3ad8488b0c19aeb7cfe6f799ae946342f9e38172055df231e2a2272c992f6dc376333

data/README.md

@@ -46,7 +46,7 @@ So you want to start an app that uses kithe. We should later provide better 'get
 
 * Kithe view support generally assumes your app uses bootstrap 4, and uses [simple form](https://github.com/plataformatec/simple_form) configured with bootstrap settings. See https://github.com/plataformatec/simple_form#bootstrap . So you should install simple_form and bootstrap 4.
 
-* Specific additional pre-requisites/requirements can sometimes be found in individual feature docs. And include the Javascript from [cocoon](https://github.com/nathanvda/cocoon), for form support for repeatable-field editing forms. We haven't quite figured out our preferred sane approach for sharing Javascript via kithe.
+* Specific additional pre-requisites/requirements can sometimes be found in individual feature docs. And include the Javascript from [cocoon](https://github.com/nathanvda/cocoon), for form support for repeatable-field editing forms. (Only needs cocoon-compatible javascript, so you can use via NPM package without actually using the cocoon gem!)
 
 
 ## Why kithe?

data/app/models/kithe/model.rb

@@ -32,9 +32,8 @@ class Kithe::Model < ActiveRecord::Base
   # this should only apply to Works, but we define it here so we can preload it
   # when fetching all Kithe::Model. And it's to Kithe::Model so it can include
   # both Works and Assets. We do some app-level validation to try and make it used
-  # as intended. Members are by default ordered by position, then created_at.
-  has_many :members, -> { order(position: :asc, created_at: :asc) },
-    class_name: "Kithe::Model", foreign_key: :parent_id,
+  # as intended.
+  has_many :members, class_name: "Kithe::Model", foreign_key: :parent_id,
     inverse_of: :parent, dependent: :destroy
 
   belongs_to :parent, class_name: "Kithe::Model", inverse_of: :members, optional: true

data/lib/kithe/engine.rb

@@ -15,6 +15,25 @@ require "kithe/config_base"
 
 module Kithe
   class Engine < ::Rails::Engine
+
+    # Rails Single-table-inheritance auto-load workaround, further worked around
+    # for Rails 7.
+    #
+    # https://github.com/rails/rails/issues/46625
+    # https://github.com/rails/rails/issues/45307
+    #
+    # Descendants wont' be pre-loaded during initialization, but this is the best
+    # we can do.
+    initializer ("kithe.preload_single_table_inheritance") do
+      unless false && Rails.configuration.cache_classes && Rails.configuration.eager_load
+        Rails.configuration.to_prepare do
+          Kithe::Model.preload_sti unless Kithe::Model.preloaded
+        rescue ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid => e
+          Rails.logger.debug("Could not pre-load Kithe::Models Single-Table Inheritance descendents: #{e.inspect}")
+        end
+      end
+    end
+
     config.generators do |g|
       g.test_framework :rspec, :fixture => false
       g.fixture_replacement :factory_bot, :dir => 'spec/factories'

data/lib/kithe/sti_preload.rb

@@ -8,8 +8,13 @@ module Kithe
   # on particular inheritance hieararchies.
   #
   # We include in our Kithe::Model, which uses Single-Table Inheritance
+  #
+  # BUT NOTE:  What's in Rails Guide right now actually breaks in Rails 7.
+  #
+  # We've messed with based on https://github.com/rails/rails/issues/45307 et al.
+  #
   module StiPreload
-    unless Rails.application.config.eager_load
+    unless Rails.configuration.cache_classes && Rails.configuration.eager_load
       extend ActiveSupport::Concern
 
       included do
@@ -17,10 +22,13 @@ module Kithe
       end
 
       class_methods do
-        def descendants
-          preload_sti unless preloaded
-          super
-        end
+
+        # For Rails 7, this now breaks; we work around with an after_initialize hook
+        # in ./kithe/engine.rb . See more links there.
+        # def descendants
+        #   preload_sti unless preloaded
+        #   super
+        # end
 
         # Constantizes all types present in the database. There might be more on
         # disk, but that does not matter in practice as far as the STI API is

data/lib/kithe/version.rb

@@ -1,3 +1,3 @@
 module Kithe
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails