dor-services 5.32.0 → 5.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999ab2db6a129de6b99ddc21d61750e0691d89074e69737a44def52aa0088d0c
-  data.tar.gz: 3c0488469dc69c038072fdff2ec093afd4115e5d82213f1e8e604967605e4545
+  metadata.gz: a6a98b91f456de3720fd592ee203e53147e89b316596af0e9f505b624a3fddf9
+  data.tar.gz: dad70ca22ab235c15281acd92b9a609ddb081b2c1c577e4f94fa51cfe27075d3
 SHA512:
-  metadata.gz: 430d3c2645ff34c099d81abb9723b87dd5de40c29b7c0c2d4b83a7750f947b8cef61939ed0be949f8343ca6b0170f5a353476a8ee15a8512f15e4a71f76a753c
-  data.tar.gz: 280aa45a9897ece2e92aa8bb9448b6c2e21c9698f2ab22eb9569b1cf2248697c99d368b110fa753c5320b29bcc73b67e203e55a4aec14984857fc90166d3f51d
+  metadata.gz: bffd3df8d64f6206b0e7e2e56ba997b93ff62f0b6cf80b865251505498e8bb340cc820f962875157d3db540593003e1d98f311523acb2f64a1f0db6089043a73
+  data.tar.gz: f23c44bc73d717373f4acebebaef225d2299ebc2b96db4f10d81d999a2b1546be15bd1ebaf6334f7b7cc43c46628d363938acb991ec694fe6d956cd9c628cf11

data/lib/dor/models/workflow_object.rb

@@ -33,6 +33,7 @@ module Dor
       @@repo_cache[name]
     end
 
+    # @return [Dor::WorkflowDefinitionDs]
     def definition
       datastreams['workflowDefinition']
     end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.32.0'.freeze
+  VERSION = '5.32.1'.freeze
 end

data/lib/dor/workflow/document.rb

@@ -40,6 +40,7 @@ module Workflow
       ng_xml.at_xpath('/workflow/process[not(@version)]') ? true : false
     end
 
+    # @return [Dor::WorkflowDefinitionDs]
     def definition
       @definition ||= begin
         if @@definitions.key? workflowId.first
@@ -71,14 +72,12 @@ module Workflow
       if definition
         definition.processes.collect do |process|
           node = ng_xml.at("/workflow/process[@name = '#{process.name}']")
-          process.update!(node, self) unless node.nil?
-          process
+          process.update!(node, self)
         end
       else
         find_by_terms(:workflow, :process).collect do |x|
           pnode = Dor::Workflow::Process.new(repository, workflowId, {})
           pnode.update!(x, self)
-          pnode
         end.sort_by(&:datetime)
       end
     end

data/lib/dor/workflow/process.rb

@@ -3,6 +3,9 @@ module Workflow
   class Process
     attr_reader :owner, :repo, :workflow
 
+    # @param repo [String] the name of the repository, typically 'dor'
+    # @param workflow [String] the name of the workflow, e.g. 'assemblyWF'
+    # @param attrs [Nokogiri::XML::Node, Hash]
     def initialize(repo, workflow, attrs)
       @workflow = workflow
       @repo = repo
@@ -82,14 +85,18 @@ module Workflow
       @attrs['elapsed'].nil? ? nil : @attrs['elapsed'].to_f
     end
 
-    # @param info [Nokogiri::XML::Element]
+    # Updates this object with the attributes passed in.
+    # @param info [Hash,Nokogiri::XML::Element,NilClass]
     # @param new_owner [Dor::Workflow::Document]
     def update!(info, new_owner)
       @owner = new_owner
+      return self if info.nil?
+
       if info.is_a? Nokogiri::XML::Node
         info = Hash[info.attributes.collect { |k, v| [k, v.value] }]
       end
       @attrs.merge! info
+      self
     end
 
     def to_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.32.0
+  version: 5.32.1
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -45,7 +45,7 @@ dependencies:
         version: 4.2.10
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
         version: 4.2.10
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement