kithe 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f768036d2b89fb4fedb4220b007e87f23967f9b81177cf4818fbd967f0b0d2
-  data.tar.gz: 358cf6e4531c022160b4877e8ea7931a10930e71e2714f095bc0e52499fc6eee
+  metadata.gz: 9f8937387847f42ce3ae1327cd25ac029e38be0a5b821ef0dc45aeeef04d6de7
+  data.tar.gz: 1417b0de61a7a78e1f9ad8b162d766e667b52f89d18b87878390ffbd05b8011b
 SHA512:
-  metadata.gz: 44139f3684a3609b16f972dffc58656bc2b110c6f6b5aefd635fc303089b30824a1351918ff704bcd48850bfb6cc95978bf2732ecda4166e8d9715ce9ab5ffee
-  data.tar.gz: 6be86d9e1b234832bced241f1b4bf7a9badcc446fd3d1c00b617395864e833ddc2894e702b6ce2b41789d87fc310e1725818bc8b44d786666a5f3fe549fea6f5
+  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/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.1'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -426,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Shareable tools/components for building a digital collections app in Rails.