dor-workflow-service 1.6.3 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDhmMTA3OThlMzU4MjkxNmJlNDlkMGRhY2Q3MGZmODc1NWEwYTMwMA==
+    MTY2Zjg1ZWZlYmI4ZTI2ZmYxZTBlYjI1NTgzYWFhZWIxOWFmZTY4Ng==
   data.tar.gz: !binary |-
-    NGJmZTRmYThmNjRiM2Y5NjBhMjFhYjRiZDczZTYzZmE4NDQ0NGUwZg==
+    ZmM5ZDU5YTQ5ZTBjY2IwMDVmYzM3YTUxODU3MTc0YmFmMDQ4MGFhNw==
 SHA512:
   metadata.gz: !binary |-
-    NTg5YWU3OWZiZTM4MjE3NjNiYmZhOGQ1NzFlMjQzYzhhMWJkMDMyMTA2MTA4
-    OGNmZjllM2FhNWNhNzMwZjNjY2FiOTA2ZmY2YjgwY2MyYjE0ZjYwZjAwOGQ4
-    NDg1N2RiNzBhMzc3ZWFiMjAxYWZmY2Y4YzZlMTZlMzFiZmQyMmY=
+    YzM2ZjgwYzRjNmE3MjFjZDM0NmIwZjczMDg0OWJkYWUwOTZkMzNiOWQzYzM1
+    MDk1OTNmZDQ5Y2U5YjRmNjNjYmFlYTQ4NzYwMjc4ZWRhMWZiYzkwMTk0M2My
+    YjdhYmQzMmQ5NjBjOGFhZjA4YzdlMjYwNWY0YmU5MWYwZTczNWE=
   data.tar.gz: !binary |-
-    MDQ2YjNmMWQ0MTFhZjI5YjBkMTA0ODkzYmRiYjQxY2RjYzc2ZTdiMzM0Yjg5
-    ZWU1YTczOWJlNWZkNjVmNDMzNjI1MzE0YWNjMTBjM2M2MWM5NTFlZTI2MDg2
-    ZGNmZjMwNTNiM2E5N2EwM2M2OGQxZjQyNGVjNjI1NDMzZjY5Mzc=
+    Njg3N2ZkNTVjYzdiZmIyYjQ1OTE3ZGY1OGY5Y2MwM2RlYTYzYzllZTk0Nzlj
+    ZWI0MTZlYWE2NGVhMmQyOWEwNWIwOWIwOTBkMTY2NmU2OWI3MTkzZWE2MDYw
+    ZDY2ZGFhMzhiYzIwNTBjMmQ5NjNlZjJkMTIyODIzNzMwODM2Nzg=

data/lib/dor/services/workflow_service.rb

@@ -25,29 +25,17 @@ module Dor
       # @param [Hash] opts optional params
       # @option opts [Boolean] :create_ds if true, a workflow datastream will be created in Fedora.  Set to false if you do not want a datastream to be created
       #   If you do not pass in an <b>opts</b> Hash, then :create_ds is set to true by default
-      # @option opts [Integer] :priority adds priority to all process elements in the wf_xml workflow xml
+      # @option opts [String] :lane_id adds laneId attribute to all process elements in the wf_xml workflow xml.  Defaults to a value of 'default'
       # @return [Boolean] always true
       #
       def create_workflow(repo, druid, workflow_name, wf_xml, opts = {:create_ds => true})
-        xml = wf_xml
-        xml = add_priority_to_workflow_xml(opts[:priority], wf_xml) if(opts[:priority])
+        lane_id = opts.fetch(:lane_id, 'default')
+        xml = add_lane_id_to_workflow_xml(lane_id, wf_xml)
         workflow_resource["#{repo}/objects/#{druid}/workflows/#{workflow_name}"].put(xml, :content_type => 'application/xml',
                                                                                      :params => {'create-ds' => opts[:create_ds] })
         return true
       end
 
-      # Adds priority attributes to each process of workflow xml
-      #
-      # @param [Integer] priority value to add to each process element
-      # @param [String] wf_xml the workflow xml
-      # @return [String] wf_xml with priority attributes
-      def add_priority_to_workflow_xml(priority, wf_xml)
-        return wf_xml if(priority.to_i == 0)
-        doc = Nokogiri::XML(wf_xml)
-        doc.xpath('/workflow/process').each { |proc| proc['priority'] = priority }
-        doc.to_xml
-      end
-
       # Updates the status of one step in a workflow.
       # Returns true on success.  Caller must handle any exceptions
       #
@@ -60,7 +48,7 @@ module Dor
       # @option opts [Float] :elapsed The number of seconds it took to complete this step. Can have a decimal.  Is set to 0 if not passed in.
       # @option opts [String] :lifecycle Bookeeping label for this particular workflow step.  Examples are: 'registered', 'shelved'
       # @option opts [String] :note Any kind of string annotation that you want to attach to the workflow
-      # @option opts [Integer] :priority Processing priority. Recommended range is -100..100, 100 being the highest priority, and -100 being the lowest priority. Workflow queues are returned in order of highest to lowest priority value. Default is 0.
+      # @option opts [String] :lane_id Id of processing lane used by the job manager.  Can convey priority or name of an applicaiton specific processing lane (e.g. 'high', 'critical', 'hydrus')
       # @option opts [String] :current_status Setting this string tells the workflow service to compare the current status to this value.  If the current value does not match this value, the update is not performed
       # @return [Boolean] always true
       # Http Call
@@ -244,10 +232,12 @@ module Dor
       # @param [String] waiting name of the waiting step
       # @param [String] repository default repository to use if it isn't passed in the qualified-step-name
       # @param [String] workflow default workflow to use if it isn't passed in the qualified-step-name
+      # @param [String] lane_id issue a query for a specific lane_id for the waiting step
       # @param [Hash] options
-      # @option options [Boolean] :with_priority include the priority with each druid
+      # @param options  [String]  :default_repository repository to query for if not using the qualified format
+      # @param options  [String]  :default_workflow workflow to query for if not using the qualified format
       # @option options [Integer] :limit maximum number of druids to return (nil for no limit)
-      # @return [Array<String>, Hash] if with_priority, hash with druids as keys with their Integer priority as value; else Array of druids
+      # @return [Array<String>]  Array of druids
       #
       # @example
       #     get_objects_for_workstep(...)
@@ -258,25 +248,26 @@ module Dor
       #      ]
       #
       # @example
-      #     get_objects_for_workstep(..., with_priority: true)
+      #     get_objects_for_workstep(..., "lane1")
       #     => {
-      #      "druid:py156ps0477" => 100,
-      #      "druid:tt628cb6479" => 0,
-      #      "druid:ct021wp7863" => -100
+      #      "druid:py156ps0477",
+      #      "druid:tt628cb6479",
       #     }
       #
       # @example
-      #     get_objects_for_workstep(..., with_priority: true, limit: 1)
+      #     get_objects_for_workstep(..., "lane1", limit: 1)
       #     => {
-      #      "druid:py156ps0477" => 100,
+      #      "druid:py156ps0477",
       #     }
       #
-      def get_objects_for_workstep completed, waiting, repository=nil, workflow=nil, options = {}
+      def get_objects_for_workstep completed, waiting, lane_id='default', options = {}
         result = nil
-        uri_string = "workflow_queue?waiting=#{qualify_step(repository,workflow,waiting)}"
+        waiting_param = qualify_step(options[:default_repository],options[:default_workflow],waiting)
+        uri_string = "workflow_queue?waiting=#{waiting_param}"
         if(completed)
           Array(completed).each do |step|
-            uri_string << "&completed=#{qualify_step(repository,workflow,step)}"
+            completed_param = qualify_step(options[:default_repository],options[:default_workflow],step)
+            uri_string << "&completed=#{completed_param}"
           end
         end
 
@@ -284,24 +275,22 @@ module Dor
           uri_string << "&limit=#{options[:limit].to_i}"
         end
 
+        uri_string << "&lane-id=#{lane_id}"
+
         workflow_resource.options[:timeout] = 5 * 60 unless(workflow_resource.options.include?(:timeout))
         resp = workflow_resource[uri_string].get
         #
         # response looks like:
         #    <objects count="2">
-        #      <object id="druid:ab123de4567" priority="2"/>
-        #      <object id="druid:ab123de9012" priority="1"/>        #
+        #      <object id="druid:ab123de4567"/>
+        #      <object id="druid:ab123de9012"/>
         #    </objects>
         #
         # convert into:
-        #    { 'druid:ab123de4567' => 2, 'druid:ab123de9012' => 1}
+        #   ['druid:ab123de4567', 'druid:ab123de9012']
         #
-        result = Nokogiri::XML(resp).xpath('//object[@id]').inject({}) do |h, node|
-          h[node['id']] = node['priority'] ? node['priority'].to_i : 0
-          h
-        end
-
-        options[:with_priority] ? result : result.keys
+        result = Nokogiri::XML(resp).xpath('//object[@id]')
+        result.map { |n| n[:id] }
       end
 
       # Get a list of druids that have errored out in a particular workflow and step
@@ -333,7 +322,7 @@ module Dor
       #   meaning you will get all queued workflows
       # @option opts [Integer] :limit sets the maximum number of workflow steps that can be returned.  Defaults to no limit
       # @return [Array[Hash]] each Hash represents a workflow step.  It will have the following keys:
-      #  :workflow, :step, :druid, :priority
+      #  :workflow, :step, :druid, :lane_id
       def get_stale_queued_workflows(repository, opts = {})
         uri_string = build_queued_uri(repository, opts)
         xml = workflow_resource[uri_string].get
@@ -403,6 +392,19 @@ module Dor
         return true
       end
 
+      # Returns all the distinct laneIds for a given workflow step
+      #
+      # @param [String] repo The repository the object resides in.  The service recoginzes "dor" and "sdr" at the moment
+      # @param [String] workflow name
+      # @param [String] process name
+      # @return [Array<String>] all of the distinct laneIds.  Array will be empty if no lane ids were found
+      def get_lane_ids(repo, workflow, process)
+        uri = "workflow_queue/lane_ids?step=#{repo}:#{workflow}:#{process}"
+        doc = Nokogiri::XML(workflow_resource[uri].get)
+        nodes = doc.xpath('/lanes/lane')
+        nodes.map {|n| n['id']}
+      end
+
       # @return [RestClient::Resource] the REST client resource
       def workflow_resource
         raise "Please call Dor::WorkflowService.configure(url) once before calling any WorkflowService methods" if(@@resource.nil?)
@@ -445,12 +447,23 @@ module Dor
         wf[:workflow] = wf_node['name']
         wf[:step]     = wf_node['process']
         wf[:druid]    = wf_node['druid']
-        wf[:priority] = wf_node['priority'].to_i
+        wf[:lane_id] = wf_node['laneId']
         res << wf
       end
       res
     end
 
+    # Adds laneId attributes to each process of workflow xml
+    #
+    # @param [String] lane_id to add to each process element
+    # @param [String] wf_xml the workflow xml
+    # @return [String] wf_xml with lane_id attributes
+    def add_lane_id_to_workflow_xml(lane_id, wf_xml)
+      doc = Nokogiri::XML(wf_xml)
+      doc.xpath('/workflow/process').each { |proc| proc['laneId'] = lane_id }
+      doc.to_xml
+    end
+
     end
   end
 end

data/lib/dor/workflow_version.rb

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

data/spec/workflow_service_spec.rb

@@ -15,6 +15,18 @@ describe Dor::WorkflowService do
     EOXML
   }
 
+  let(:wf_xml_label) { <<-EOXML
+<?xml version="1.0"?>
+<workflow id="etdSubmitWF">
+         <process name="register-object" status="completed" attempts="1" laneId="default"/>
+         <process name="submit" status="waiting" laneId="default"/>
+         <process name="reader-approval" status="waiting" laneId="default"/>
+         <process name="registrar-approval" status="waiting" laneId="default"/>
+         <process name="start-accession" status="waiting" laneId="default"/>
+    </workflow>
+    EOXML
+  }
+
   before(:each) do
     @repo = 'dor'
     @druid = 'druid:123'
@@ -31,7 +43,7 @@ describe Dor::WorkflowService do
 
   describe "#create_workflow" do
     it "should pass workflow xml to the DOR workflow service and return the URL to the workflow" do
-      @mock_resource.should_receive(:put).with(wf_xml, anything()).and_return('')
+      @mock_resource.should_receive(:put).with(wf_xml_label, anything()).and_return('')
       Dor::WorkflowService.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml)
     end
 
@@ -42,31 +54,31 @@ describe Dor::WorkflowService do
     end
 
     it "sets the create-ds param to the value of the passed in options hash" do
-      @mock_resource.should_receive(:put).with(wf_xml, :content_type => 'application/xml',
+      @mock_resource.should_receive(:put).with(wf_xml_label, :content_type => 'application/xml',
                                                 :params => {'create-ds' => false}).and_return('')
       Dor::WorkflowService.create_workflow(@repo, @druid, 'etdSubmitWF', wf_xml, :create_ds => false)
     end
 
-    it "adds priority attributes to all steps if passed in as an option" do
+    it "adds lane_id attributes to all steps if passed in as an option" do
 
     end
 
   end
 
-  describe "#add_priority_to_workflow_xml" do
+  describe "#add_lane_id_to_workflow_xml" do
 
-    it "adds priority attributes to all process elements" do
+    it "adds laneId attributes to all process elements" do
       expected = <<-XML
         <workflow id="etdSubmitWF">
-             <process name="register-object" status="completed" attempts="1" priority="50"/>
-             <process name="submit" status="waiting" priority="50"/>
-             <process name="reader-approval" status="waiting" priority="50"/>
-             <process name="registrar-approval" status="waiting" priority="50"/>
-             <process name="start-accession" status="waiting" priority="50"/>
+             <process name="register-object" status="completed" attempts="1" laneId="lane1"/>
+             <process name="submit" status="waiting" laneId="lane1"/>
+             <process name="reader-approval" status="waiting" laneId="lane1"/>
+             <process name="registrar-approval" status="waiting" laneId="lane1"/>
+             <process name="start-accession" status="waiting" laneId="lane1"/>
         </workflow>
       XML
 
-      Dor::WorkflowService.add_priority_to_workflow_xml(50, wf_xml).should be_equivalent_to(expected)
+      Dor::WorkflowService.send(:add_lane_id_to_workflow_xml, 'lane1', wf_xml).should be_equivalent_to(expected)
     end
   end
 
@@ -76,8 +88,9 @@ describe Dor::WorkflowService do
     end
 
     it "should update workflow status and return true if successful" do
-      @mock_resource.should_receive(:put).with(@xml_re, { :content_type => 'application/xml' }).and_return('')
-      Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :priority => 34).should be_true
+      built_xml = "<?xml version=\"1.0\"?>\n<process name=\"reader-approval\" status=\"completed\" elapsed=\"0\" note=\"annotation\" version=\"2\" laneId=\"lane2\"/>\n"
+      @mock_resource.should_receive(:put).with(built_xml, { :content_type => 'application/xml' }).and_return('')
+      Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :lane_id => 'lane2').should be_true
     end
 
     it "should return false if the PUT to the DOR workflow service throws an exception" do
@@ -87,9 +100,9 @@ describe Dor::WorkflowService do
     end
 
     it "performs a conditional update when current-status is passed as a parameter" do
-       @mock_resource.should_receive(:[]).with("dor/objects/druid:123/workflows/etdSubmitWF/reader-approval?current-status=queued")
+      @mock_resource.should_receive(:[]).with("dor/objects/druid:123/workflows/etdSubmitWF/reader-approval?current-status=queued")
       @mock_resource.should_receive(:put).with(@xml_re, { :content_type => 'application/xml' }).and_return('')
-      Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :priority => 34, :current_status => 'queued').should be_true
+      Dor::WorkflowService.update_workflow_status(@repo, @druid, "etdSubmitWF", "reader-approval", "completed", :version => 2, :note => 'annotation', :lane_id => 'lane1', :current_status => 'queued').should be_true
     end
   end
 
@@ -168,18 +181,18 @@ describe Dor::WorkflowService do
 
     context "a query with one step completed and one waiting" do
       it "creates the URI string with only the one completed step" do
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}")
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&lane-id=default")
         @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep(@completed, @waiting, @repository, @workflow).should == ['druid:ab123de4567','druid:ab123de9012']
+        Dor::WorkflowService.get_objects_for_workstep(@completed, @waiting, 'default', :default_repository => @repository, :default_workflow => @workflow).should == ['druid:ab123de4567','druid:ab123de9012']
       end
     end
 
     context "a query with TWO steps completed and one waiting" do
       it "creates the URI string with the two completed steps correctly" do
         second_completed="google-convert"
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&completed=#{@repository}:#{@workflow}:#{second_completed}")
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{@repository}:#{@workflow}:#{@waiting}&completed=#{@repository}:#{@workflow}:#{@completed}&completed=#{@repository}:#{@workflow}:#{second_completed}&lane-id=default")
         @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep([@completed,second_completed], @waiting, @repository, @workflow).should == ['druid:ab123de4567','druid:ab123de9012']
+        Dor::WorkflowService.get_objects_for_workstep([@completed,second_completed], @waiting, 'default', :default_repository => @repository, :default_workflow => @workflow).should == ['druid:ab123de4567','druid:ab123de9012']
       end
     end
 
@@ -193,12 +206,12 @@ describe Dor::WorkflowService do
         completed3="ingest-transfer"
         qualified_completed2 = "#{repo2}:#{workflow2}:#{completed2}"
         qualified_completed3 = "#{repo2}:#{workflow2}:#{completed3}"
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567" priority="1"/><object id="druid:ab123de9012" priority="0"/></objects>})
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=default")
+        @mock_resource.should_receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
         Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting).should == ['druid:ab123de4567', 'druid:ab123de9012']
       end
 
-      it "same but with priority" do
+      it "same but with lane_id" do
         qualified_waiting = "#{@repository}:#{@workflow}:#{@waiting}"
         qualified_completed = "#{@repository}:#{@workflow}:#{@completed}"
         repo2 = "sdr"
@@ -207,9 +220,9 @@ describe Dor::WorkflowService do
         completed3="ingest-transfer"
         qualified_completed2 = "#{repo2}:#{workflow2}:#{completed2}"
         qualified_completed3 = "#{repo2}:#{workflow2}:#{completed3}"
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567" priority="2"/><object id="druid:ab123de9012" priority="1"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting, nil, nil, with_priority: true).should == { 'druid:ab123de4567' => 2, 'druid:ab123de9012' => 1}
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&completed=#{qualified_completed2}&completed=#{qualified_completed3}&lane-id=lane1")
+        @mock_resource.should_receive(:get).and_return(%{<objects count="2"><object id="druid:ab123de4567"/><object id="druid:ab123de9012"/></objects>})
+        Dor::WorkflowService.get_objects_for_workstep([qualified_completed, qualified_completed2, qualified_completed3], qualified_waiting, "lane1").should == [ 'druid:ab123de4567', 'druid:ab123de9012']
       end
 
       it "creates the URI string with only one completed step passed in as a String" do
@@ -217,7 +230,7 @@ describe Dor::WorkflowService do
         qualified_completed = "#{@repository}:#{@workflow}:#{@completed}"
         repo2 = "sdr"
 
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}")
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&completed=#{qualified_completed}&lane-id=default")
         @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
         Dor::WorkflowService.get_objects_for_workstep(qualified_completed, qualified_waiting).should == ['druid:ab123de4567']
       end
@@ -225,17 +238,17 @@ describe Dor::WorkflowService do
       it "creates the URI string without any completed steps, only waiting" do
         qualified_waiting = "#{@repository}:#{@workflow}:#{@waiting}"
 
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}")
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&lane-id=default")
         @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
         Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting).should == ['druid:ab123de4567']
       end
 
-      it "same but with priority" do
+      it "same but with lane_id" do
         qualified_waiting = "#{@repository}:#{@workflow}:#{@waiting}"
 
-        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}")
-        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567" priority="33"/></objects>})
-        Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting, nil, nil, with_priority: true).should == { 'druid:ab123de4567' => 33 }
+        @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{qualified_waiting}&lane-id=lane1")
+        @mock_resource.should_receive(:get).and_return(%{<objects count="1"><object id="druid:ab123de4567"/></objects>})
+        Dor::WorkflowService.get_objects_for_workstep(nil, qualified_waiting, "lane1").should == [ 'druid:ab123de4567' ]
       end
     end
   end
@@ -246,9 +259,9 @@ describe Dor::WorkflowService do
       workflow = "googleScannedBookWF"
       completed = "google-download"
       waiting = "process-content"
-      @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{repository}:#{workflow}:#{waiting}&completed=#{repository}:#{workflow}:#{completed}")
+      @mock_resource.should_receive(:[]).with("workflow_queue?waiting=#{repository}:#{workflow}:#{waiting}&completed=#{repository}:#{workflow}:#{completed}&lane-id=default")
       @mock_resource.should_receive(:get).and_return(%{<objects count="0"/>})
-      Dor::WorkflowService.get_objects_for_workstep(completed, waiting, repository, workflow).should == []
+      Dor::WorkflowService.get_objects_for_workstep(completed, waiting, 'default', :default_repository => repository, :default_workflow => workflow).should == []
     end
   end
 
@@ -275,11 +288,11 @@ describe Dor::WorkflowService do
       xml = <<-XML
       <workflows objectId="druid:mw971zk1113">
         <workflow repository="dor" objectId="druid:mw971zk1113" id="accessionWF">
-          <process priority="0" lifecycle="submitted" elapsed="0.0" attempts="1" datetime="2013-02-18T15:08:10-0800" status="completed" name="start-accession"/>
+          <process laneId="default" lifecycle="submitted" elapsed="0.0" attempts="1" datetime="2013-02-18T15:08:10-0800" status="completed" name="start-accession"/>
         </workflow>
         <workflow repository="dor" objectId="druid:mw971zk1113" id="assemblyWF">
-          <process version="1" priority="0" elapsed="0.0" archived="true" attempts="1" datetime="2013-02-18T14:40:25-0800" status="completed" name="start-assembly"/>
-          <process version="1" priority="0" elapsed="0.509" archived="true" attempts="1" datetime="2013-02-18T14:42:24-0800" status="completed" name="jp2-create"/>
+          <process version="1" laneId="default" elapsed="0.0" archived="true" attempts="1" datetime="2013-02-18T14:40:25-0800" status="completed" name="start-assembly"/>
+          <process version="1" laneId="default" elapsed="0.509" archived="true" attempts="1" datetime="2013-02-18T14:42:24-0800" status="completed" name="jp2-create"/>
         </workflow>
       </workflows>
       XML
@@ -307,16 +320,16 @@ describe Dor::WorkflowService do
     it "returns an Array of Hashes containing each workflow step" do
       xml = <<-XML
         <workflows>
-            <workflow priority="30" note="annotation" lifecycle="in-process" errorText="stacktrace" errorMessage="NullPointerException" elapsed="1.173" repository="dor" attempts="0" datetime="2008-11-15T13:30:00-0800" status="waiting" process="content-metadata" name="accessionWF" druid="dr:123"/>
-            <workflow priority="30" note="annotation" lifecycle="in-process" errorText="stacktrace" errorMessage="NullPointerException" elapsed="1.173" repository="dor" attempts="0" datetime="2008-11-15T13:30:00-0800" status="waiting" process="jp2-create" name="assemblyWF" druid="dr:456"/>
+            <workflow laneId="lane1" note="annotation" lifecycle="in-process" errorText="stacktrace" errorMessage="NullPointerException" elapsed="1.173" repository="dor" attempts="0" datetime="2008-11-15T13:30:00-0800" status="waiting" process="content-metadata" name="accessionWF" druid="dr:123"/>
+            <workflow laneId="lane2" note="annotation" lifecycle="in-process" errorText="stacktrace" errorMessage="NullPointerException" elapsed="1.173" repository="dor" attempts="0" datetime="2008-11-15T13:30:00-0800" status="waiting" process="jp2-create" name="assemblyWF" druid="dr:456"/>
         </workflows>
       XML
       @mock_resource.should_receive(:[]).with("workflow_queue/all_queued?repository=dor&hours-ago=24&limit=100")
       @mock_resource.should_receive(:get).and_return(xml)
 
       ah = Dor::WorkflowService.get_stale_queued_workflows 'dor', :hours_ago => 24, :limit => 100
-      expected = [ { :workflow => 'accessionWF', :step => 'content-metadata', :druid => 'dr:123', :priority => 30},
-                   { :workflow => 'assemblyWF', :step => 'jp2-create', :druid => 'dr:456', :priority => 30} ]
+      expected = [ { :workflow => 'accessionWF', :step => 'content-metadata', :druid => 'dr:123', :lane_id => 'lane1'},
+                   { :workflow => 'assemblyWF', :step => 'jp2-create', :druid => 'dr:456', :lane_id => 'lane2'} ]
       ah.should eql(expected)
     end
   end
@@ -330,4 +343,20 @@ describe Dor::WorkflowService do
     end
   end
 
+  describe ".get_lane_ids" do
+    it "returns the lane ids for a given workflow step" do
+      xml = <<-XML
+      <lanes>
+        <lane id="lane1"/>
+        <lane id="lane2"/>
+      </lanes>
+      XML
+
+      @mock_resource.should_receive(:[]).with("workflow_queue/lane_ids?step=dor:accessionWF:shelve")
+      @mock_resource.should_receive(:get).and_return(xml)
+
+      Dor::WorkflowService.get_lane_ids('dor', 'accessionWF', 'shelve').should == ["lane1", "lane2"]
+    end
+  end
+
 end

metadata

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