ddr-core 1.5.4 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd302a231a2cb10cfb34d72a9d68cd7c52b1a19e7b61eaf237498921b00578ff
-  data.tar.gz: 3bad65714fa43167182dcf88250f227518d22f376d0ccd822be2fe1048765283
+  metadata.gz: 7c2ee6a1a1de8fd86904bc1f067378379972862830e591ad2588c77057666608
+  data.tar.gz: 999d2c0e8710e45fe854bd7b75718dd36f1e2ee01181ffe4af2c34121f49ca70
 SHA512:
-  metadata.gz: f0f763d15a06561cd30a93571235c12e280e970fc9ac1fd1d85bf518827aa19baeabe75b75d7dfcc61cad7086cc4ec3cec1d191f0acceab2cd1b4dd2af9efdca
-  data.tar.gz: af7f6b1bbbd2de0b6fa0f40b6bafdb7c3e6720bde6512ae980ca05b3b3bcaae022f4ca314fd98c96ad98a01f7d244924d1027f2446f04fcc273ed08ac5f8ea3b
+  metadata.gz: 4b2a4518977f7a36e6b9959b0f1b5e891f975edf97f8c474bc4f10bfb80646fb8da294bd8c5e03a19a113c31d4ec27ce2423455734b40ecdd0bfb56b3e6ae147
+  data.tar.gz: bed7b8d7fcb879d9763bfbe6b0989c8c0e5b39eea4b0e12120dfa995d731a915b932c95c79b46555db1c3a0daac08a5dbfc65098af2d359b06f4eb711f09860e

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/concerns/ddr/solr_document_behavior.rb

@@ -5,41 +5,34 @@ module Ddr
   module SolrDocumentBehavior
     extend ActiveSupport::Concern
 
-    class NotFound < Error; end
-
     included do
-      delegate :query_service,
-               :resource_factory,
-               to: :metadata_adapter
+      alias_method :pid, :id
     end
 
+    class NotFound < Error; end
+
     module ClassMethods
       def find(id)
-        raise ArgumentError, "ID argument must be present." if id.blank?
-
-        response = Blacklight.default_index.find(id)
-        response.documents.first
-
-      rescue Blacklight::Exceptions::RecordNotFound => e
-        raise NotFound, e
+        query = Ddr::Index::Query.new { id id }
+        if doc = query.docs.first
+          return doc
+        end
+        raise NotFound, "SolrDocument not found for \"#{id}\"."
       end
 
       def find_by_permanent_id(ark)
-        raise ArgumentError, "ARK argument must be present." if ark.blank?
-
-        response = Blacklight.default_index.search(q: "#{Ddr::Index::Fields::PERMANENT_ID}:\"#{ark}\"", rows: 1)
-
-        if doc = response.documents.first
-          doc
-        else
-          raise NotFound, "Permanent ID: #{ark}"
+        if ark.blank?
+          raise ArgumentError, "ARK argument must be present."
+        end
+        query = Ddr::Index::Query.new do
+          q *:*
+          where permanent_id: ark
+        end
+        if doc = query.docs.first
+          return doc
         end
+        raise NotFound, "SolrDocument not found for permanent id \"#{ark}\"."
       end
-    end # ClassMethods
-
-    def pid
-      warn "DEPRECATION: #pid is deprecated. Use #id instead."
-      id
     end
 
     def inspect
@@ -63,12 +56,8 @@ module Ddr
       super
     end
 
-    def metadata_adapter
-      Valkyrie::MetadataAdapter.find(:index_solr)
-    end
-
     def resource
-      @resource ||= resource_factory.to_resource(object: self)
+      @resource ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service.find_by(id: id)
     end
 
     def object_create_date
@@ -145,7 +134,7 @@ module Ddr
     end
 
     def targets_count
-      @targets_count ||= targets.count
+      @targets_count = targets.count
     end
 
     def has_target?
@@ -161,7 +150,7 @@ module Ddr
     end
 
     def roles
-      resource.roles
+      @roles ||= resource.roles
     end
 
     def resource_roles
@@ -187,14 +176,9 @@ module Ddr
       Ddr::Contact.call(research_help_contact) if research_help_contact
     end
 
-    #
-    # Fall back to PARENT_ID field, which supersedes IS_PART_OF and _IS_MEMBER_OF_COLLECTION
-    # for this usage.
-    # Cf. https://duldev.atlassian.net/browse/DDR-2296
-    #
-    # def parent_id
-    #   is_part_of || is_member_of_collection
-    # end
+    def parent_id
+      is_part_of || is_member_of_collection
+    end
 
     def has_parent?
       parent_id.present?
@@ -323,6 +307,10 @@ module Ddr
 
     private
 
+    def query_service
+      @query_service ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service
+    end
+
     def get_date(field)
       parse_date(self[field])
     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/index/fields.rb

@@ -37,8 +37,8 @@ module Ddr::Index
     DATE_SORT                     = Field.new :date_sort, :sortable
     DC_IS_PART_OF                 = Field.new :isPartOf, :symbol
     DEPOSITOR                     = Field.new :depositor, :stored_sortable
-    # DDR-1997 - description should always be indexed as _tesim regardless of length.
-    # Valkyrie indexes fields > 1000 characters in length as _tsim only.
+    # DDR-1997 - description should always be indexed as _tesim regardless of length - Valkyrie indexes fields > 1000
+    # characters in length as _tsim only
     DESCRIPTION                   = Field.new :description, :stored_searchable # stored_searchable produces _tesim
     DISPLAY_FORMAT                = Field.new :display_format, :stored_sortable
     DOI                           = Field.new :doi, :symbol

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.3
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 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'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        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,35 +126,35 @@ 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:
     - - ">="
@@ -168,47 +168,47 @@ dependencies:
       - !ruby/object:Gem::Version
         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