ddr-core 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd64dda80015a23322764578176c17ed01d87d1ccaa11c9bf6962d99e02abe66
-  data.tar.gz: 97055be97a593c3718a66372079fd3eaafa8a2465a5f76bbb6a62f7b0661b42f
+  metadata.gz: 1364ab93e3c082c34f2659457da88cb2d9fadc8022b8f6f20624a93204f5eb33
+  data.tar.gz: 914a4b226a010e472ccbd1fb0094e1f79e5820c81c767d973a01ed1aed6c7117
 SHA512:
-  metadata.gz: 4b1e406145e1a15129c75f0ea8430fa7d470d1d292417c163846ebc1746327ce213c7b1779d6b78d420b355c13bd93d8fa21949f00df22158a0639ad39618f4a
-  data.tar.gz: 8da1e652bf2279f787fa58fd02294c2b66648ca9f5864bf4d05ff284a7f70ed821278868e630858d52d4a9fae9e71164f54b1bfa87f22c4cf4a5da8e6589529c
+  metadata.gz: e5d381cbd5e5f7849105c6b3298f93ca67836deb6e8d81ea8c2166032baeb298cc5ffa5619c41483ac4c4b0b2e08a87514e9c40c4029b6be120bb7931894f267
+  data.tar.gz: 98c97a9de5bc87e28a464a4647af8f83f7b2cc27e2aef082a0cf079205110cc3e5de3aa478fea50d7b52841d00e91e825d01addd2241b8439bd7c3a43949a662

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/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,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Jim Coble
 - David Chandek-Stark
 - Ayse Durmaz
 - Hugh Cayless
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: grouper-rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -157,16 +157,16 @@ dependencies:
   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: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -294,7 +294,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Models used in the Duke Digital Repository
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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
@@ -439,7 +440,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -454,8 +455,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.2.18
+signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository
 test_files: []