dor-workflow-service 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffae9b6a6c8ad9f6b160c80230c85f97387d9cd96c64ee3954c9c28c5f6d83b8
-  data.tar.gz: b682177ac31b9658cf850721ebcab413fb59ff5d9ab396540e22831330f02eec
+  metadata.gz: 4abc8faa2adf7c8c9f51ed741e5c7347468d1a86c15e7f6d9302500a8985e820
+  data.tar.gz: 9be7245887a6b93ac5461b69f6bea3d72a29e0d906ae14a1ea73b73396145008
 SHA512:
-  metadata.gz: f1c55e5f176a70ba9201e69211a732a7447a1484374df55b9bbcb1113215da2f5c4936fbe966ec08f83f58e7ad34b4a4b9e97fc0b24bdee3cfdde15fc9152896
-  data.tar.gz: 903f5def9d9c11e753600bec6fbe40cfe31396887739cfc4ee1b8a8bf65b1eddfe74ca47f5930d6a8f39de060841c801cc1a333eb6e41adb8f5df0aaf6bf2a34
+  metadata.gz: d6e52377d0c17001f5e98f301b7d4d21c2572f23fd5c6871e9d03f3d1f9678aa4aa53df1893e7301bde5617d94c41b08552716c51565daf427bca2bfad441956
+  data.tar.gz: 7a4f03c9a5bdc93a289256094690d81f40cea5327343eaab1f9def9b556c239bc2c4d2a6a40556ce097ed2f9df71a3b564f24f1305223d4fb987b5dadda578d9

data/.rubocop.yml

@@ -1,5 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.3
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 300
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*_spec.rb

data/.rubocop_todo.yml

@@ -1,157 +1,48 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-08-28 15:56:06 -0700 using RuboCop version 0.32.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-02-01 13:34:49 -0600 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
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Enabled: false
+Lint/AmbiguousRegexpLiteral:
+  Exclude:
+    - 'spec/workflow_service_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedMethodArgument:
-  Enabled: false
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/dor/services/workflow_service.rb'
 
 # Offense count: 2
 Metrics/AbcSize:
-  Max: 32
-
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 16
+  Max: 22
 
 # Offense count: 1
 # Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 202
+Metrics/ClassLength:
+  Max: 250
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 20
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
-Style/AlignHash:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-Style/BlockDelimiters:
-  Enabled: false
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-# Offense count: 4
-Style/ClassVars:
-  Enabled: false
-
-# Offense count: 1
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: Exclude.
-Style/FileName:
-  Enabled: false
-
-# Offense count: 52
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, UseHashRocketsWithSymbolValues.
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/MultilineBlockLayout:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AllowSafeAssignment.
-Style/ParenthesesAroundCondition:
-  Enabled: false
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
-  Enabled: false
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/dor-workflow-service.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Enabled: false
-
-# Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: MultiSpaceAllowedForOperators.
-Style/SpaceAroundOperators:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/SpaceInsideBrackets:
-  Enabled: false
-
-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/SpaceInsideParens:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-Style/SymbolProc:
-  Enabled: false
+# Offense count: 9
+Style/ClassVars:
+  Exclude:
+    - 'lib/dor/services/workflow_service.rb'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dor-workflow-service.gemspec
@@ -7,7 +9,7 @@ gem 'activesupport', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
 group :development, :test do
   gem 'byebug'
-  gem "simplecov"
-  gem "vcr"
+  gem 'simplecov'
+  gem 'vcr'
   gem 'webmock'
 end

data/Rakefile

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => [:spec]
+RuboCop::RakeTask.new
+RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb', 'test/**/*.rb'
-end
+desc 'Run linter and tests'
+task default: %i[rubocop spec]
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/bin/console

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'irb'

data/dor-workflow-service.gemspec

@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dor/workflow_version'
 
@@ -13,21 +14,23 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://consul.stanford.edu/display/DOR/DOR+services#DORservices-initializeworkflow'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ['lib']
 
   gem.add_dependency 'activesupport', '>= 3.2.1', '< 6'
-  gem.add_dependency 'nokogiri', '~> 1.6'
-  gem.add_dependency 'retries'
   gem.add_dependency 'confstruct', '>= 0.2.7', '< 2'
+  gem.add_dependency 'deprecation'
   gem.add_dependency 'faraday', '~> 0.9', '>= 0.9.2'
   gem.add_dependency 'net-http-persistent', '>= 2.9.4', '< 4.a'
+  gem.add_dependency 'nokogiri', '~> 1.6'
+  gem.add_dependency 'retries'
 
+  gem.add_development_dependency 'equivalent-xml', '~> 0.5', '>= 0.5.1'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 3.3'
-  gem.add_development_dependency 'yard'
   gem.add_development_dependency 'redcarpet'
-  gem.add_development_dependency 'equivalent-xml', '~> 0.5', '>= 0.5.1'
+  gem.add_development_dependency 'rspec', '~> 3.3'
+  gem.add_development_dependency 'rubocop', '~> 0.63.1'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'yard'
 end

data/lib/dor-workflow-service.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'dor/workflow_version'
 require 'dor/services/workflow_service'

data/lib/dor/models/response/workflow.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Dor
+  module Workflow
+    module Response
+      # The response form asking the server about a workflow for an item
+      class Workflow
+        def initialize(xml:)
+          @xml = xml
+        end
+
+        # @param [Integer] version the version we are checking for.
+        def active_for?(version:)
+          result = ng_xml.at_xpath("/workflow/process[@version=#{version}]")
+          result ? true : false
+        end
+
+        private
+
+        def ng_xml
+          @ng_xml ||= Nokogiri::XML(@xml)
+        end
+      end
+    end
+  end
+end

data/lib/dor/services/workflow_service.rb

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext'
 require 'nokogiri'
 require 'retries'
 require 'faraday'
 require 'dor/workflow_exception'
+require 'dor/models/response/workflow'
+require 'deprecation'
 
 module Dor
-
   # TODO: major version revision: change pattern of usage to be normal non-singleton class
   # TODO: convert @@class_vars to regular attributes
   # TODO: create normal initalize method, deprecate configure
@@ -17,6 +20,7 @@ module Dor
 
   # Create and update workflows
   class WorkflowService
+    extend Deprecation
     class << self
       @@handler  = nil
       @@logger   = nil
@@ -25,7 +29,7 @@ module Dor
       @@http_conn = nil
 
       # From Workflow Service's admin/Process.java
-      VALID_STATUS = %w{waiting completed error queued skipped hold}
+      VALID_STATUS = %w[waiting completed error queued skipped hold].freeze
 
       # Creates a workflow for a given object in the repository.  If this particular workflow for this objects exists,
       # it will replace the old workflow with wf_xml passed to this method.  You have the option of creating a datastream or not.
@@ -41,14 +45,12 @@ module Dor
       # @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})
+      def create_workflow(repo, druid, workflow_name, wf_xml, opts = { create_ds: true })
         lane_id = opts.fetch(:lane_id, 'default')
         xml = add_lane_id_to_workflow_xml(lane_id, wf_xml)
         status = workflow_resource_method "#{repo}/objects/#{druid}/workflows/#{workflow_name}", 'put', xml,
-          {
-            :content_type => 'application/xml',
-            :params       => { 'create-ds' => opts[:create_ds] }
-          }
+                                          content_type: 'application/xml',
+                                          params: { 'create-ds' => opts[:create_ds] }
         true
       end
 
@@ -75,13 +77,14 @@ module Dor
       #     <process name=\"convert\" status=\"completed\" />"
       def update_workflow_status(repo, druid, workflow, process, status, opts = {})
         raise ArgumentError, "Unknown status value #{status}" unless VALID_STATUS.include?(status.downcase)
-        opts = { :elapsed => 0, :lifecycle => nil, :note => nil }.merge!(opts)
+
+        opts = { elapsed: 0, lifecycle: nil, note: nil }.merge!(opts)
         opts[:elapsed] = opts[:elapsed].to_s
         current_status = opts.delete(:current_status)
-        xml = create_process_xml({ :name => process, :status => status.downcase }.merge!(opts))
+        xml = create_process_xml({ name: process, status: status.downcase }.merge!(opts))
         uri = "#{repo}/objects/#{druid}/workflows/#{workflow}/#{process}"
-        uri << "?current-status=#{current_status.downcase}" if current_status
-        workflow_resource_method(uri, 'put', xml, { :content_type => 'application/xml' })
+        uri += "?current-status=#{current_status.downcase}" if current_status
+        workflow_resource_method(uri, 'put', xml, content_type: 'application/xml')
         true
       end
 
@@ -95,7 +98,8 @@ module Dor
       def get_workflow_status(repo, druid, workflow, process)
         workflow_md = get_workflow_xml(repo, druid, workflow)
         doc = Nokogiri::XML(workflow_md)
-        raise Dor::WorkflowException.new("Unable to parse response:\n#{workflow_md}") if doc.root.nil?
+        raise Dor::WorkflowException, "Unable to parse response:\n#{workflow_md}" if doc.root.nil?
+
         processes = doc.root.xpath("//process[@name='#{process}']")
         process = processes.max { |a, b| a.attr('version').to_i <=> b.attr('version').to_i }
         process&.attr('status')
@@ -122,7 +126,7 @@ module Dor
       #   => ["accessionWF", "assemblyWF", "disseminationWF"]
       def get_workflows(pid, repo = 'dor')
         xml_doc = Nokogiri::XML(get_workflow_xml(repo, pid, ''))
-        xml_doc.xpath('//workflow').collect {|workflow| workflow['id']}
+        xml_doc.xpath('//workflow').collect { |workflow| workflow['id'] }
       end
 
       # Get active workflow names into an array for given PID
@@ -135,8 +139,18 @@ module Dor
       #   Dor::WorkflowService.get_active_workflows('dor', 'druid:sr100hp0609')
       #   => ["accessionWF", "assemblyWF", "disseminationWF"]
       def get_active_workflows(repo, pid)
+        Deprecation.warn(self, 'get_active_workflows will be removed without replacement because the workflow server no longer archives processes')
         doc = Nokogiri::XML(get_workflow_xml(repo, pid, ''))
-        doc.xpath( %(//workflow[not(process/@archived)]/@id ) ).map {|n| n.value}
+        doc.xpath(%(//workflow[not(process/@archived)]/@id )).map(&:value)
+      end
+
+      # @param [String] repo repository of the object
+      # @param [String] pid id of object
+      # @param [String] workflow_name The name of the workflow
+      # @return [Workflow::Response::Workflow]
+      def workflow(repo: 'dor', pid:, workflow_name:)
+        xml = get_workflow_xml(repo, pid, workflow_name)
+        Workflow::Response::Workflow.new(xml: xml)
       end
 
       # Updates the status of one step in a workflow to error.
@@ -157,9 +171,9 @@ module Dor
       #     PUT "/dor/objects/pid:123/workflows/GoogleScannedWF/convert"
       #     <process name=\"convert\" status=\"error\" />"
       def update_workflow_error_status(repo, druid, workflow, process, error_msg, opts = {})
-        opts = {:error_text => nil}.merge!(opts)
-        xml = create_process_xml({:name => process, :status => 'error', :errorMessage => error_msg}.merge!(opts))
-        workflow_resource_method "#{repo}/objects/#{druid}/workflows/#{workflow}/#{process}", 'put', xml, {:content_type => 'application/xml'}
+        opts = { error_text: nil }.merge!(opts)
+        xml = create_process_xml({ name: process, status: 'error', errorMessage: error_msg }.merge!(opts))
+        workflow_resource_method "#{repo}/objects/#{druid}/workflows/#{workflow}/#{process}", 'put', xml, content_type: 'application/xml'
         true
       end
 
@@ -188,6 +202,7 @@ module Dor
         doc = query_lifecycle(repo, druid)
         milestone = doc.at_xpath("//lifecycle/milestone[text() = '#{milestone}']")
         return Time.parse(milestone['date']) if milestone
+
         nil
       end
 
@@ -206,6 +221,7 @@ module Dor
         doc = query_lifecycle(repo, druid, true)
         milestone = doc.at_xpath("//lifecycle/milestone[text() = '#{milestone}']")
         return Time.parse(milestone['date']) if milestone
+
         nil
       end
 
@@ -213,7 +229,7 @@ module Dor
       def get_milestones(repo, druid)
         doc = query_lifecycle(repo, druid)
         doc.xpath('//lifecycle/milestone').collect do |node|
-          { :milestone => node.text, :at => Time.parse(node['date']), :version => node['version'] }
+          { milestone: node.text, at: Time.parse(node['date']), version: node['version'] }
         end
       end
 
@@ -271,12 +287,12 @@ module Dor
         if completed
           Array(completed).each do |step|
             completed_param = qualify_step(options[:default_repository], options[:default_workflow], step)
-            uri_string << "&completed=#{completed_param}"
+            uri_string += "&completed=#{completed_param}"
           end
         end
 
-        uri_string << "&limit=#{options[:limit].to_i}"  if options[:limit] && options[:limit].to_i > 0
-        uri_string << "&lane-id=#{lane_id}"
+        uri_string += "&limit=#{options[:limit].to_i}" if options[:limit]&.to_i&.positive?
+        uri_string += "&lane-id=#{lane_id}"
 
         resp = workflow_resource_method uri_string
         #
@@ -367,7 +383,7 @@ module Dor
       # @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) + '&count-only=true'
-        doc = Nokogiri::XML(workflow_resource_method uri_string)
+        doc = Nokogiri::XML(workflow_resource_method(uri_string))
         doc.at_xpath('/objects/@count').value.to_i
       end
 
@@ -375,8 +391,8 @@ module Dor
       # @return [String]
       def create_process_xml(params)
         builder = Nokogiri::XML::Builder.new do |xml|
-          attrs = params.reject { |k, v| v.nil? }
-          attrs = Hash[ attrs.map {|k, v| [k.to_s.camelize(:lower), v]}]  # camelize all the keys in the attrs hash
+          attrs = params.reject { |_k, v| v.nil? }
+          attrs = Hash[attrs.map { |k, v| [k.to_s.camelize(:lower), v] }] # camelize all the keys in the attrs hash
           xml.process(attrs)
         end
         builder.to_xml
@@ -385,8 +401,8 @@ module Dor
       # @return [Nokogiri::XML::Document]
       def query_lifecycle(repo, druid, active_only = false)
         req = "#{repo}/objects/#{druid}/lifecycle"
-        req << '?active-only=true' if active_only
-        Nokogiri::XML(workflow_resource_method req)
+        req += '?active-only=true' if active_only
+        Nokogiri::XML(workflow_resource_method(req))
       end
 
       # @param [String] repo The repository the object resides in.  The service recoginzes "dor" and "sdr" at the moment
@@ -400,10 +416,11 @@ module Dor
 
       # @param [String] repo The repository the object resides in.  The service recoginzes "dor" and "sdr" at the moment
       # @param [String] druid The id of the object to delete the workflow from
-      def archive_workflow(repo, druid, wf_name, version_num = nil)
+      def archive_workflow(_repo, druid, wf_name, version_num = nil)
         raise 'Please call Dor::WorkflowService.configure(workflow_service_url, :dor_services_url => DOR_SERVIES_URL) once before archiving workflow' if @@dor_services_url.nil?
+
         url = "/v1/objects/#{druid}/workflows/#{wf_name}/archive"
-        url << "/#{version_num}" if version_num
+        url += "/#{version_num}" if version_num
         workflow_resource_method(url, 'post', '')
       end
 
@@ -417,7 +434,7 @@ module Dor
       # @param [Boolean] create_accession_wf Option to create accessionWF when closing a version.  Defaults to true
       def close_version(repo, druid, create_accession_wf = true)
         uri = "#{repo}/objects/#{druid}/versionClose"
-        uri << '?create-accession=false' unless create_accession_wf
+        uri += '?create-accession=false' unless create_accession_wf
         workflow_resource_method(uri, 'post', '')
         true
       end
@@ -430,7 +447,7 @@ module Dor
       # @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_method uri)
+        doc = Nokogiri::XML(workflow_resource_method(uri))
         nodes = doc.xpath('/lanes/lane')
         nodes.map { |n| n['id'] }
       end
@@ -439,6 +456,7 @@ module Dor
       # @return [Faraday::Connection] the REST client resource created during configure()
       def workflow_resource
         raise 'Please call Dor::WorkflowService.configure(url) once before calling any WorkflowService methods' if @@http_conn.nil?
+
         @@http_conn
       end
 
@@ -476,7 +494,7 @@ module Dor
         @@dor_services_url = opts[:dor_services_url] if opts[:dor_services_url]
         # params[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(opts[:client_cert_file])) if opts[:client_cert_file]
         # params[:ssl_client_key]  = OpenSSL::PKey::RSA.new(File.read(opts[:client_key_file]), opts[:client_key_pass]) if opts[:client_key_file]
-        @@handler = Proc.new do |exception, attempt_number, total_delay|
+        @@handler = proc do |exception, attempt_number, total_delay|
           @@logger.warn "[Attempt #{attempt_number}] #{exception.class}: #{exception.message}; #{total_delay} seconds elapsed."
         end
         @@http_conn = case url_or_connection
@@ -484,7 +502,7 @@ module Dor
                         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.adapter :net_http_persistent # use Keep-Alive connections
                           faraday.options.params_encoder = Faraday::FlatParamsEncoder
                           if opts.key? :timeout
                             faraday.options.timeout = opts[:timeout]
@@ -505,8 +523,8 @@ module Dor
 
       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]
-        uri_string << "&limit=#{opts[:limit]}"         if opts[:limit]
+        uri_string += "&hours-ago=#{opts[:hours_ago]}" if opts[:hours_ago]
+        uri_string += "&limit=#{opts[:limit]}"         if opts[:limit]
         uri_string
       end
 
@@ -514,10 +532,10 @@ module Dor
         doc = Nokogiri::XML(xml)
         doc.xpath('/workflows/workflow').collect do |wf_node|
           {
-            :workflow => wf_node['name'],
-            :step     => wf_node['process'],
-            :druid    => wf_node['druid'],
-            :lane_id  => wf_node['laneId']
+            workflow: wf_node['name'],
+            step: wf_node['process'],
+            druid: wf_node['druid'],
+            lane_id: wf_node['laneId']
           }
         end
       end
@@ -535,7 +553,8 @@ module Dor
 
       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?
+        raise Dor::WorkflowException, 'Unable to determine count from response' if node.nil?
+
         node['count'].to_i
       end
 
@@ -547,7 +566,7 @@ module Dor
       # @param [Hash] opts addtional headers options
       # @return [Object] response from method
       def workflow_resource_method(uri_string, meth = 'get', payload = '', opts = {})
-        with_retries(:max_tries => 2, :handler => @@handler, :rescue => workflow_service_exceptions_to_catch) do |attempt|
+        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 = send_workflow_resource_request(uri_string, meth, payload, opts)