ddr-core 1.5.5 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92867a8dbfa97c6c96918832f4a7b031b1d2a43003d494522354d9a035601e17
-  data.tar.gz: 0fef07ae4d93da41514678af0c5efb77dd39ecd760a1a5497826c2d1fb481cd7
+  metadata.gz: 7fda53111cfb7cebbe51424a6d5f8ba1064c7e8ac09f9346f4a1fe809f87208d
+  data.tar.gz: '0832501621a8238e217fc3d51c5bc0a4509bdebc4e83d65b3cc25cbc970e5cc7'
 SHA512:
-  metadata.gz: 90302d9df8273869777b165edcadb4f077706b3389c7b8eebc8ac49d8f92b6fd85932743f1729539ccbd8b97d09d12c4742349f9486c2aafee71d83272022ad9
-  data.tar.gz: 5d668698ea1f841a9f37db6a868ad340e27bc2d1589596abd5e871e4e5a84abc961b3c1665520e46d5a81d40f3270b8e24743a47bbe69d7f657755bd36fdbbdb
+  metadata.gz: 7af4e67c7c9cdaab03b2009f49703b6720848d262405e708dc587f40fbd8e4492189b03f3da724bed84cf7dbbcc44a1f15cdf1db8b200c08f085aef2ddd8df91
+  data.tar.gz: 87882efe5994948c4945045b3eacf760edd3d2ca19d3f5b2cf13398ed35f325bc04dfe33cd658f781a9cb4b1a8e3e6a3aba78bbe8faa7e1617e1cbbe4319dcfc

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

@@ -0,0 +1,14 @@
+module Ddr
+  module HasDerivedImage
+    extend ActiveSupport::Concern
+
+    included do
+      attribute :derived_image, Ddr::File.optional
+    end
+
+    def derived_image_file_path
+      derived_image&.file&.disk_path
+    end
+
+  end
+end

data/app/models/ddr/component.rb

@@ -4,6 +4,7 @@ module Ddr
     include Captionable
     include Embargoable
     include HasContent
+    include HasDerivedImage
     include HasExtractedText
     include HasIntermediateFile
     include HasMultiresImage

data/app/models/ddr/file.rb

@@ -31,7 +31,7 @@ module Ddr
     # Return default file extension for file based on MIME type
     def default_file_extension
       mimetypes = MIME::Types[media_type]
-      return mimetypes.first.extensions.first unless mimetypes.empty?
+      return mimetypes.first.preferred_extension unless mimetypes.empty?
       case media_type
       when 'application/n-triples'
         'txt'

data/app/models/ddr/resource.rb

@@ -10,6 +10,7 @@ module Ddr
 
     FILE_FIELDS = %i( caption
                       content
+                      derived_image
                       extracted_text
                       fits_file
                       intermediate_file

data/lib/ddr/core.rb

@@ -71,7 +71,7 @@ module Ddr
         'audio/ogg'       => 'ogg',
         'audio/wav'       => 'wav',
         'text/vtt'        => 'vtt',
-        'video/flv'       => 'flv',
+        'video/x-flv'     => 'flv',
         'video/mp4'       => 'mp4',
         'video/quicktime' => 'mov',
         'video/webm'      => 'webm'
@@ -83,7 +83,7 @@ module Ddr
     {
         '.aac'  => 'audio/mp4',
         '.f4a'  => 'audio/mp4',
-        '.flv'  => 'video/flv',
+        '.flv'  => 'video/x-flv',
         '.m2t'  => 'video/vnd.dlna.mpeg-tts',
         '.m2ts' => 'video/m2ts',
         '.m4a'  => 'audio/mp4',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.4
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -42,35 +42,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.20'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '4.6'
 - !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
+  name: grouper-rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,35 +84,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: valkyrie
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: grouper-rest-client
+  name: omniauth-shibboleth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,89 +126,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 5.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-shibboleth
+  name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: solrizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rsolr
+  name: valkyrie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: solrizer
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -252,7 +252,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -266,7 +266,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -280,7 +280,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -313,6 +313,7 @@ files:
 - app/models/concerns/ddr/has_attachments.rb
 - app/models/concerns/ddr/has_children.rb
 - 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
@@ -454,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository