dor-workflow-service 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cdb8d9e4d0b767532df5ea3f4c8e090b2120353
-  data.tar.gz: 0bbd9f050f133cd1f2c924832bc4f2f390150398
+  metadata.gz: df4c4add80ccf7931772988c2d80b46aa0dc22f5
+  data.tar.gz: e21d8242604743d702940c4ef60cb815d8ac94ff
 SHA512:
-  metadata.gz: 31e2c9ccbd940d6e1335797e68fb173a564fb70d8684b23135d58090552ba4a8f617da7e3492fdad44572022f7ac7a78b43ca73b01d80c036c8a3cd5e12ad291
-  data.tar.gz: ce17ca0ce0d966e5076e19d3d92b6ca38d082c6d5891bf4b123e05e39a3bb1b8b2085617a30002b101465f1c180df8017c939f2b26a0b5c3f6682daafdb64259
+  metadata.gz: 3658909e6ed9419dae40f133332650b6a61f903768f95f033c3299f08ff17558434d2082912bdaca33a19ce737773f36849bc4c0d981be704a90c5712ad9073a
+  data.tar.gz: 86fef57843d7712d44bb848d13c74ec2b2359f44cfd328497d5aaf7db54996de70720a1f82e4e5c9b25cf1653c415e4ad2a7ba93b2baf4a2b3d7425ba2bfe307

data/lib/dor/services/workflow_service.rb

@@ -18,7 +18,6 @@ module Dor
   # Create and update workflows
   class WorkflowService
     class << self
-
       @@handler  = nil
       @@logger   = nil
       @@resource = nil
@@ -486,6 +485,7 @@ module Dor
                           faraday.response :logger if opts[:debug] # logs to STDOUT
                           faraday.adapter  :net_http_persistent    # use Keep-Alive connections
                           faraday.use Faraday::Response::RaiseError
+                          faraday.options.params_encoder = Faraday::FlatParamsEncoder
                           if opts.key? :timeout
                             faraday.options.timeout = opts[:timeout]
                             faraday.options.open_timeout = opts[:timeout]
@@ -551,13 +551,7 @@ module Dor
         with_retries(:max_tries => 2, :handler => @@handler, :rescue => workflow_service_exceptions_to_catch) do |attempt|
           @@logger.info "[Attempt #{attempt}] #{meth} #{base_url}/#{uri_string}"
 
-          response = workflow_resource.send(meth, uri_string) do |req|
-            req.body = payload unless meth == 'delete'
-
-            req.params.update opts[:params] if opts[:params]
-
-            req.headers.update opts.except(:params)
-          end
+          response = send_workflow_resource_request(uri_string, meth, payload, opts)
 
           response.body
         end
@@ -566,6 +560,14 @@ module Dor
         msg += " (HTTP status #{e.response[:status]})" if e.respond_to?(:response) && e.response
         raise Dor::WorkflowException, msg
       end
+
+      def send_workflow_resource_request(uri_string, meth = 'get', payload = '', opts = {})
+        workflow_resource.send(meth, uri_string) do |req|
+          req.body = payload unless meth == 'delete'
+          req.params.update opts[:params] if opts[:params]
+          req.headers.update opts.except(:params)
+        end
+      end
     end
   end
 end

data/lib/dor/workflow_version.rb

@@ -1,7 +1,7 @@
 module Dor
   module Workflow
     module Service
-      VERSION = '2.0.0'
+      VERSION = '2.0.1'
     end
   end
 end

data/spec/workflow_service_spec.rb

@@ -31,6 +31,7 @@ describe Dor::WorkflowService do
   let(:mock_http_connection) do
     Faraday.new(url: 'http://example.com/') do |builder|
       builder.use Faraday::Response::RaiseError
+      builder.options.params_encoder = Faraday::FlatParamsEncoder
 
       builder.adapter :test, stubs
     end
@@ -586,4 +587,31 @@ describe Dor::WorkflowService do
       expect(Dor::WorkflowService.get_lane_ids('dor', 'accessionWF', 'shelve')).to eq(%w(lane1 lane2))
     end
   end
+
+  describe '.workflow_resource_method' do
+    let(:stubs) do
+      Faraday::Adapter::Test::Stubs.new do |stub|
+        stub.get('x?complete=a&complete=b') do |env|
+          [200, {}, 'ab']
+        end
+      end
+    end
+
+    it 'uses the flat params encoder' do
+      response = Dor::WorkflowService.send(:send_workflow_resource_request, 'x?complete=a&complete=b')
+
+      expect(response.body).to eq 'ab'
+      expect(response.env.url.query).to eq 'complete=a&complete=b'
+    end
+  end
+
+  describe '.workflow_resource' do
+    before do
+      Dor::WorkflowService.configure 'http://example.com'
+    end
+
+    it 'defaults to using the flat params encoder' do
+      expect(Dor::WorkflowService.workflow_resource.options.params_encoder).to eq Faraday::FlatParamsEncoder
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-workflow-service
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Willy Mene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Provides convenience methods to work with the DOR Workflow Service