ddr-core 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d2fd63ff8f0136a18a83652020f4526920e89c43ec0fde26147387296c4e58
-  data.tar.gz: 91f74125381a24004a6869db16c30276ac527a891db9e70bfb1bd445a3b2fc46
+  metadata.gz: 2cf41723ee6c99b09acb09d17308f10f881d5e89c564fab81901fda438565606
+  data.tar.gz: 81c26a26394b4b6d1dc6a8dbf686d0a3ffbba7aa974bffd9b2c2ad7ba4dd0028
 SHA512:
-  metadata.gz: 3b812fed3b28c4e937c9829d0e3f88eb456328a113d26772432f4a694a74016c21a323b4ca49fad0c348e985c56c2030ff7c2dd4e209fb79dd11144c3f881b11
-  data.tar.gz: 19d773e6676b07d42c12c3cb51e19341aa0edfdeeebee92ef7ffad6aa1d5da87574b05de0680a17247bf5c9405610e3c3dac688beef38c64122d1c2a29325ce9
+  metadata.gz: fba1af2dbbf5b2f4039f819acfeb7f00b88ec7f8fafc3df6097ff08b27a6f97c921055338cacacb332820ab11260e1a32a0557711d8d01d047e4f30761fa5475
+  data.tar.gz: a69fba46869f6e99e228f032f436af6e926d14e29d1a80e3b6ac8b88d429869f6c591b6987bda3e230cae26cd4df8fee345fec0119573b81f1895aa4d1ef6ec1

data/app/models/concerns/ddr/solr_document_behavior.rb

@@ -202,29 +202,6 @@ module Ddr
       resource.finding_aid
     end
 
-    def intermediate_type
-      if has_intermediate_file?
-        resource.intermediate_type
-      end
-    end
-
-    def intermediate_path
-      if has_intermediate_file?
-        resource.intermediate_path
-      end
-    end
-
-    def intermediate_extension
-      if has_intermediate_file?
-        extensions = Ddr.preferred_file_extensions
-        if extensions.include? intermediate_type
-          extensions[intermediate_type]
-        else
-          intermediate_extension_default
-        end
-      end
-    end
-
     def captionable?
       resource.captionable?
     end
@@ -345,10 +322,6 @@ module Ddr
       structure['default'] || structure.values.first
     end
 
-    def intermediate_extension_default
-      resource.intermediate_file.default_file_extension
-    end
-
     def caption_extension_default
       resource.caption.default_file_extension
     end

data/app/models/ddr/component.rb

@@ -6,7 +6,6 @@ module Ddr
     include HasContent
     include HasDerivedImage
     include HasExtractedText
-    include HasIntermediateFile
     include HasMultiresImage
     include HasParent
     include Streamable
@@ -14,6 +13,7 @@ module Ddr
     alias_method :item_id, :parent_id
     alias_method :item, :parent
 
+    attribute :intermediate_file, Ddr::File.optional
     attribute :target_id, Valkyrie::Types::ID.optional
 
     self.parent_class = Ddr::Item

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -315,7 +315,6 @@ files:
 - app/models/concerns/ddr/has_content.rb
 - app/models/concerns/ddr/has_derived_image.rb
 - app/models/concerns/ddr/has_extracted_text.rb
-- app/models/concerns/ddr/has_intermediate_file.rb
 - app/models/concerns/ddr/has_multires_image.rb
 - app/models/concerns/ddr/has_parent.rb
 - app/models/concerns/ddr/has_struct_metadata.rb
@@ -451,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository

data/app/models/concerns/ddr/has_intermediate_file.rb

@@ -1,25 +0,0 @@
-module Ddr
-  module HasIntermediateFile
-    extend ActiveSupport::Concern
-
-    included do
-      attribute :intermediate_file, Ddr::File.optional
-    end
-
-    def intermediate_type
-      intermediate_file&.media_type
-    end
-
-    # This method is used in dul-hydra 'ComponentsController'
-    def intermediate_extension
-      if filename = intermediate_file&.original_filename
-        ::File.extname(filename)
-      end
-    end
-
-    def intermediate_path
-      intermediate_file&.file&.disk_path
-    end
-
-  end
-end