ddr-core 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d2fd63ff8f0136a18a83652020f4526920e89c43ec0fde26147387296c4e58
-  data.tar.gz: 91f74125381a24004a6869db16c30276ac527a891db9e70bfb1bd445a3b2fc46
+  metadata.gz: 2696f109287b267f5ef5792291f3096aa9f61cdd9e08164ab64286c276c783b1
+  data.tar.gz: 17c0fcc4f2b555fc22279390afac20f48bfb6c12e48bca8ab61b58e2b1cf3f02
 SHA512:
-  metadata.gz: 3b812fed3b28c4e937c9829d0e3f88eb456328a113d26772432f4a694a74016c21a323b4ca49fad0c348e985c56c2030ff7c2dd4e209fb79dd11144c3f881b11
-  data.tar.gz: 19d773e6676b07d42c12c3cb51e19341aa0edfdeeebee92ef7ffad6aa1d5da87574b05de0680a17247bf5c9405610e3c3dac688beef38c64122d1c2a29325ce9
+  metadata.gz: e54d34b7d5175bbb53b2e9408650f7ddcdaa79967a2426d1db9b12647e228c8c63543039e2eb476e1cbd397b5cf9a4acdfc79606658e856032d13c879cfd6deb
+  data.tar.gz: e17c400895abb5cfc29a9160a9df89520714ff9a35652bcc2d54a7b6d43a986447f55ce64dc19efc94354c56c0be137a3416d0d8cad41fdae2628253e61d77ee

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

data/config/aux/contact.yml

@@ -1,87 +1,95 @@
 - slug: dvs
   name: Data and Visualization Services
   short_name: null
-  url: http://library.duke.edu/data/
-  phone: 919-660-5880
+  url: https://library.duke.edu/data/
+  phone: 919-660-5870
   email: askdata@duke.edu
   ask: null
 
 - slug: libraries
   name: Duke University Libraries
   short_name: null
-  url: http://library.duke.edu
-  phone: 919-660-5880
+  url: https://library.duke.edu
+  phone: 919-660-5870
   email: askref@duke.edu
-  ask: http://library.duke.edu/research/ask
+  ask: https://library.duke.edu/research/ask
 
 - slug: divinity
   name: Divinity School Library
   short_name: null
-  url: http://library.divinity.duke.edu/
-  phone: 919-660-3453
+  url: https://library.divinity.duke.edu/
+  phone: 919-660-3450
   email: divlib@duke.edu
-  ask: http://library.divinity.duke.edu/ask-us
+  ask: https://library.divinity.duke.edu/ask-us
 
 - slug: uarchives
   name: Duke University Archives
   short_name: University Archives
-  url: http://library.duke.edu/rubenstein/uarchives/
+  url: https://library.duke.edu/rubenstein/uarchives/
   phone: 919-660-5822
-  email: uarchives@duke.edu
-  ask: http://library.duke.edu/rubenstein/uarchives/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: humanrights
   name: Human Rights Archive
-  short_name: null
-  url: http://library.duke.edu/rubenstein/human-rights/
+  short_name: Human Rights Archive
+  url: https://library.duke.edu/rubenstein/human-rights/
   phone: 919-660-5822
-  email: special-collections@duke.edu
-  ask: http://library.duke.edu/rubenstein/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: hom
   name: History of Medicine Collections
   short_name: null
-  url: http://library.duke.edu/rubenstein/history-of-medicine/
+  url: https://library.duke.edu/rubenstein/history-of-medicine/
   phone: 919-684-8549
-  email: special-collections@duke.edu
-  ask: http://library.duke.edu/rubenstein/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: franklin
   name: John Hope Franklin Research Center
   short_name: Franklin Research Center
-  url: http://library.duke.edu/rubenstein/franklin/
+  url: https://library.duke.edu/rubenstein/franklin/
   phone: 919-660-5922
-  email: franklin-collection@duke.edu
-  ask: http://library.duke.edu/rubenstein/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: docarts
   name: Archive of Documentary Arts
   short_name: null
-  url: http://library.duke.edu/rubenstein/documentaryarts/
+  url: https://library.duke.edu/rubenstein/documentaryarts/
   phone: 919-660-5822
-  email: special-collections@duke.edu
-  ask: http://library.duke.edu/rubenstein/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: bingham
   name: Sallie Bingham Center for Women's History & Culture
   short_name: Bingham Center
-  url: http://library.duke.edu/rubenstein/bingham/
+  url: https://library.duke.edu/rubenstein/bingham/
   phone: 919-660-5967
-  email: cwhc@duke.edu
-  ask: http://library.duke.edu/rubenstein/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: hartman
   name: John W. Hartman Center for Sales, Advertising & Marketing History
   short_name: Hartman Center
-  url: http://library.duke.edu/rubenstein/hartman/
+  url: https://library.duke.edu/rubenstein/hartman/
   phone: 919-660-5827
-  email: hartman-center@duke.edu
-  ask: http://library.duke.edu/rubenstein/hartman/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
 
 - slug: rubenstein
   name: David M. Rubenstein Rare Book & Manuscript Library
   short_name: Rubenstein Library
-  url: http://library.duke.edu/rubenstein/
+  url: https://library.duke.edu/rubenstein/
+  phone: 919-660-5822
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask
+
+- slug: economists
+  name: Economists' Papers Archive
+  short_name: null
+  url: https://library.duke.edu/rubenstein/economists
   phone: 919-660-5822
-  email: special-collections@duke.edu
-  ask: http://library.duke.edu/rubenstein/ask
+  email: askrl@duke.edu
+  ask: https://library.duke.edu/rubenstein/ask

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.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-10-03 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