dor-services 9.3.0 → 9.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5015214a6f687ad0a64a9ea35914ac2984cf7efbd16cf7e60baea93f306d4d2f
-  data.tar.gz: 279ee95befcb33f476fde1d5f159c8a45b4b6d3333ef367a444bc6a076900401
+  metadata.gz: 27607925382cdafb02fb70e21d9d9afa3d696b3a01548aec3131f8089dea5914
+  data.tar.gz: 2bdf4105480c43e1e5bcbc2f0d8e0f4b46eeac4e0a3687daf5956844912ea527
 SHA512:
-  metadata.gz: 466bea3e00aad80400d0e7be95c28275a1396be4ba139fed6f1b41f6d7f19edd1976dbc7f091ff1ecfd101276d491ebb48a9b91069889a845abed9a438094eaa
-  data.tar.gz: f34079d71a227261b7d9d587b9501ff4fc537adada8a69c0b520bd002f0fde2737e0e632b376b2f191bb527d875887bbda0536ca0b6f95b9835273f1e2f6df08
+  metadata.gz: ecd3ee6afc0c6fcd00f3fbc2f1167bf3fda5fe5bf47ba35b58879bffba1e2bb286d3f9f07cdf959bbe783edd1ea4bfb9dfcbc0512a8c8e6f0d836f4b31e277f4
+  data.tar.gz: 57b365dcfe5b765f6b4ebf6d051f4611af39e58172e8d44bac90512d4526ccdad463c9bca0f6487242e4c6cbbc89b9c5ead2d5e87b41ad0a0c78fa7c12c964d8

data/lib/dor-services.rb

@@ -29,7 +29,7 @@ module Dor
       @logger ||= if defined?(::Rails) && ::Rails.respond_to?(:logger)
                     Rails.logger
                   else
-                    Logger.new(STDOUT)
+                    Logger.new($stdout)
                   end
     end
   end

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -6,7 +6,7 @@ module Dor
   class ContentMetadataDS < ActiveFedora::OmDatastream
     set_terminology do |t|
       t.root        path: 'contentMetadata',          index_as: [:not_searchable]
-      t.contentType path: '/contentMetadata/@type',   index_as: [:not_searchable]
+      t.contentType path: { attribute: 'type' },      index_as: [:not_searchable]
       t.stacks      path: '/contentMetadata/@stacks', index_as: [:not_searchable]
       t.resource(index_as: [:not_searchable]) do
         t.id_       path: { attribute: 'id' }
@@ -35,6 +35,10 @@ module Dor
       t.shelved_file_id proxy: %i[resource shelved_file id], index_as: %i[displayable stored_searchable]
     end
 
+    def self.xml_template
+      Nokogiri::XML.parse('<contentMetadata/>')
+    end
+
     ### READ ONLY METHODS
 
     # Only use this when you want the behavior of raising an exception if anything besides exactly one matching node

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -8,6 +8,7 @@ module Dor
     # ids for previous and current catkeys
     CATKEY_TYPE_ID = 'catkey'
     PREVIOUS_CATKEY_TYPE_ID = 'previous_catkey'
+    BARCODE_TYPE_ID = 'barcode'
 
     set_terminology do |t|
       t.root(path: 'identityMetadata')
@@ -144,6 +145,25 @@ module Dor
       otherId(PREVIOUS_CATKEY_TYPE_ID)
     end
 
+    def barcode
+      otherId(BARCODE_TYPE_ID).first
+    end
+
+    # Convenience method to set the barcode
+    # @param  [String] val the new barcode
+    # @return [String] same value, as per Ruby assignment convention
+    def barcode=(val)
+      if val.blank? # if we are setting the barcode to blank, remove the node from XML
+        remove_other_Id(BARCODE_TYPE_ID)
+      elsif barcode.blank? # if there is no current barcode, then add it
+        add_other_Id(BARCODE_TYPE_ID, val)
+      else # if there is a current barcode, update the current barcode to the new value
+        update_other_Id(BARCODE_TYPE_ID, val)
+      end
+
+      val
+    end
+
     # Helper method to get the release tags as a nodeset
     # @return [Nokogiri::XML::NodeSet] all release tags and their attributes
     def release_tags
@@ -160,37 +180,6 @@ module Dor
       return_hash
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-
-      if digital_object.respond_to?(:profile)
-        digital_object.profile.each_pair do |property, value|
-          add_solr_value(solr_doc, property.underscore, value, (property =~ /Date/ ? :date : :symbol), [:stored_searchable])
-        end
-      end
-
-      if sourceId.present?
-        (name, id) = sourceId.split(/:/, 2)
-        add_solr_value(solr_doc, 'dor_id', id, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'identifier', sourceId, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'source_id', sourceId, :symbol, [])
-      end
-      otherId.compact.each do |qid|
-        # this section will solrize barcode and catkey, which live in otherId
-        (name, id) = qid.split(/:/, 2)
-        add_solr_value(solr_doc, 'dor_id', id, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'identifier', qid, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, "#{name}_id", id, :symbol, [])
-      end
-
-      solr_doc
-    end
-
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
-
     private
 
     # Convert one release element into a Hash

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -12,12 +12,17 @@ module Dor
 
     set_terminology do |t|
       t.root path: 'rightsMetadata', index_as: [:not_searchable]
-      t.copyright path: 'copyright/human', index_as: [:symbol]
-      t.use_statement path: '/use/human[@type=\'useAndReproduction\']', index_as: [:symbol]
+      t.copyright proxy: %i[_copyright human], index_as: [:symbol]
+      t.use_statement proxy: %i[use use_and_reproduction], index_as: [:symbol]
 
       t.use do
         t.machine
         t.human
+        t.use_and_reproduction path: 'human', attributes: { type: 'useAndReproduction' }
+      end
+
+      t._copyright path: 'copyright' do
+        t.human
       end
 
       t._read(path: 'access', attributes: { type: 'read' }) do
@@ -64,6 +69,7 @@ module Dor
       'world-nd' => 'World (no-download)',
       'stanford' => 'Stanford',
       'stanford-nd' => 'Stanford (no-download)',
+      'cdl-stanford-nd' => 'Controlled Digital Lending (no-download)',
       'loc:spec' => 'Location: Special Collections',
       'loc:music' => 'Location: Music Library',
       'loc:ars' => 'Location: Archive of Recorded Sound',
@@ -98,12 +104,14 @@ module Dor
     # @param rights_xml [ng_xml] a nokogiri xml (ruby) object that represents the rights xml for a DOR object
     # @param rights_type [string] a recognized rights type code ('world', 'dark', 'loc:spec', etc)
     def self.upd_rights_xml_for_rights_type(rights_xml, rights_type)
+      # Note: The discover node is either 'none' for a dark object or 'world' for any other rights option
       label = rights_type == 'dark' ? 'none' : 'world'
       rights_xml.search('//rightsMetadata/access[@type=\'discover\']/machine').each do |node|
         node.children.remove
         node.add_child Nokogiri::XML::Node.new(label, rights_xml)
       end
 
+      # The read node varies by rights option
       rights_xml.search('//rightsMetadata/access[@type=\'read\']').each do |node|
         node.children.remove
         machine_node = Nokogiri::XML::Node.new('machine', rights_xml)
@@ -121,6 +129,13 @@ module Dor
           loc_node = Nokogiri::XML::Node.new('location', rights_xml)
           loc_node.content = rights_type.split(':').last
           machine_node.add_child(loc_node)
+        elsif rights_type.start_with?('cdl')
+          cdl_node = Nokogiri::XML::Node.new('cdl', rights_xml)
+          group_node = Nokogiri::XML::Node.new('group', cdl_node)
+          group_node.content = 'stanford'
+          group_node.set_attribute('rule', 'no-download')
+          cdl_node.add_child(group_node)
+          machine_node.add_child(cdl_node)
         else # we know it is none or dark by the argument filter (first line)
           machine_node.add_child Nokogiri::XML::Node.new('none', rights_xml)
         end
@@ -144,73 +159,6 @@ module Dor
       @dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-      dra = dra_object
-      solr_doc['rights_primary_ssi'] = dra.index_elements[:primary]
-      solr_doc['rights_errors_ssim'] = dra.index_elements[:errors] if dra.index_elements[:errors].size > 0
-      solr_doc['rights_characteristics_ssim'] = dra.index_elements[:terms] if dra.index_elements[:terms].size > 0
-
-      solr_doc['rights_descriptions_ssim'] = [
-        dra.index_elements[:primary],
-
-        (dra.index_elements[:obj_locations_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "location: #{rights_info[:location]}#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_locations_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "location: #{rights_info[:location]} (file)#{rule_suffix}"
-        end,
-
-        (dra.index_elements[:obj_agents_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "agent: #{rights_info[:agent]}#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_agents_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "agent: #{rights_info[:agent]} (file)#{rule_suffix}"
-        end,
-
-        (dra.index_elements[:obj_groups_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "#{rights_info[:group]}#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_groups_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "#{rights_info[:group]} (file)#{rule_suffix}"
-        end,
-
-        (dra.index_elements[:obj_world_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "world#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_world_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "world (file)#{rule_suffix}"
-        end
-      ].flatten.uniq
-
-      # these two values are returned by index_elements[:primary], but are just a less granular version of
-      # what the other more specific fields return, so discard them
-      solr_doc['rights_descriptions_ssim'] -= %w[access_restricted access_restricted_qualified world_qualified]
-      solr_doc['rights_descriptions_ssim'] += ['dark (file)'] if dra.index_elements[:terms].include? 'none_read_file'
-
-      solr_doc['obj_rights_locations_ssim'] = dra.index_elements[:obj_locations] unless dra.index_elements[:obj_locations].blank?
-      solr_doc['file_rights_locations_ssim'] = dra.index_elements[:file_locations] unless dra.index_elements[:file_locations].blank?
-      solr_doc['obj_rights_agents_ssim'] = dra.index_elements[:obj_agents] unless dra.index_elements[:obj_agents].blank?
-      solr_doc['file_rights_agents_ssim'] = dra.index_elements[:file_agents] unless dra.index_elements[:file_agents].blank?
-
-      # suppress empties
-      %w(use_statement_ssim copyright_ssim).each do |key|
-        solr_doc[key] = solr_doc[key].reject(&:blank?).flatten unless solr_doc[key].nil?
-      end
-      add_solr_value(solr_doc, 'use_license_machine', use_license.first, :string, [:stored_sortable])
-      add_solr_value(solr_doc, 'use_licenses_machine', use_license, :symbol, [:stored_searchable])
-
-      solr_doc
-    end
-
     def use_license
       use_license = []
       use_license += Array(creative_commons)
@@ -219,11 +167,6 @@ module Dor
       use_license.reject(&:blank?)
     end
 
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
-
     def rights
       xml = ng_xml
       if xml.search('//rightsMetadata/access[@type=\'read\']/machine/group').length == 1

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -112,7 +112,7 @@ module Dor
     def current_version_id
       current_version = current_version_node
       if current_version.nil?
-        return '1'
+        '1'
       else
         current_version[:versionId].to_s
       end
@@ -157,9 +157,9 @@ module Dor
     def current_version_closeable?
       current = current_version_node
       if current[:tag] && current.at_xpath('description')
-        return true
+        true
       else
-        return false
+        false
       end
     end
 

data/lib/dor/models/abstract.rb

@@ -76,7 +76,7 @@ module Dor
 
     delegate :full_title, :stanford_mods, to: :descMetadata
     delegate :rights, to: :rightsMetadata
-    delegate :catkey, :catkey=, :source_id, :source_id=,
+    delegate :catkey, :catkey=, :source_id, :source_id=, :barcode, :barcode=,
              :objectId, :objectId=, :objectCreator, :objectCreator=,
              :objectLabel, :objectLabel=, :objectType, :objectType=,
              :other_ids=, :otherId, :release_tags, :previous_catkeys,

data/lib/dor/models/admin_policy_object.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
+require 'deprecation'
+
 module Dor
   class AdminPolicyObject < Dor::Abstract
+    extend Deprecation
     has_many :things, property: :is_governed_by, class_name: 'ActiveFedora::Base'
     has_object_type 'adminPolicy'
     has_metadata name: 'administrativeMetadata', type: Dor::AdministrativeMetadataDS, label: 'Administrative Metadata'
     has_metadata name: 'roleMetadata',           type: Dor::RoleMetadataDS,           label: 'Role Metadata'
     has_metadata name: 'defaultObjectRights',    type: Dor::DefaultObjectRightsDS,    label: 'Default Object Rights'
-    belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Item'
+    belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Agreement'
 
     delegate :add_roleplayer, :purge_roles, :roles, to: :roleMetadata
     delegate :mods_title, :mods_title=, to: :descMetadata
@@ -29,11 +32,13 @@ module Dor
     def agreement
       agreement_object ? agreement_object.pid : ''
     end
+    deprecation_deprecate agreement: 'use #agreement_object_id instead'
 
     def agreement=(val)
       raise ArgumentError, 'agreement must have a valid druid' if val.blank?
 
       self.agreement_object = Dor.find val.to_s, cast: true
     end
+    deprecation_deprecate :agreement= => 'use #agreement_object_id= instead'
   end
 end

data/lib/dor/services/search_service.rb

@@ -27,9 +27,10 @@ module Dor
       end
 
       def query_by_id(id)
-        if id.is_a?(Hash) # Single valued: { :google => 'STANFORD_0123456789' }
+        case id
+        when Hash # Single valued: { :google => 'STANFORD_0123456789' }
           id = id.collect { |*v| v.join(':') }.first
-        elsif id.is_a?(Array) # Two values: [ 'google', 'STANFORD_0123456789' ]
+        when Array # Two values: [ 'google', 'STANFORD_0123456789' ]
           id = id.join(':')
         end
         q = "{!term f=#{Solrizer.solr_name 'identifier', :symbol}}#{id}"

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '9.3.0'
+  VERSION = '9.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.6.2
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '0.74'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '0.74'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -483,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library