dor-services 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8f84301c1b84bb4155b4dec895cb2b3d63daea54637b35f51728a8268c792ee
-  data.tar.gz: 8accea8e3978a89bf772dd0ecb14b17229b6755b8a8a1c3e12b790b59eaae3ee
+  metadata.gz: c8fda5b9a8dcdb85f290832205f6048a235e28e4ef6cf7deab312bcd40ec98da
+  data.tar.gz: b2e10373a24d6c531cd36fb72fa3ebc31d8e52354d5c1bd39615958bd08386f0
 SHA512:
-  metadata.gz: 923ed4f14197cdb8fdc821276b7d500ffaa0fde36187cf537ee894ac025213dde7fe7905bd71e25f9d1b25d057b10649c48016e6bbf41a5dd1cef4efc3df001c
-  data.tar.gz: 26e4f1ab094617dc635340f0a31858ba0e1d9ad31565c7bedd83fb58b013432ecfc303a875702a4db846eaa820e5cf0776ab3bb1daac2e726fe70fcf6e775ee0
+  metadata.gz: 17d7c18682c5b8acc1730f3e293a2ba4643b5970b0a91cc3e11796006c3d204e408eb5ee49e243d29f0b44ba412667efdf3b9377cbf23b082da9e3a193b49b10
+  data.tar.gz: 9ee4653efdfe1fb63603e0311362562f4f09a1b965c1e4e92a81009d084cadc10d41e46f29543605f020133f75dea5fd79698daa122c5fbdd2c34e853949b68b

data/lib/dor/services/technical_metadata_service.rb

@@ -6,6 +6,13 @@ require 'jhove_service'
 require 'dor-services'
 
 module Dor
+  # Extracts technical metadata from files using JHOVE
+  # If this is a new version it gets the old technicalMetadata datastream by
+  # making an API call to sdr-services-app (via dor-services-app) and
+  # only overwrites/adds parts for the files that were changed or added.
+  # This allows us to avoid re-staging files that have not changed.
+  # Switching to a more granular data model that has file metadata separate from
+  # the Work metadata will allow us to simplify this greatly.
   class TechnicalMetadataService
     # @param [Dor::Item] dor_item The DOR item being processed by the technical metadata robot
     # @return [Boolean] True if technical metadata is correctly added or updated
@@ -45,6 +52,7 @@ module Dor
         end
       end
     end
+    private_class_method :test_jhove_service
 
     # @param [Dor::Item] dor_item The DOR item being processed by the technical metadata robot
     # @return [FileGroupDifference] The differences between two versions of a group of files
@@ -52,21 +60,26 @@ module Dor
       return Moab::FileGroupDifference.new if dor_item.contentMetadata.nil?
       raise Dor::ParameterError, 'Missing Dor::Config.stacks.local_workspace_root' if Config.stacks.local_workspace_root.nil?
 
-      inventory_diff = Sdr::Client.get_content_diff(dor_item.pid, dor_item.contentMetadata.content, 'all')
+      client = Dor::Services::Client.object(dor_item.pid).sdr
+      current_content = dor_item.contentMetadata.content
+      inventory_diff = client.content_diff(current_content: current_content)
       inventory_diff.group_difference('content')
     end
+    private_class_method :get_content_group_diff
 
     # @param [FileGroupDifference] content_group_diff
     # @return [Hash<Symbol,Array>] Sets of filenames grouped by change type for use in performing file or metadata operations
     def self.get_file_deltas(content_group_diff)
       content_group_diff.file_deltas
     end
+    private_class_method :get_file_deltas
 
     # @param [Hash<Symbol,Array>] deltas Sets of filenames grouped by change type for use in performing file or metadata operations
     # @return [Array<String>] The list of filenames for files that are either added or modifed since the previous version
     def self.get_new_files(deltas)
       deltas[:added] + deltas[:modified]
     end
+    private_class_method :get_new_files
 
     # @param [Dor::Item] dor_item The DOR item being processed by the technical metadata robot
     # @return [String] The technicalMetadata datastream from the previous version of the digital object
@@ -76,6 +89,7 @@ module Dor
 
       get_dor_technical_metadata(dor_item)
     end
+    private_class_method :get_old_technical_metadata
 
     # @param [String] druid The identifier of the digital object being processed by the technical metadata robot
     # @return [String] The technicalMetadata datastream from the previous version of the digital object (fetched from SDR storage)
@@ -87,6 +101,7 @@ module Dor
 
       nil
     end
+    private_class_method :get_sdr_technical_metadata
 
     # @param [Dor::Item] dor_item The DOR item being processed by the technical metadata robot
     # @return [String] The technicalMetadata datastream from the previous version of the digital object (fetched from DOR fedora).
@@ -101,13 +116,15 @@ module Dor
 
       nil
     end
+    private_class_method :get_dor_technical_metadata
 
     # @param [String] druid The identifier of the digital object being processed by the technical metadata robot
     # @param [String] dsname The identifier of the metadata datastream
     # @return [String] The datastream contents from the previous version of the digital object (fetched from SDR storage)
     def self.get_sdr_metadata(druid, dsname)
-      Sdr::Client.get_sdr_metadata(druid, dsname)
+      Dor::Services::Client.object(druid).sdr.metadata(datastream: dsname)
     end
+    private_class_method :get_sdr_metadata
 
     # @param [DruidTools::Druid] druid A wrapper class for the druid identifier.  Used to generate paths
     # @param [Array<String>] new_files The list of filenames for files that are either added or modifed since the previous version
@@ -125,6 +142,7 @@ module Dor
       tech_md_file = jhove_service.create_technical_metadata(jhove_output_file)
       IO.read(tech_md_file)
     end
+    private_class_method :get_new_technical_metadata
 
     # @param [Pathname]  temp_dir  The pathname of the temp folder in the object's workspace area
     # @param [Object] new_files [Array<String>] The list of filenames for files that are either added or modifed since the previous version
@@ -134,6 +152,7 @@ module Dor
       fileset_pathname.open('w') { |f| f.puts(new_files) }
       fileset_pathname
     end
+    private_class_method :write_fileset
 
     # @param [String] old_techmd The technicalMetadata datastream from the previous version of the digital object
     # @param [String] new_techmd The technicalMetadata datastream for the new files of the new digital object version
@@ -164,6 +183,7 @@ module Dor
       end
       merged_nodes
     end
+    private_class_method :merge_file_nodes
 
     # @param [String] technical_metadata A technicalMetadata datastream contents
     # @return [Hash<String,Nokogiri::XML::Node>] The set of nodes from a technicalMetadata datastream, indexed by filename
@@ -191,6 +211,7 @@ module Dor
       end
       file_hash
     end
+    private_class_method :get_file_nodes
 
     # @param [String] druid The identifier of the digital object being processed by the technical metadata robot
     # @param [Hash<String,Nokogiri::XML::Node>] merged_nodes The complete set of technicalMetadata nodes for the digital object, indexed by filename
@@ -206,5 +227,6 @@ module Dor
       merged_nodes.keys.sort.each { |path| doc << merged_nodes[path] }
       doc + '</technicalMetadata>'
     end
+    private_class_method :build_technical_metadata
   end
 end

data/lib/dor/utils/sdr_client.rb

@@ -24,6 +24,9 @@ module Sdr
       # @param [String] dsname The identifier of the metadata datastream
       # @return [String] The datastream contents from the previous version of the digital object (fetched from SDR storage)
       def get_sdr_metadata(druid, dsname)
+        Deprecation.warn(self, 'Sdr::Client.get_sdr_metadata is deprecated and will be removed in dor-services 7. ' \
+                           'Use Dor::Services::Client.object(object_identifier).sdr.metadatra(datastream:) instead')
+
         client["objects/#{druid}/metadata/#{dsname}.xml"].get
       rescue RestClient::ResourceNotFound
         nil
@@ -32,6 +35,9 @@ module Sdr
       # @param [String] druid The object identifier
       # @return [Moab::SignatureCatalog] the catalog of all files previously ingested
       def get_signature_catalog(druid)
+        Deprecation.warn(self, 'Sdr::Client.get_signature_catalog is deprecated and will be removed in dor-services 7. ' \
+                           'Use Dor::Services::Client.object(object_identifier).sdr.signature_catalog instead')
+
         response = client["objects/#{druid}/manifest/signatureCatalog.xml"].get
         Moab::SignatureCatalog.parse(response)
       rescue RestClient::ResourceNotFound

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement