dor-services-client 12.15.0 → 12.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe87932d48e8a6840dff66151357c8fc8e9c86c0e0265a55bd023f941d070ac
-  data.tar.gz: e9a45ea67d9e74b2078330905fdb880af3520284a45745a71580a312a49d576b
+  metadata.gz: 28239d64f9889da5c2eb01d1f7c1a724454a3f9d6e5dc04454e6d537d8b1530c
+  data.tar.gz: abffc94573aa3106b599477bff35c786c4ce4d6ba6bc41e9dea37dc43e8b220a
 SHA512:
-  metadata.gz: bcda85a815b2f7934b925c9e6e90f5afc41f0d14e9c8186112cc2543d67c6505f616d361d05e91ac4639e2e2ce5437e79c09a5677ebaa94376caa08d750ad1a3
-  data.tar.gz: b771139f84a28dfe35094f9ad4105ec2048243d8369eb60935083d6618a31c1f05d76df93dd7f0748f56bba2323a202e092f7dfe7b4ae60e76b0cadbd51b03ae
+  metadata.gz: 70a705670a2f0ac259b7af85806f909311d2222eb0af263d1bcbd2d96bffb0cf34185e2a9a38f4ba8cd5e1da1f3f9d1c01d4d0c490ddf29873a421d40402212e
+  data.tar.gz: 5ff867b49a8d5a552a6d0d5ffada7298fec9d8e19df029f8b79de2899ed1ab65b4058ddf4c0986ae99f1e6c63749bea999e3f165e3bb369416986f19e7e488ad

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.0.0
+  ruby-rails: sul-dlss/ruby-rails@4.1.0
 workflows:
   build:
     jobs:

data/.rubocop.yml

@@ -277,3 +277,20 @@ RSpec/Rails/MinitestAssertions: # new in 2.17
   Enabled: true
 RSpec/Rails/TravelAround: # new in 2.19
   Enabled: true
+
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+RSpec/ReceiveMessages: # new in 2.23
+  Enabled: true
+RSpec/Rails/NegationBeValid: # new in 2.23
+  Enabled: true

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dor-services-client (12.15.0)
+    dor-services-client (12.17.0)
       activesupport (>= 4.2, < 8)
-      cocina-models (~> 0.90.0)
+      cocina-models (~> 0.91.0)
       deprecation
       faraday (~> 2.0)
       faraday-retry
@@ -12,17 +12,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     attr_extras (7.1.0)
+    base64 (0.1.1)
     byebug (11.1.3)
-    cocina-models (0.90.0)
+    cocina-models (0.91.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -32,12 +33,12 @@ GEM
       jsonpath
       nokogiri
       openapi3_parser
-      openapi_parser (>= 0.11.1, < 1.0)
+      openapi_parser (~> 1.0)
       rss
       super_diff
       thor
       zeitwerk (~> 2.1)
-    commonmarker (0.23.9)
+    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
@@ -45,7 +46,7 @@ GEM
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (1.0.0)
@@ -82,28 +83,28 @@ GEM
     jsonpath (1.1.3)
       multi_json
     language_server-protocol (3.17.0.3)
-    minitest (5.18.1)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    nokogiri (1.15.3-x86_64-darwin)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
-    openapi_parser (0.15.0)
-    optimist (3.0.1)
+    openapi_parser (1.0.0)
+    optimist (3.1.0)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.1)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -113,13 +114,14 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rss (0.2.9)
+    rss (0.3.0)
       rexml
-    rubocop (1.54.1)
+    rubocop (1.56.3)
+      base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -127,7 +129,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -136,7 +138,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.23.1)
       rubocop (~> 1.33)
-    rubocop-rspec (2.22.0)
+    rubocop-rspec (2.24.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -156,11 +158,11 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
-    webmock (3.18.1)
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   x86_64-darwin-19

data/dor-services-client.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0', '< 4'
 
   spec.add_dependency 'activesupport', '>= 4.2', '< 8'
-  spec.add_dependency 'cocina-models', '~> 0.90.0'
+  spec.add_dependency 'cocina-models', '~> 0.91.0'
   spec.add_dependency 'deprecation', '>= 0'
   spec.add_dependency 'faraday', '~> 2.0'
   spec.add_dependency 'faraday-retry'

data/lib/dor/services/client/accession.rb

@@ -24,8 +24,7 @@ module Dor
         # @raise [UnexpectedResponse] when the response is not successful.
         def start(params = {})
           resp = connection.post do |req|
-            req.url path
-            req.params = params
+            req.url with_querystring(url: path, params: params)
           end
           return true if resp.success?
 

data/lib/dor/services/client/object_version.rb

@@ -59,9 +59,8 @@ module Dor
         # @return [Cocina::Models::DROWithMetadata|CollectionWithMetadata|AdminPolicyWithMetadata] cocina model with updated version
         def open(**params)
           resp = connection.post do |req|
-            req.url open_new_version_path
+            req.url with_querystring(url: open_new_version_path, params: params)
             req.headers['Content-Type'] = 'application/json'
-            req.body = params.to_json if params.any?
           end
 
           raise_exception_based_on_response!(resp) unless resp.success?
@@ -79,9 +78,8 @@ module Dor
         # @return [String] a message confirming successful closing
         def close(**params)
           resp = connection.post do |req|
-            req.url close_version_path
+            req.url with_querystring(url: close_version_path, params: params)
             req.headers['Content-Type'] = 'application/json'
-            req.body = params.to_json if params.any?
           end
           return resp.body if resp.success?
 

data/lib/dor/services/client/objects.rb

@@ -14,11 +14,10 @@ module Dor
         # @return [Cocina::Models::DROWithMetadata,Cocina::Models::CollectionWithMetadata,Cocina::Models::AdminPolicyWithMetadata] the returned model
         def register(params:, assign_doi: false, validate: false)
           resp = connection.post do |req|
-            req.url objects_path
+            req.url with_querystring(url: objects_path, params: { assign_doi: assign_doi })
             req.headers['Content-Type'] = 'application/json'
             # asking the service to return JSON (else it'll be plain text)
             req.headers['Accept'] = 'application/json'
-            req.params[:assign_doi] = true if assign_doi
             req.body = params.to_json
           end
 

data/lib/dor/services/client/version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '12.15.0'
+      VERSION = '12.17.0'
     end
   end
 end

data/lib/dor/services/client/versioned_service.rb

@@ -25,6 +25,12 @@ module Dor
           AsyncResult.new(url: url)
         end
 
+        def with_querystring(url:, params:)
+          return url if params.blank?
+
+          "#{url}?#{params.to_query}"
+        end
+
         private
 
         attr_reader :connection, :api_version

data/lib/dor/services/client.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 require 'active_support/json'
 require 'active_support/core_ext/object/json'
+require 'active_support/core_ext/object/to_query'
 require 'cocina/models'
 require 'faraday'
 require 'faraday/retry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 12.15.0
+  version: 12.17.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: 0.91.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: 0.91.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement