kithe 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe55cd9eb6b6f323f8a64418420a91a3d3cc99baa677a006e72608d3e05ccaf
-  data.tar.gz: 167d25b42b8a490d4c8bd3e7fbdf8756560b9bcbdc9c684bc17db854dce3897a
+  metadata.gz: e9a96dd80fc482ea07bd35456a0cf8445b722354cd6fe1fda10460398a0d7846
+  data.tar.gz: 0ccb6788a1ac0f88a47202767f1a5acb7dc12031cc4293ec27e09ded198b8daf
 SHA512:
-  metadata.gz: f1cb5e7242f6fffcda9b0be4894f24251470b919204faf355f694f245863acd9a9c5e1ce9f67abd3c3cfb9b3ba01a8b7235d45ce8a9b22349ee8d03d1e7dbe67
-  data.tar.gz: fe8af824a5dc4f5af3719d12a109eff834cd260f647d668eba452c8aa88bbe61ac7b33c81206cbd1ec95169e260c312934843f820ee556a5c0452fc767bdb42a
+  metadata.gz: 46bcc8b60dd795e4f6e063aef6c7702184d853f2266f3fb5db4636074379faf3a45a1baae83e0d0358cea6fa8c8620a43727d9ee90cffb511c28e371072fe8ad
+  data.tar.gz: d4250716ef0b4c32c2b993a1989290a59afdb56be2159a8f814bd3b62bfe5e853845188b3200bc1c9be2f8c8f5bad950276e1286324d9f28d890e50c2ccf7a86

data/README.md

@@ -35,6 +35,8 @@ Some guide documentation is available to explain each of kithe's major functiona
   * Kithe objects use UUIDv4's as internal primary keys, but also provide a "friendlier_id" with a shorter unique alphanumeric identifier for URLs and other UI. By default they are supplied by a postgres stored procedure, but your code can set them to whatever you like.
 
 * [Form support](./guides/forms.md): Dealing with complex and _repeatable_ data, as our modelling layer allows, can be tricky in an HTML form. We supply javascript-backed Rails form input help for repeatable and compound/nested data.
+  * An extension to Rails "strong parameters" that make some common patterns for
+    embedded JSON attributes more convenient, [Kithe::Parameters](./app/models/kithe/parameters.rb).
 
 * [File handling](./guides/file_handling.md): Handling files is at the core of digital repository use cases. We need a file handling framework that is flexible, predictable and reliable, and architected for performance. We try to give you one based on the [shrine](https://shrinerb.com) file attachment toolkit for ruby.
 

data/app/indexing/kithe/indexer/obj_extract.rb

@@ -48,7 +48,8 @@ module Kithe
         first, *rest = *path
 
         result = if obj.kind_of?(Array)
-          obj.flat_map { |item| obj_extractor(item, path) }
+          first_path_element = path.shift # remove it from path
+          obj.flat_map { |item| obj_extractor(item, [first_path_element]) }
         elsif obj.kind_of?(Hash)
           obj[first]
         else

data/app/models/kithe/validators/model_parent.rb

@@ -1,11 +1,11 @@
 class Kithe::Validators::ModelParent < ActiveModel::Validator
   def validate(record)
     if record.parent.present? && (record.parent.class <= Kithe::Asset)
-      record.errors[:parent] << 'can not be an Asset instance'
+      record.errors.add(:parent, 'can not be an Asset instance')
     end
 
     if record.parent.present? && record.class <= Kithe::Collection
-      record.errors[:parent] << 'is invalid for Collection instances'
+      record.errors.add(:parent, 'is invalid for Collection instances')
     end
 
     # TODO avoid recursive parents, maybe using a postgres CTE for efficiency?

data/lib/kithe/engine.rb

@@ -9,7 +9,6 @@ require 'shrine'
 # https://github.com/teoljungberg/fx/issues/33
 # https://github.com/teoljungberg/fx/pull/53
 require 'fx'
-require 'kithe/patch_fx'
 
 # not auto-loaded, let's just load it for backwards compat though
 require "kithe/config_base"
@@ -22,5 +21,13 @@ module Kithe
       g.assets false
       g.helper false
     end
+
+    # the fx gem lets us include stored procedures in schema.rb. For it to work
+    # in kithe's case, the stored procedures have to be *first* in schema.rb,
+    # so they can then be referenced as default value for columns in tables
+    # subsequently created. We configure that here, forcing it for any app, yes, sorry.
+    Fx.configure do |config|
+      config.dump_functions_at_beginning_of_schema = true
+    end
   end
 end

data/lib/kithe/version.rb

@@ -2,5 +2,5 @@ module Kithe
   # not sure why rubygems turned our alphas into 2.0.0.pre.alpha1, inserting
   # "pre". We need to do same thing with betas to get version orderings
   # appropriate.
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

data/lib/shrine/plugins/kithe_determine_mime_type.rb

@@ -19,6 +19,12 @@ class Shrine
     # Ensure that if mime-type can't be otherwise determined, it is assigned
     # "application/octet-stream", basically the type for generic binary.
     class KitheDetermineMimeType
+      # marcel version 1.0 says audio/x-flac, whereas previous versions
+      # said audio/flac, which we prefer. Let's fix it.
+      RPELACE_CONTENT_TYPES = {
+        "audio/x-flac" => "audio/flac"
+      }
+
       def self.load_dependencies(uploader, *)
         uploader.plugin :determine_mime_type, analyzer: -> (io, analyzers) do
           mime_type = analyzers[:marcel].call(io)
@@ -30,6 +36,9 @@ class Shrine
 
           mime_type = "application/octet-stream" if mime_type.blank?
 
+          # Are there any we prefer an alternate spelling of?
+          mime_type = RPELACE_CONTENT_TYPES.fetch(mime_type, mime_type)
+
           mime_type
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -188,7 +188,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -198,7 +198,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -376,7 +376,6 @@ files:
 - lib/kithe/config_base.rb
 - lib/kithe/engine.rb
 - lib/kithe/indexable_settings.rb
-- lib/kithe/patch_fx.rb
 - lib/kithe/sti_preload.rb
 - lib/kithe/version.rb
 - lib/shrine/plugins/kithe_accept_remote_url.rb

data/lib/kithe/patch_fx.rb

@@ -1,39 +0,0 @@
-# fx is a gem that lets Rails schema.rb capture postgres functions and triggers
-#
-# For it to work for our use case, we need it to define functions BEFORE tables when
-# doing a `rake db:schema:load`, so we can refer to functions as default values in our
-# tables.
-#
-# This is a known issue in fx, with a PR, but isn't yet merged/released, so we hack
-# in a patch to force it. Better than forking.
-#
-# Based on: https://github.com/teoljungberg/fx/pull/53/
-#
-# We try to write future-compat code assuming that will be merged eventually....
-
-require 'fx'
-
-if Fx.configuration.respond_to?(:dump_functions_at_beginning_of_schema)
-  # we have the feature!
-
-  Fx.configure do |config|
-    config.dump_functions_at_beginning_of_schema = true
-  end
-
-else
-  # Fx does not have the feature, we have to patch it in
-
-  require 'fx/schema_dumper/function'
-
-  module Fx
-    module SchemaDumper
-      module Function
-        def tables(stream)
-          functions(stream)
-          super
-        end
-      end
-    end
-  end
-
-end