dor-services 6.1.14 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90689318d87fa2d34cad2f9df2abe024b83732e3355e594d5fceadc571623dff
-  data.tar.gz: 3dd75f93c07aff83bc289df53d2da635a5b9bf2288b3f0ce0accbb6c8d4d7bc8
+  metadata.gz: a9ab63108ab2c8ddd29600d7a9facf709a67dc52474d7c0de6becac108664807
+  data.tar.gz: 332ce5d6ceef2432a7135788bc87de7d28ec108ff9820bc5c4e253ba0f8f700a
 SHA512:
-  metadata.gz: 2cced9204b98f138a77c158145d410b870cd7808c32eb983cc589c935b740dfbc1c51e8b731e697269ad15307e20f64312e49ba522e414c85828e1fb5876e533
-  data.tar.gz: a21b1cce429f00d0c88392368ab615e31064d5dd48793e3d1e868b02a3977ca3434eed45b472dfe49b77f9802ea309dffb79f56ca11b399e6b2f10eb7d77d28d
+  metadata.gz: 5742a34bb7b5250df9ca07b5c2b4291f59b165acc1050dbc9f76f9bd185d4a5bd0bc961552ab20e40d13b42c631ac0c0c3c515347ae9476b2811ec5dd75f2ad0
+  data.tar.gz: edb36ac7a3bcce46e5d3111c4a23bf69fed05afda48c82d42f0bbcbcca564d128b180774d7cf6231e168e7b3301af40a15a552f57f226a97259e582173a1c29d

data/lib/dor/exceptions.rb

@@ -3,6 +3,10 @@
 module Dor
   class Exception < ::StandardError; end
   class ParameterError < RuntimeError; end
+
+  # Raised when the data does not conform to expectations
+  class DataError < RuntimeError; end
+
   class DuplicateIdError < RuntimeError
     attr_reader :pid
 

data/lib/dor/models/concerns/governable.rb

@@ -13,7 +13,7 @@ module Dor
     def initiate_apo_workflow(name)
       CreateWorkflowService.create_workflow(self, name: name, create_ds: !new_record?)
     end
-    deprecation_deprecate initiate_apo_workflow: 'Use Dor::CreateWorkflowService.create_workflow instead'
+    deprecation_deprecate initiate_apo_workflow: 'Use Dor::Services::Client.object(object_identifier).workflow.create(wf_name:) instead'
 
     def reset_to_apo_default
       rightsMetadata.content = admin_policy_object.rightsMetadata.ng_xml

data/lib/dor/services/create_workflow_service.rb

@@ -39,7 +39,7 @@ module Dor
     def default_workflow_lane
       return 'default' if admin_policy_object.nil? # TODO: log warning?
 
-      admin_md = admin_policy_object.administrativeMetadata
+      admin_md = admin_policy_object.datastreams['administrativeMetadata']
       return 'default' unless admin_md.respond_to?(:default_workflow_lane) # Some APOs don't have this datastream
 
       lane = admin_md.default_workflow_lane

data/lib/dor/services/file_metadata_merge_service.rb

@@ -3,6 +3,9 @@
 module Dor
   # Merges contentMetadata from several objects into one.
   class FileMetadataMergeService
+    extend Deprecation
+    self.deprecation_horizon = 'dor-services version 7.0.0'
+
     # @param [Array<String>] secondary_druids ids of the secondary objects that will get their contentMetadata merged into this one
     def self.copy_file_resources(primary, secondary_druids)
       merge_service = FileMetadataMergeService.new primary, secondary_druids
@@ -59,6 +62,7 @@ module Dor
         end
       end
     end
+    deprecation_deprecate copy_file_resources: 'No longer used by any DLSS code'
 
     private
 

data/lib/dor/services/merge_service.rb

@@ -2,6 +2,9 @@
 
 module Dor
   class MergeService
+    extend Deprecation
+    self.deprecation_horizon = 'dor-services version 7.0.0'
+
     def self.merge_into_primary(primary_druid, secondary_druids, tag, logger = nil)
       # TODO: test the secondary_obj to see if we've processed it already
       merge_service = Dor::MergeService.new primary_druid, secondary_druids, tag, logger
@@ -29,12 +32,14 @@ module Dor
       non_editable = @secondary_objs.detect { |obj| !obj.allows_modification? }
       raise Dor::Exception, "Secondary object is not editable: #{non_editable.pid}" if non_editable
     end
+    deprecation_deprecate check_objects_editable: 'No longer used by any DLSS code'
 
     def move_metadata_and_content
       FileMetadataMergeService.copy_file_resources @primary, @secondary_pids
       @primary.save
       copy_workspace_content
     end
+    deprecation_deprecate move_metadata_and_content: 'No longer used by any DLSS code'
 
     # Copies the content from the secondary object workspace to the primary object's workspace
     #   Depends on Dor::Config.stacks.local_workspace_root
@@ -59,6 +64,7 @@ module Dor
         end
       end
     end
+    deprecation_deprecate copy_workspace_content: 'No longer used by any DLSS code'
 
     def decommission_secondaries
       @secondary_objs.each do |secondary_obj|
@@ -77,6 +83,8 @@ module Dor
         end
       end
     end
+    deprecation_deprecate decommission_secondaries: 'No longer used by any DLSS code'
+
     alias decomission_secondaries decommission_secondaries
     deprecate decomission_secondaries: 'Use decommission_secondaries instead'
 
@@ -85,11 +93,13 @@ module Dor
     def unshelve
       DigitalStacksService.prune_stacks_dir @current_secondary.pid
     end
+    deprecation_deprecate unshelve: 'No longer used by any DLSS code'
 
     # Withdraw item from Purl
     # TODO: might set workflow status in future for robot to do
     def unpublish
       @current_secondary.publish_metadata
     end
+    deprecation_deprecate unpublish: 'No longer used by any DLSS code'
   end
 end

data/lib/dor/services/public_xml_service.rb

@@ -78,33 +78,39 @@ module Dor
         result.xpath('/contentMetadata/resource/file/checksum').each(&:remove)
 
         # support for dereferencing links via externalFile element(s) to the source (child) item - see JUMBO-19
-        result.xpath('/contentMetadata/resource/externalFile').each do |externalFile|
-          # enforce pre-conditions that resourceId, objectId, fileId are required
-          src_resource_id = externalFile['resourceId']
-          src_druid = externalFile['objectId']
-          src_file_id = externalFile['fileId']
-          raise ArgumentError, "Malformed externalFile data: #{externalFile.inspect}" if [src_resource_id, src_file_id, src_druid].map(&:blank?).any?
-
-          # grab source item
-          src_item = Dor.find(src_druid)
-
-          # locate and extract the resourceId/fileId elements
-          doc = src_item.datastreams['contentMetadata'].ng_xml
-          src_resource = doc.at_xpath("//resource[@id=\"#{src_resource_id}\"]")
-          src_file = src_resource.at_xpath("file[@id=\"#{src_file_id}\"]")
-          src_image_data = src_file.at_xpath('imageData')
-
-          # always use title regardless of whether a child label is present
-          src_label = doc.create_element('label')
-          src_label.content = src_item.full_title
-
-          # add the extracted label and imageData
-          externalFile.add_previous_sibling(src_label)
-          externalFile << src_image_data unless src_image_data.nil?
+        result.xpath('/contentMetadata/resource/externalFile').each do |external_file|
+          add_data_from_src(external_file)
         end
 
         result
       end
     end
+
+    def add_data_from_src(external_file)
+      # enforce pre-conditions that resourceId, objectId, fileId are required
+      src_resource_id = external_file['resourceId']
+      src_druid = external_file['objectId']
+      src_file_id = external_file['fileId']
+      raise DataError, "Malformed externalFile data: #{external_file.to_xml}" if [src_resource_id, src_file_id, src_druid].map(&:blank?).any?
+
+      # grab source item
+      src_item = Dor.find(src_druid)
+
+      # locate and extract the resourceId/fileId elements
+      doc = src_item.contentMetadata.ng_xml
+      src_resource = doc.at_xpath("//resource[@id=\"#{src_resource_id}\"]")
+      src_file = src_resource.at_xpath("file[@id=\"#{src_file_id}\"]")
+      raise DataError, "Unable to find a file node with id=\"#{src_file_id}\" (child of #{object.pid})" unless src_file
+
+      src_image_data = src_file.at_xpath('imageData')
+
+      # always use title regardless of whether a child label is present
+      src_label = doc.create_element('label')
+      src_label.content = src_item.full_title
+
+      # add the extracted label and imageData
+      external_file.add_previous_sibling(src_label)
+      external_file << src_image_data unless src_image_data.nil?
+    end
   end
 end

data/lib/dor/utils/sdr_client.rb

@@ -60,9 +60,10 @@ module Sdr
         Moab::FileInventoryDifference.parse(response)
       end
 
-      # This is used by Argo
+      # This was used by Argo but is no longer used anywhere
       def get_preserved_file_content(druid, filename, version)
-        Deprecation.warn(self, 'Sdr::Client.get_preserved_file_content is deprecated and will be removed in dor-services 7. Use Dor::Services::Client.preserved_content instead')
+        Deprecation.warn(self, 'Sdr::Client.get_preserved_file_content is deprecated and will be removed in dor-services 7. ' \
+                           'Use Dor::Services::Client.object(object_identifier).files.preserved_content(filename:, version:) instead')
 
         client["objects/#{druid}/content/#{URI.encode(filename)}?version=#{version}"].get
       end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.1.14
+  version: 6.2.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -695,7 +695,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library