kithe 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a51da44ba82df89dd84f14a9559de8032d2e026ee666d9dba4e9fb41d05b1b0
-  data.tar.gz: feb995557174e9ef7c2fb6689bb352ec2dd227dc4e98a282d1b639e1d8d11393
+  metadata.gz: f0ca2d6002aec0accb7264e06f3abcb71f33cf5673fa3ef27bfa035cbca67195
+  data.tar.gz: 9c5ffce36b1ff7a318059babe307627e23ccc00f6997f22a1fdc0d547cfd8a0f
 SHA512:
-  metadata.gz: 6de9ece27273199672bc007b229b63707fb4470456091a5f166b1913d6affad22d16ecb2c1a32e5a053459b408a227149ff3b2947ed06e00e2e1408ca6cd9cce
-  data.tar.gz: 1004d59f35ce5a4abdd958fa87891b3e51c6da3e8e65f078a16e74cb99b601b471aaacf895fb5f4f2249cb8a728d78542b66fe656865ae235c8fbd7a8aa2ce27
+  metadata.gz: 42129dea71f6944d2a70ca69cde8c5f1802c8915ce32cf1b237dbc6223edfcd9cefe776255cb2321c1978da8906a322e88ca443240915b6b2ee1eee53063cd42
+  data.tar.gz: 44478b610e5eb8abda0b385932fb8528c3f6b962f77be9168391d940dac26b739c4c9ec81f1b0912123f178c19b2e2837b1cc6e68483b7c8c59d67e40f1bb8dc

data/app/derivative_transformers/kithe/ffmpeg_extract_jpg.rb

@@ -15,18 +15,21 @@ module Kithe
     # @param start_seconds [Integer] seek to this point to find thumbnail. If it's
     #   after the end of the video, you won't get a thumb back though! [Default 0]
     #
-    # @param frame_sample_size [Integer] argument passed to ffmpeg thumbnail filter,
+    # @param frame_sample_size [Integer,false,nil] argument passed to ffmpeg thumbnail filter,
     #   how many frames to sample, starting at start_seconds, to choose representative
     #   thumbnail. If set to false, thumbnail filter won't be used. If this one
     #   goes past the end of the video, ffmpeg is fine with it. Set to `false` to
     #   disable use of ffmpeg sample feature, and just use exact frame at start_seconds.
-    #   [Default 900, around 30 seconds at 30 fps]
+    #
+    #   NOTE: This can consume significant RAM depending on value and video resolution.
+    #
+    #   [Default false, not operative]
     #
     # @width_pixels [Integer] output thumb at this width. aspect ratio will be
     #   maintained. Warning, if it's larger than video original, ffmpeg will
     #   upscale!  If set to nil, thumb will be output at original video
     #   resolution. [Default nil]
-    def initialize(start_seconds: 0, frame_sample_size: 900, width_pixels: nil)
+    def initialize(start_seconds: 0, frame_sample_size: false, width_pixels: nil)
       @start_seconds = start_seconds
       @frame_sample_size = frame_sample_size
       @width_pixels = width_pixels
@@ -68,30 +71,36 @@ module Kithe
     def _call(ffmpeg_source_arg)
       tempfile = Tempfile.new(['temp_deriv', ".jpg"])
 
+      ffmpeg_args = produce_ffmpeg_args(input_arg: ffmpeg_source_arg, output_path: tempfile.path)
+
+      TTY::Command.new(printer: :null).run(*ffmpeg_args)
+
+      return tempfile
+    rescue StandardError => e
+      tempfile.unlink if tempfile
+      raise e
+    end
+
+    def produce_ffmpeg_args(input_arg:, output_path:)
       ffmpeg_args = [ffmpeg_command, "-y"]
+
       if start_seconds && start_seconds > 0
         ffmpeg_args.concat ["-ss", start_seconds.to_i]
       end
 
-      ffmpeg_args.concat ["-i", ffmpeg_source_arg]
+      ffmpeg_args.concat ["-i", input_arg]
 
       video_filter_parts = []
-      video_filter_parts << "thumbnail=#{frame_sample_size}" if frame_sample_size
+      video_filter_parts << "thumbnail=#{frame_sample_size}" if (frame_sample_size || 0) > 1
       video_filter_parts << "scale=#{width_pixels}:-1" if width_pixels
-      if video_filter_parts
+
+      if video_filter_parts.present?
         ffmpeg_args.concat ["-vf", video_filter_parts.join(',')]
       end
 
       ffmpeg_args.concat ["-frames:v",  "1"]
 
-      ffmpeg_args << tempfile.path
-
-      TTY::Command.new(printer: :null).run(*ffmpeg_args)
-
-      return tempfile
-    rescue StandardError => e
-      tempfile.unlink if tempfile
-      raise e
+      ffmpeg_args << output_path
     end
   end
 end

data/app/indexing/kithe/indexable/record_index_updater.rb

@@ -24,6 +24,9 @@ module Kithe
       #   it's nil, meaning we'll find the indexer to use from current thread settings,
       #   or global settings.
       #
+      #   (note: this design means we can't currently use traject processing_thread_pool for
+      #   concurrency, sorry.)
+      #
       # @param writer [Traject::Writer] Can pass i a custom Traject::Writer which the
       #   index representation will be sent to. By default it's nil, meaning we'll find
       #   the writer to use from current thread settings or global settings.

data/app/models/kithe/model.rb

@@ -32,8 +32,11 @@ 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.
-  has_many :members, class_name: "Kithe::Model", foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+  # 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,
+    inverse_of: :parent, dependent: :destroy
+
   belongs_to :parent, class_name: "Kithe::Model", inverse_of: :members, optional: true
 
   # a self-referential many-to-many is a bit confusing, but our "contains" relation
@@ -130,11 +133,15 @@ class Kithe::Model < ActiveRecord::Base
         LIMIT 1;
     EOS
 
-    # trying to use a prepared statement, hoping it means performance advantage
+    # trying to use a prepared statement, hoping it means performance advantage,
+    # this is super undocumented
+
+    bind = ActiveRecord::Relation::QueryAttribute.new("m.id", self.representative_id, ActiveRecord::Type::Value.new)
+
     result = self.class.connection.select_all(
       recursive_cte,
       "set_leaf_representative",
-      [[nil, self.representative_id]],
+      [bind],
       preparable: true
     ).first.try(:dig, "id")
 

data/app/models/kithe/parameters.rb

@@ -63,11 +63,24 @@
 class Kithe::Parameters < ActionController::Parameters
   attr_reader :auto_allowed_keys
 
-  def initialize(hash = {})
-    if hash.respond_to?(:to_unsafe_h)
-      hash = hash.to_unsafe_h
+
+  # Rails 7 adds another initializer method, annoyingly
+  if Rails.version.split.first.to_i >= 7
+    def initialize(hash = {}, logging_context = {})
+      if hash.respond_to?(:to_unsafe_h)
+        hash = hash.to_unsafe_h
+      end
+
+      super(hash, logging_context)
+    end
+  else
+    def initialize(hash = {})
+      if hash.respond_to?(:to_unsafe_h)
+        hash = hash.to_unsafe_h
+      end
+
+      super(hash)
     end
-    super(hash)
   end
 
   def permit_attr_json(klass, except:nil)

data/lib/kithe/indexable_settings.rb

@@ -6,22 +6,21 @@ module Kithe
     def initialize(solr_url:, writer_class_name:, writer_settings:,
                    model_name_solr_field:, solr_id_value_attribute:, disable_callbacks: false,
                    batching_mode_batch_size: 100)
-      @solr_url = solr_url
       @writer_class_name = writer_class_name
       @writer_settings = writer_settings
       @model_name_solr_field = model_name_solr_field
       @solr_id_value_attribute = solr_id_value_attribute || 'id'
       @batching_mode_batch_size = batching_mode_batch_size
+
+      # use our local setter to set solr_url also in writer_settings
+      solr_url = solr_url
     end
 
-    # Use configured solr_url, and merge together with configured
-    # writer_settings
-    def writer_settings
-      if solr_url
-        { "solr.url" => solr_url }.merge(@writer_settings)
-      else
-        @writer_settings
-      end
+
+    # set solr_url also in writer_settings, cause it's expected there.
+    def solr_url=(v)
+      @solr_url = v
+      writer_settings["solr.url"] = v if writer_settings
     end
 
     # Turn writer_class_name into an actual Class object.

data/lib/kithe/version.rb

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

data/lib/shrine/plugins/kithe_persisted_derivatives.rb

@@ -134,6 +134,10 @@ class Shrine
         def remove_persisted_derivatives(*paths, **options)
           return if paths.empty?
 
+          # Shrine does weird things if we pass in Strings, let's save ourselves
+          # the terrible debugging on that mistake, and noramlize to symbols
+          paths = paths.collect(&:to_sym)
+
           other_changes_allowed = !!options.delete(:allow_other_changes)
           if record && !other_changes_allowed && record.changed?
             raise TypeError.new("Can't safely add_persisted_derivatives on model with unsaved changes. Pass `allow_other_changes: true` to force.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 5.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: attr_json
   requirement: !ruby/object:Gem::Requirement
@@ -426,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Shareable tools/components for building a digital collections app in Rails.