dor-services 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26a4905c3d1c7ff07df99e6b7de0ec136d87cb847c30e1e676332f2142fafeac
-  data.tar.gz: 476d89693752ff2e17aa58d5efb9e559abc79a610da4c6ea413755df64c57009
+  metadata.gz: 770ca0435e119517c61cfe64021bfff08daae50bf6a1fca4731029c6b8532204
+  data.tar.gz: 3a6e05fd0fb500a3a59643345faf127bcb8c2b1c69dbd2ba9f8434d08261e954
 SHA512:
-  metadata.gz: 96957b78cb9f2e13efd0a82f3d20cc19dc9f544243bed791fe9c86cee69a179b88c1386511eaf4a1ac159d15868ecae40ffb1753847359b7b116d69fa7588fa8
-  data.tar.gz: f27dd546d898ebae9bae95ef3180296cc434b6fdd8a06e293d92bc8ba6db5fa327758a34f895d21b63f817504ceffc161bc065f6ee86e319d30d75adcbbe4d7d
+  metadata.gz: 80dedffd987f1bd397edb8815e33a85d8caf970c7bb587e3b2957c6b3d9d6c9b46c9cbd150286b7551e44712cfb7b4758970a444377c13c41ed38309f70080ba
+  data.tar.gz: 05b2a3d6cf76e71c7251f2eeb6124c9823e85cf607d246649d928eb69f99916ba5f2e74cd52cea998c645dd699132fec15fe9db486b19a3715c4216051ce88f5

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

@@ -43,11 +43,11 @@ module Dor
     # Generates Dublin Core from the MODS in the descMetadata datastream using the LoC mods2dc stylesheet
     #    Should not be used for the Fedora DC datastream
     # @raise [CrosswalkError] Raises an Exception if the generated DC is empty or has no children
-    # @return [Nokogiri::Doc] the DublinCore XML document object
+    # @return [Nokogiri::XML::Document] the DublinCore XML document object
     def generate_dublin_core(include_collection_as_related_item: true)
-      DublinCoreService.new(self, include_collection_as_related_item: include_collection_as_related_item).to_xml
+      DublinCoreService.new(self, include_collection_as_related_item: include_collection_as_related_item).ng_xml
     end
-    deprecation_deprecate generate_dublin_core: 'Use DublinCoreService#to_xml instead'
+    deprecation_deprecate generate_dublin_core: 'Use DublinCoreService#ng_xml instead'
 
     # @return [String] Public descriptive medatada XML
     def generate_public_desc_md(**options)

data/lib/dor/services/dublin_core_service.rb

@@ -14,8 +14,8 @@ module Dor
     # Generates Dublin Core from the MODS in the descMetadata datastream using the LoC mods2dc stylesheet
     #    Should not be used for the Fedora DC datastream
     # @raise [CrosswalkError] Raises an Exception if the generated DC is empty or has no children
-    # @return [Nokogiri::Doc] the DublinCore XML document object
-    def to_xml
+    # @return [Nokogiri::XML::Document] the DublinCore XML document object
+    def ng_xml
       dc_doc = MODS_TO_DC_XSLT.transform(desc_md)
       dc_doc.xpath('/oai_dc:dc/*[count(text()) = 0]', oai_dc: XMLNS_OAI_DC).remove # Remove empty nodes
       raise CrosswalkError, "Dor::Item#generate_dublin_core produced incorrect xml (no root):\n#{dc_doc.to_xml}" if dc_doc.root.nil?
@@ -24,6 +24,11 @@ module Dor
       dc_doc
     end
 
+    # @return [String] the DublinCore XML document object
+    def to_xml
+      ng_xml.to_xml
+    end
+
     private
 
     def desc_md

data/lib/dor/services/public_xml_service.rb

@@ -19,7 +19,7 @@ module Dor
       pub.add_child(public_rights_metadata.root)
 
       pub.add_child(public_relationships.root) unless public_relationships.nil? # TODO: Should never be nil in practice; working around an ActiveFedora quirk for testing
-      pub.add_child(object.generate_dublin_core.root)
+      pub.add_child(DublinCoreService.new(object).ng_xml.root)
       pub.add_child(PublicDescMetadataService.new(object).ng_xml.root)
       pub.add_child(release_xml.root) unless release_xml.xpath('//release').children.size == 0 # If there are no release_tags, this prevents an empty <releaseData/> from being added
       # Note we cannot base this on if an individual object has release tags or not, because the collection may cause one to be generated for an item,

data/lib/dor/services/publish_metadata_service.rb

@@ -25,8 +25,7 @@ module Dor
     attr_reader :item
 
     def transfer_metadata
-      dc_xml = item.generate_dublin_core.to_xml(&:no_declaration)
-      transfer_to_document_store(dc_xml, 'dc')
+      transfer_to_document_store(DublinCoreService.new(item).ng_xml.to_xml(&:no_declaration), 'dc')
       %w(identityMetadata contentMetadata rightsMetadata).each do |stream|
         transfer_to_document_store(item.datastreams[stream].content.to_s, stream) if item.datastreams[stream]
       end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Michael Klein