dor-workflow-service 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e750b0f9cadcbba9d9053a239eabe3d8b4953e3
-  data.tar.gz: 385b1d542be6495573b853dd0f86cc820e6149aa
+  metadata.gz: 247315ca28af42d73ab1947353b8ae71f459d75b
+  data.tar.gz: 0204c4ba989f633559264556415dfbc85db0a16e
 SHA512:
-  metadata.gz: fb5a825e36a8ae7e44f51c93b457316677feffb1c8f8633d89f74d1b5c74c817917adcc05a1ecf2cba124dc81b63b6ea5ed04d4eafc79eb9c899842ab3644346
-  data.tar.gz: 7b1da0dd6e498352de44efb337a0bbd0e0d9095315b48def7a306611971bc70310622d7d08695cca834279f190a61598a5c73bae597d5280b3f7abd41351bbae
+  metadata.gz: '09781481dd5d29f0fe06a16e015587a0b8296cc3ab27b36e67f4ce5f0451eb27f477dea6a3af5621ca5bf3449e62fca5017354a4e8268c4eb9693bd41a6f68e3'
+  data.tar.gz: 5d08832b83c3e2996996e691664f89bbbce47e521ec36e7b4dbb2482345a3cc83395d9592d77116f9ec3b57bef85ac7ce2e2675d2a75bd4865ad18ea0d009d72

data/lib/dor/services/workflow_service.rb

@@ -132,7 +132,7 @@ module Dor
       # @param [String] pid id of object
       # @return [Array<String>] list of active worklows.  Returns an empty Array if none are found
       # @example
-      #   Dor::WorkflowService.get_workflows('dor', 'druid:sr100hp0609')
+      #   Dor::WorkflowService.get_active_workflows('dor', 'druid:sr100hp0609')
       #   => ["accessionWF", "assemblyWF", "disseminationWF"]
       def get_active_workflows(repo, pid)
         doc = Nokogiri::XML(get_workflow_xml(repo, pid, ''))
@@ -483,8 +483,8 @@ module Dor
                       when String
                         Faraday.new(url: url_or_connection) do |faraday|
                           faraday.response :logger if opts[:debug] # logs to STDOUT
-                          faraday.adapter  :net_http_persistent    # use Keep-Alive connections
                           faraday.use Faraday::Response::RaiseError
+                          faraday.adapter  :net_http_persistent    # use Keep-Alive connections
                           faraday.options.params_encoder = Faraday::FlatParamsEncoder
                           if opts.key? :timeout
                             faraday.options.timeout = opts[:timeout]
@@ -496,6 +496,10 @@ module Dor
                       end
       end
 
+      def count_objects_in_step(workflow, step, type, repo)
+        resp = workflow_resource_method "workflow_queue?repository=#{repo}&workflow=#{workflow}&#{type}=#{step}"
+        extract_object_count(resp)
+      end
 
       protected
 
@@ -529,11 +533,6 @@ module Dor
         doc.to_xml
       end
 
-      def count_objects_in_step(workflow, step, type, repo)
-        resp = workflow_resource_method "workflow_queue?repository=#{repo}&workflow=#{workflow}&#{type}=#{step}"
-        extract_object_count(resp)
-      end
-
       def extract_object_count(resp)
         node = Nokogiri::XML(resp).at_xpath('/objects')
         raise Dor::WorkflowException.new('Unable to determine count from response') if node.nil?

data/lib/dor/workflow_version.rb

@@ -1,7 +1,7 @@
 module Dor
   module Workflow
     module Service
-      VERSION = '2.2.1'
+      VERSION = '2.3.0'
     end
   end
 end

data/spec/workflow_service_spec.rb

@@ -409,7 +409,7 @@ describe Dor::WorkflowService do
         end
       end
     end
-    
+
     it 'returns error messages for errored objects' do
       expect(Dor::WorkflowService.get_errored_objects_for_workstep(@workflow, @step, @repository)).to eq({'druid:ab123cd4567'=>'This is an error message'})
     end
@@ -464,6 +464,31 @@ describe Dor::WorkflowService do
     end
   end
 
+  describe '#count_objects_in_step' do
+    before(:all) do
+      @workflow   = 'sdrIngestWF'
+      @step       = 'start-ingest'
+      @type       = 'waiting'
+      @repository = 'sdr'
+    end
+
+    let(:stubs) do
+      Faraday::Adapter::Test::Stubs.new do |stub|
+        stub.get("/workflow_queue?repository=#{@repository}&workflow=#{@workflow}&#{@type}=#{@step}") do |env|
+          [200, {}, <<-EOXML ]
+            <objects count="1">
+              <object id="druid:oo000ra0001" url="null/fedora/objects/druid:oo000ra0001"/>
+            </objects>
+            EOXML
+        end
+      end
+    end
+
+    it 'counts how many objects are at the type of step' do
+      expect(Dor::WorkflowService.count_objects_in_step(@workflow, @step, @type, @repository)).to eq(1)
+    end
+  end
+
   describe '#delete_workflow' do
     let(:url) { "#{@repo}/objects/#{@druid}/workflows/accessionWF" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-service
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Willy Mene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Provides convenience methods to work with the DOR Workflow Service