dor-services 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 770ca0435e119517c61cfe64021bfff08daae50bf6a1fca4731029c6b8532204
-  data.tar.gz: 3a6e05fd0fb500a3a59643345faf127bcb8c2b1c69dbd2ba9f8434d08261e954
+  metadata.gz: e359d29da0952d875926e1ceec8e723725e8ca5df391e38c3ad1fe4543549941
+  data.tar.gz: 2c074e133cb69bab37024057414521d2be3b31ff4b9773bfb693bba7b25e13a7
 SHA512:
-  metadata.gz: 80dedffd987f1bd397edb8815e33a85d8caf970c7bb587e3b2957c6b3d9d6c9b46c9cbd150286b7551e44712cfb7b4758970a444377c13c41ed38309f70080ba
-  data.tar.gz: 05b2a3d6cf76e71c7251f2eeb6124c9823e85cf607d246649d928eb69f99916ba5f2e74cd52cea998c645dd699132fec15fe9db486b19a3715c4216051ce88f5
+  metadata.gz: 8f0b239aaaca59b055c5b4792d271334d2e9e7b55b2c08e606465f14037a5cb40f2cd516e18cad4f7dbe8f4e76fbfb9bf06f2e7ee29ea6eb45869953b74e8492
+  data.tar.gz: 970cb2f715414d67c487fdf2ec2ff409ad55c4d73230c630d37724fa44b7ca6893c6007eaa3800d897f4ac3e4ce11b82e426514555c92cd9c1c7bd1672f459ec

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -161,7 +161,7 @@ module Dor
     end
 
     # set a single default workflow
-    # @param wf [String] the name of the workflow, ex. 'digitizationWF'
+    # @param wf_name [String] the name of the workflow, ex. 'digitizationWF'
     def default_workflow=(wf_name)
       raise ArgumentError, 'Must have a valid workflow for default' if wf_name.blank?
 

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -43,7 +43,7 @@ module Dor
       node ? [node['source'], node.text].join(':') : nil
     end
 
-    # @param  [String, Nil] value, or nil/empty string to delete sourceId node
+    # @param  [String, Nil] value The value to set or a nil/empty string to delete sourceId node
     # @return [String, Nil] The same value, as per Ruby convention for assignment operators
     # @note The actual values assigned will have leading/trailing whitespace stripped.
     def sourceId=(value)

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

@@ -62,7 +62,7 @@ module Dor
     end
 
     # Convenience method to set the catkey
-    # @param  [String] catkey the new source identifier
+    # @param  [String] val the new source identifier
     # @return [String] same value, as per Ruby assignment convention
     def catkey=(val)
       # if there was already a catkey in the record, store that in the "previous" spot (assuming there is no change)

data/lib/dor/services/datastream_builder.rb

@@ -40,6 +40,7 @@ module Dor
 
     attr_reader :datastream, :force, :object, :required, :filename
 
+    # @return [String] datastream name (dsid)
     def datastream_name
       datastream.dsid
     end
@@ -72,7 +73,6 @@ module Dor
     end
 
     # Tries to find a file for the datastream.
-    # @param [String] datastream name of a datastream
     # @return [String, nil] path to datastream or nil
     def find_metadata_file
       druid = DruidTools::Druid.new(object.pid, Dor::Config.stacks.local_workspace_root)

data/lib/dor/services/indexing_service.rb

@@ -39,7 +39,7 @@ module Dor
     end
 
     # Use the dor-indexing-app service to reindex a pid
-    # @param [String] `pid` the druid
+    # @param [String] pid the druid
     # @raise [ReindexError] on failure
     def self.reindex_pid_remotely(pid)
       pid = "druid:#{pid}" unless pid =~ /^druid:/

data/lib/dor/services/public_desc_metadata_service.rb

@@ -10,6 +10,7 @@ module Dor
       @object = object
     end
 
+    # @return [Nokogiri::XML::Document] A copy of the descriptiveMetadata of the object, to be modified
     def doc
       @doc ||= object.descMetadata.ng_xml.dup(NOKOGIRI_DEEP_COPY)
     end
@@ -40,8 +41,6 @@ module Dor
     end
 
     # Create MODS accessCondition statements from rightsMetadata
-    # @param [Nokogiri::XML::Document] doc Document representing the descriptiveMetadata of the object
-    # @note this method modifies the passed in doc
     def add_access_conditions!
       # clear out any existing accessConditions
       doc.xpath('//mods:accessCondition', 'mods' => 'http://www.loc.gov/mods/v3').each(&:remove)
@@ -80,7 +79,6 @@ module Dor
     end
 
     # expand constituent relations into relatedItem references -- see JUMBO-18
-    # @param [Nokogiri::XML] doc public MODS XML being built
     # @return [Void]
     def add_constituent_relations!
       object.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isConstituentOf',
@@ -116,9 +114,7 @@ module Dor
 
     # Adds to desc metadata a relatedItem with information about the collection this object belongs to.
     # For use in published mods and mods-to-DC conversion.
-    # @param [Nokogiri::XML::Document] doc A copy of the descriptiveMetadata of the object, to be modified
     # @return [Void]
-    # @note this method modifies the passed in doc
     def add_collection_reference!
       collections = object.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection',
                                                        'fedora' => 'info:fedora/fedora-system:def/relations-external#',

data/lib/dor/services/registration_service.rb

@@ -112,7 +112,7 @@ module Dor
         workflow_priority = params[:workflow_priority] ? params[:workflow_priority].to_i : 0
 
         seed_datastreams(Array(params[:seed_datastream]), new_item)
-        Array(params[:initiate_workflow]).each { |workflow_id| new_item.create_workflow(workflow_id, !new_item.new_record?, workflow_priority) }
+        initiate_workflow(workflows: Array(params[:initiate_workflow]), item: new_item, priority: workflow_priority)
 
         new_item.class.ancestors.select { |x| x.respond_to?(:to_class_uri) && x != ActiveFedora::Base }.each do |parent_class|
           new_item.add_relationship(:has_model, parent_class.to_class_uri)
@@ -179,6 +179,14 @@ module Dor
         end
       end
 
+      def initiate_workflow(workflows:, item:, priority:)
+        workflows.each do |workflow_id|
+          Dor::CreateWorkflowService.create_workflow(item, name: workflow_id,
+                                                           create_ds: !item.new_record?,
+                                                           priority: priority)
+        end
+      end
+
       def build_desc_metadata_from_label(new_item, label)
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.mods(Dor::DescMetadataDS::MODS_HEADER_CONFIG) do

data/lib/dor/services/sdr_ingest_service.rb

@@ -7,7 +7,7 @@ module Dor
   #  as that is the only robot that uses it.  See also preservable concern.
   class SdrIngestService
     # @param [Dor::Item] dor_item The representation of the digital object
-    # @param [String] agreement_id  depreciated, included for backward compatability with common-accessoning
+    # @param [String] _agreement_id deprecated, included for backward compatability with common-accessoning
     # @return [void] Create the Moab/bag manifests for new version, export data to BagIt bag, kick off the SDR preservation workflow
     def self.transfer(dor_item, _agreement_id = nil)
       druid = dor_item.pid
@@ -37,7 +37,7 @@ module Dor
       bagger.create_tagfiles
       verify_bag_structure(bag_dir)
       # start SDR preservation workflow (but do not create the workflows datastream)
-      dor_item.create_workflow('preservationIngestWF', false)
+      CreateWorkflowService.create_workflow(dor_item, name: 'preservationIngestWF', create_ds: false)
     rescue Exception => e
       raise Dor::Exception, "Error exporting new object version to bag: #{e.message}"
     end

data/lib/dor/services/thumbnail_service.rb

@@ -26,7 +26,7 @@ module Dor
       { image_type: 'external', finder: "/contentMetadata/resource[@type='page' or @type='image']/externalFile[#{MIME_TYPE_FINDER}]" }
     ].freeze
 
-    # @params [Dor::Item] object
+    # @param [Dor::Item] object
     def initialize(object)
       @object = object
     end

data/lib/dor/services/version_service.rb

@@ -37,9 +37,9 @@ module Dor
       k = :create_workflows_ds
       if opts.key?(k)
         # During local development, Hydrus (or another app w/ local Fedora) does not want to initialize workflows datastream.
-        work.create_workflow('versioningWF', opts[k])
+        CreateWorkflowService.create_workflow(work, name: 'versioningWF', create_ds: opts[k])
       else
-        work.create_workflow('versioningWF')
+        CreateWorkflowService.create_workflow(work, name: 'versioningWF')
       end
 
       vmd_upd_info = opts[:vers_md_upd_info]

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Michael Klein
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement