dor-workflow-service 1.6.0 → 1.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzg4NWZmMjc0OWU3NGRjNWJlZTRlNTYyNzA4NTU4ZDJjNGQzMDE4NA==
+    MmM2ZWY5NDQyOWQ4NDZkMjhlZTY0OWE1MzA4YjU2OWViMDFjMWNkMg==
   data.tar.gz: !binary |-
-    OWQ2ZWQ3NThiODc1MWU2ODY4ZWY0MDY5ZmI3MTI4YmU0YjE5Mjg3MA==
+    ZWI4MTUwOTkzMTgyOGQ1Njk4MTEwZWNiZDUyZTE5MTk2MDQ3YTA3Mw==
 SHA512:
   metadata.gz: !binary |-
-    Mzg0MzkzMmI3OWVmMzZhOGI4ZjFjN2QxMTE1ZmQxMDRlMGU5ZTVlODQwMjU0
-    NTYzYWY0YmU0MTc4ZDQzZmM0NDIyYTc3OWFmNjZmNTc2NjQ4NWJhMTEzMGU3
-    ZDZjOGUyYzZkY2U5MmFkNDg4NzYxMTg5M2MxOGY5OGY5NGE3YTE=
+    MjY4OGY2NWU1YjdmMjg0MTU2ZWM5MDg3Mzc0ZmQzOTQ4ZDg0MjZkNDcyMjBm
+    OGYzNTFmZGJjZjY4OGYzNzNkMTNiNjU4MDFmYTE4Mzk5NzM3ZDFjNDVlNGUy
+    MTg3NTc5NDkxMDJlOGQwZjJlNDI5OGVmNTYxMTJhYzdlYjIyYWU=
   data.tar.gz: !binary |-
-    ZGRjZTE2NzUxMDc3NTM4NzY1NjVhNDc5ZGIyY2M3Zjc1NDdjYTFkMjEzMmM0
-    OTA5YjlmNmJhNzI5MGYxYzA4YWNkNDNiMzBkZGQxZjkyYTQyZWRmOGQwMTI2
-    N2E4YmJlM2ExY2M0NGQxN2M3YzU1NmEwMDllYWVhNjU2OTUzNWU=
+    OWYzNjBmZGRjNGRmYmIwZTc1MjM1NzU0NjA5NGJhM2Q0NjVlMWZlZTA2NDk5
+    MzJmZjFlYmFhYmUxNjAxMzEwZTUzYjc2MDU5ODUwZjliOTgxNjE5YTBkMDM5
+    Y2Q5Yzc0MWYzNTY0N2RmOTU4OWIyYTJhNmFiZjBiYWVmYjhlNWM=

data/lib/dor/services/workflow_service.rb

@@ -323,7 +323,8 @@ module Dor
       #   This will enable re-queueing of jobs that have been lost by the job manager
       # @param [String] repository name of the repository you want to query, like 'dor' or 'sdr'
       # @param [Hash] opts optional values for query
-      # @option opts [Integer] :hours_ago steps older than this value will be returned by the query.  If not passed in, the service defaults to 24 hours
+      # @option opts [Integer] :hours_ago steps older than this value will be returned by the query.  If not passed in, the service defaults to 0 hours,
+      #   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
@@ -336,7 +337,8 @@ module Dor
       # Returns a count of workflow steps that have a status of 'queued' that have a last-updated timestamp older than the number of hours passed in
       # @param [String] repository name of the repository you want to query, like 'dor' or 'sdr'
       # @param [Hash] opts optional values for query
-      # @option opts [Integer] :hours_ago steps older than this value will be returned by the query.  If not passed in, the service defaults to 24 hours
+      # @option opts [Integer] :hours_ago steps older than this value will be returned by the query.  If not passed in, the service defaults to 0 hours,
+      #   meaning you will get all queued workflows
       # @return [Integer] number of stale, queued steps if the :count_only option was set to true
       def count_stale_queued_workflows(repository, opts = {})
         uri_string = build_queued_uri(repository, opts)

data/lib/dor/workflow_version.rb

@@ -1,7 +1,7 @@
 module Dor
   module Workflow
     module Service
-      VERSION = "1.6.0"
+      VERSION = "1.6.1"
     end
   end
 end

data/spec/workflow_service_spec.rb

@@ -303,7 +303,7 @@ describe Dor::WorkflowService do
     end
   end
 
-  describe ".parse_queued_workflows_response" do
+  describe ".get_stale_queued_workflows" do
     it "returns an Array of Hashes containing each workflow step" do
       xml = <<-XML
         <workflows>
@@ -311,10 +311,12 @@ describe Dor::WorkflowService do
             <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"/>
         </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} ]
-
-      ah = Dor::WorkflowService.parse_queued_workflows_response(xml)
       ah.should eql(expected)
     end
   end

metadata

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