dor-workflow-service 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b888963479c4de1033bd8798b2b0359716cb1ced1eef603dda97368ddc1c24
-  data.tar.gz: 4453dd238b37050a525f9864d3595385ad271e72d86907006715745b0a704e9c
+  metadata.gz: a551f16bb333247b5b41a432f1c9b0fa22767b00fe6d9c2b1268e774c671a0ee
+  data.tar.gz: ed7bb2ceaf955c1474a1ce09db561cd695cd2a5c52f8fe3b207c886a4cdcdfda
 SHA512:
-  metadata.gz: 2e4121d6d2a23703e28d1f2acaf889afb7ae4990906c0d40134a06343533a3778d006bc8a88e6b0a19974a3e637ec54263b5eedbb427c326ae57fdc4514b33d9
-  data.tar.gz: 3c7c109f9301ace8b71c61d94ea5d8f4bf2d2fb4397db8e209e3c34e2c195c9ec6398b1a8f6475a3eb993338f81508f4be6f0b863d9d9ae21b04aefb1b1cd27e
+  metadata.gz: e9885f3d7e3535bd4b6a074502aac1fe924de902148d53ecaf1375907ddbe013cc3b27fb9a58c3282d94faa8ae70fbb5bdf4099cafe1195909a6900a8c67eba2
+  data.tar.gz: 7ee482c8b021948da5563e3118d4f09b2cbe44cceb99ec9333140d701d6f1f6d313edb5a0714540a8b9b3b3fa9db4ebf4b138f092802629ebe0da38b3c2afa15

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-02-01 13:34:49 -0600 using RuboCop version 0.63.1.
+# on 2019-03-12 08:34:30 -0500 using RuboCop version 0.63.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -16,19 +16,19 @@ Lint/UselessAssignment:
   Exclude:
     - 'lib/dor/services/workflow_service.rb'
 
-# Offense count: 2
+# Offense count: 1
 Metrics/AbcSize:
   Max: 22
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 250
+  Max: 257
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 20
+  Max: 13
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.

data/lib/dor/services/workflow_service.rb

@@ -499,16 +499,7 @@ module Dor
         end
         @@http_conn = case url_or_connection
                       when String
-                        Faraday.new(url: url_or_connection) do |faraday|
-                          faraday.response :logger if opts[:debug] # logs to STDOUT
-                          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]
-                            faraday.options.open_timeout = opts[:timeout]
-                          end
-                        end
+                        build_connection(url_or_connection, opts)
                       else
                         url_or_connection
                       end
@@ -521,6 +512,24 @@ module Dor
 
       protected
 
+      def build_connection(url, opts)
+        Faraday.new(url: url) do |faraday|
+          faraday.response :logger if opts[:debug] # logs to STDOUT
+          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]
+            faraday.options.open_timeout = opts[:timeout]
+          end
+          faraday.headers[:user_agent] = user_agent
+        end
+      end
+
+      def user_agent
+        "dor-workflow-service #{Dor::Workflow::Service::VERSION}"
+      end
+
       def build_queued_uri(repository, opts = {})
         uri_string = "workflow_queue/all_queued?repository=#{repository}"
         uri_string += "&hours-ago=#{opts[:hours_ago]}" if opts[:hours_ago]

data/lib/dor/workflow_version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Workflow
     module Service
-      VERSION = '2.9.0'
+      VERSION = '2.10.0'
     end
   end
 end

data/spec/workflow_service_spec.rb

@@ -55,12 +55,17 @@ describe Dor::WorkflowService do
   end
 
   describe '#configure' do
-    it 'should handle a string and timeout' do
-      conn = Dor::WorkflowService.configure 'http://externalhost/', timeout: 99
+    let(:conn) { Dor::WorkflowService.configure 'http://externalhost/', timeout: 99 }
+
+    it 'has a timeout' do
       expect(conn).to be_a(Faraday::Connection)
       expect(conn.options.timeout).to eq(99)
       expect(conn.options.open_timeout).to eq(99)
     end
+
+    it 'has a user_agent' do
+      expect(conn.headers).to include('User-Agent' => /dor-workflow-service \d+\.\d+\.\d+/)
+    end
   end
 
   describe '#create_workflow' do

metadata

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