ddr-core 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd302a231a2cb10cfb34d72a9d68cd7c52b1a19e7b61eaf237498921b00578ff
-  data.tar.gz: 3bad65714fa43167182dcf88250f227518d22f376d0ccd822be2fe1048765283
+  metadata.gz: 92867a8dbfa97c6c96918832f4a7b031b1d2a43003d494522354d9a035601e17
+  data.tar.gz: 0fef07ae4d93da41514678af0c5efb77dd39ecd760a1a5497826c2d1fb481cd7
 SHA512:
-  metadata.gz: f0f763d15a06561cd30a93571235c12e280e970fc9ac1fd1d85bf518827aa19baeabe75b75d7dfcc61cad7086cc4ec3cec1d191f0acceab2cd1b4dd2af9efdca
-  data.tar.gz: af7f6b1bbbd2de0b6fa0f40b6bafdb7c3e6720bde6512ae980ca05b3b3bcaae022f4ca314fd98c96ad98a01f7d244924d1027f2446f04fcc273ed08ac5f8ea3b
+  metadata.gz: 90302d9df8273869777b165edcadb4f077706b3389c7b8eebc8ac49d8f92b6fd85932743f1729539ccbd8b97d09d12c4742349f9486c2aafee71d83272022ad9
+  data.tar.gz: 5d668698ea1f841a9f37db6a868ad340e27bc2d1589596abd5e871e4e5a84abc961b3c1665520e46d5a81d40f3270b8e24743a47bbe69d7f657755bd36fdbbdb

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/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.5.5
 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-05-20 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