ddr-core 1.3.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61fa03b921f6c0f3b15a68938f568c4547f324facd5f57bf753ca5b28ae756e2
-  data.tar.gz: e74b196e266a1d4a21c24c90490374d2f7054fb52921623adba198bbc9948eca
+  metadata.gz: bd64dda80015a23322764578176c17ed01d87d1ccaa11c9bf6962d99e02abe66
+  data.tar.gz: 97055be97a593c3718a66372079fd3eaafa8a2465a5f76bbb6a62f7b0661b42f
 SHA512:
-  metadata.gz: 95ab554ea0873c8b6f8db7ae981f0d6336d180731f91bfd57d19f8806682142fdc47bce3fb09a8aae485bd41e7e9389e0c4cf16fdfa992406032335350085041
-  data.tar.gz: 5239037ba065ed2034951311c260d988b19cbd45f3d2c2f6f10e78e9cd311e866e9fc7ca49619fca3de2ec791dea19942b41b4b22863383b9442456ade3ff0ac
+  metadata.gz: 4b1e406145e1a15129c75f0ea8430fa7d470d1d292417c163846ebc1746327ce213c7b1779d6b78d420b355c13bd93d8fa21949f00df22158a0639ad39618f4a
+  data.tar.gz: 8da1e652bf2279f787fa58fd02294c2b66648ca9f5864bf4d05ff284a7f70ed821278868e630858d52d4a9fae9e71164f54b1bfa87f22c4cf4a5da8e6589529c

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

@@ -5,34 +5,41 @@ module Ddr
   module SolrDocumentBehavior
     extend ActiveSupport::Concern
 
+    class NotFound < Error; end
+
     included do
-      alias_method :pid, :id
+      delegate :query_service,
+               :resource_factory,
+               to: :metadata_adapter
     end
 
-    class NotFound < Error; end
-
     module ClassMethods
       def find(id)
-        query = Ddr::Index::Query.new { id id }
-        if doc = query.docs.first
-          return doc
-        end
-        raise NotFound, "SolrDocument not found for \"#{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
       end
 
       def find_by_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
+        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}"
         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
@@ -56,8 +63,12 @@ module Ddr
       super
     end
 
+    def metadata_adapter
+      Valkyrie::MetadataAdapter.find(:index_solr)
+    end
+
     def resource
-      @resource ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service.find_by(id: id)
+      @resource ||= resource_factory.to_resource(object: self)
     end
 
     def object_create_date
@@ -134,7 +145,7 @@ module Ddr
     end
 
     def targets_count
-      @targets_count = targets.count
+      @targets_count ||= targets.count
     end
 
     def has_target?
@@ -150,7 +161,7 @@ module Ddr
     end
 
     def roles
-      @roles ||= resource.roles
+      resource.roles
     end
 
     def resource_roles
@@ -176,9 +187,14 @@ module Ddr
       Ddr::Contact.call(research_help_contact) if research_help_contact
     end
 
-    def parent_id
-      is_part_of || is_member_of_collection
-    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 has_parent?
       parent_id.present?
@@ -307,10 +323,6 @@ 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/connection.rb

@@ -13,8 +13,6 @@ module Ddr::Index
       delegate [:get, :post, :paginate] => :solr
 
       def solr
-        # Changed for Valkyrie
-        # RSolr.connect(ActiveFedora.solr_config)
         Blacklight.default_index.connection
       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

data/lib/ddr/index/query_result.rb

@@ -92,9 +92,10 @@ module Ddr::Index
     end
 
     def page(num)
-      page_params = params.dup
-      page_size = page_params.delete(:rows) || PAGE_SIZE
-      response = Connection.page(num, page_size, "select", params: page_params)
+      data = params.dup
+      page_size = data.delete(:rows) || PAGE_SIZE
+      opts = { method: :post, data: data }
+      response = Connection.page(num, page_size, 'select', opts)
       response.docs
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-05-17 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.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !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: '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
   requirement: !ruby/object:Gem::Requirement
@@ -295,7 +295,6 @@ dependencies:
         version: '0'
 description: Models used in the Duke Digital Repository
 email:
-- lib-drs@duke.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -388,7 +387,6 @@ files:
 - lib/ddr/auth/web_auth_context.rb
 - lib/ddr/core.rb
 - lib/ddr/core/engine.rb
-- lib/ddr/core/version.rb
 - lib/ddr/error.rb
 - lib/ddr/files.rb
 - lib/ddr/fits.rb
@@ -456,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Models used in the Duke Digital Repository

data/lib/ddr/core/version.rb

@@ -1,5 +0,0 @@
-module Ddr
-  module Core
-    VERSION = '1.3.0'
-  end
-end