dor-workflow-service 1.6.2 → 1.6.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGJhOGExNTBmYmI1MjA1NDJjYTBmNWYwNmFiYzk4YzM5ZWIyNWNlNA==
+    ZDhmMTA3OThlMzU4MjkxNmJlNDlkMGRhY2Q3MGZmODc1NWEwYTMwMA==
   data.tar.gz: !binary |-
-    ZTgyNWI3Mzk4YzQ2MmUxZTk1MzQzYzQzYzQ0OWZmY2Q5MjFjNWFlYg==
+    NGJmZTRmYThmNjRiM2Y5NjBhMjFhYjRiZDczZTYzZmE4NDQ0NGUwZg==
 SHA512:
   metadata.gz: !binary |-
-    MTRlOGE3ZmExZjQ5YmMwOTdiNzM0OTUwZjhlNzAyNWFjN2RiMTU5MTdhZWNm
-    NGVhNDlkMzEzZWE5OWFiZGExODY0ODZjZDE5Y2IwM2FlZjZhYzFjYTA4Zjhh
-    M2I2ZGE0YjRjM2IyYTlkYmM0NGM5OTljY2JhMzQ0NmI3ZTk0Nzk=
+    NTg5YWU3OWZiZTM4MjE3NjNiYmZhOGQ1NzFlMjQzYzhhMWJkMDMyMTA2MTA4
+    OGNmZjllM2FhNWNhNzMwZjNjY2FiOTA2ZmY2YjgwY2MyYjE0ZjYwZjAwOGQ4
+    NDg1N2RiNzBhMzc3ZWFiMjAxYWZmY2Y4YzZlMTZlMzFiZmQyMmY=
   data.tar.gz: !binary |-
-    NTI5NWUyOWVmZDQxNmUzOTI5ZjFhZDU4ODVkYTMxNGE5YTEzY2ViNDA5MGQ1
-    Njc4M2FlNGE0MDhlYjZjN2VmNDU2YzM2NDZkZDk4ZGYxMjEyOWJlY2Y1ODdi
-    ZmJjMmRjNTc4ZGQzODVjNWY3ZDc5ODA1ZGVlNmQ2MTZiM2FlZDE=
+    MDQ2YjNmMWQ0MTFhZjI5YjBkMTA0ODkzYmRiYjQxY2RjYzc2ZTdiMzM0Yjg5
+    ZWU1YTczOWJlNWZkNjVmNDMzNjI1MzE0YWNjMTBjM2M2MWM5NTFlZTI2MDg2
+    ZGNmZjMwNTNiM2E5N2EwM2M2OGQxZjQyNGVjNjI1NDMzZjY5Mzc=

data/lib/dor/services/workflow_service.rb

@@ -145,7 +145,7 @@ module Dor
       # @param [String] workflow The name of the workflow
       # @param [String] error_msg The error message.  Ideally, this is a brief message describing the error
       # @param [Hash] opts optional values for the workflow step
-      # @option opts [String] :error_txt A slot to hold more information about the error, like a full stacktrace
+      # @option opts [String] :error_text A slot to hold more information about the error, like a full stacktrace
       # @return [Boolean] always true
       #
       # Http Call
@@ -155,7 +155,7 @@ module Dor
       #     PUT "/dor/objects/pid:123/workflows/GoogleScannedWF/convert"
       #     <process name=\"convert\" status=\"error\" />"
       def update_workflow_error_status(repo, druid, workflow, process, error_msg, opts = {})
-        opts = {:error_txt => nil}.merge!(opts)
+        opts = {:error_text => nil}.merge!(opts)
         xml = create_process_xml({:name => process, :status => 'error', :errorMessage => error_msg}.merge!(opts))
         workflow_resource["#{repo}/objects/#{druid}/workflows/#{workflow}/#{process}"].put(xml, :content_type => 'application/xml')
         return true
@@ -265,6 +265,12 @@ module Dor
       #      "druid:ct021wp7863" => -100
       #     }
       #
+      # @example
+      #     get_objects_for_workstep(..., with_priority: true, limit: 1)
+      #     => {
+      #      "druid:py156ps0477" => 100,
+      #     }
+      #
       def get_objects_for_workstep completed, waiting, repository=nil, workflow=nil, options = {}
         result = nil
         uri_string = "workflow_queue?waiting=#{qualify_step(repository,workflow,waiting)}"
@@ -352,6 +358,7 @@ module Dor
       def create_process_xml(params)
         builder = Nokogiri::XML::Builder.new do |xml|
           attrs = params.reject { |k,v| v.nil? }
+          attrs = Hash[ attrs.map {|k,v| [k.to_s.camelize(:lower), v]}]  # camelize all the keys in the attrs hash
           xml.process(attrs)
         end
         return builder.to_xml

data/lib/dor/workflow_version.rb

@@ -1,7 +1,7 @@
 module Dor
   module Workflow
     module Service
-      VERSION = "1.6.2"
+      VERSION = "1.6.3"
     end
   end
 end

data/spec/workflow_service_spec.rb

@@ -95,8 +95,8 @@ describe Dor::WorkflowService do
 
   describe "#update_workflow_error_status" do
     it "should update workflow status to error and return true if successful" do
-      @mock_resource.should_receive(:put).with(/status="error"/, { :content_type => 'application/xml' }).and_return('')
-      Dor::WorkflowService.update_workflow_error_status(@repo, @druid, "etdSubmitWF", "reader-approval", "Some exception", :error_txt =>"The optional stacktrace")
+      @mock_resource.should_receive(:put).with(/status="error" errorMessage="Some exception" errorText="The optional stacktrace"/, { :content_type => 'application/xml' }).and_return('')
+      Dor::WorkflowService.update_workflow_error_status(@repo, @druid, "etdSubmitWF", "reader-approval", "Some exception", :error_text =>"The optional stacktrace")
     end
 
     it "should return false if the PUT to the DOR workflow service throws an exception" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-service
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Willy Mene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport