dor-services-client 6.2.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bfa9e7819d9794826fb95861eb36bcaa9f426280dd96267b2739f4693606c1f
-  data.tar.gz: df0c3d033e30d17ecafed72c66406dc33ae6f8f682434e43feb8a47f9b97358f
+  metadata.gz: c057651f9c343a1a592e2951a815b0d5c0cdec7fa43b2925982b0584aaddf261
+  data.tar.gz: 2041a09516b4b2adba053994943e6e07d154740ad4684b790ca5cf8e0b84e1d0
 SHA512:
-  metadata.gz: 4edbf5f3ee992ed4accae4225e16d294c9b5aeb8d9c7507164afd2242933040cbf4067b79388c254dfab6263a224d8d6b85655a07a5cf22f4236f41318d5297a
-  data.tar.gz: d52a6f01e86def397871069447cda06886fd1fc5e94f9af98c651d6d8b7e88e8b170530e89bbf35b89d764aa0ad82a743eb9a1434723db45af920df7a7a4d34e
+  metadata.gz: 5432deb7b0e0458aceef04294f306981ac171e36b7f397f184b38ecb61009c15ba1b6fe802dbfc13174303a93695f663062915110fa04e96091d5b22c1b55a38
+  data.tar.gz: b30ea0ed92da62ac197ea4ede8149a1a95f79ec937cfb90c08a7b14e24fa2b3ed085fb2ddfc4f2553724b736b745c3eddb6b7200dfc025718b87fe9dc2658865

data/.github/pull_request_template.md

@@ -1,4 +1,12 @@
 ## Why was this change made?
 
 
-## Was the documentation (README, API, wiki, consul, etc.) updated?
+
+## How was this change tested?
+
+
+
+## Which documentation and/or configurations were updated?
+
+
+

data/.rubocop_todo.yml

@@ -32,5 +32,5 @@ Style/Documentation:
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Layout/LineLength:
+Metrics/LineLength:
   Max: 164

data/README.md

@@ -169,6 +169,9 @@ object_client.workspace.reset
 
 # Update embargo
 object_client.embargo.update(embargo_date: date_string, requesting_user: username_string)
+
+# Search for administrative tags:
+Dor::Services::Client.administrative_tags.search(q: 'Project')
 ```
 
 ## Asynchronous results

data/dor-services-client.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport', '>= 4.2', '< 7'
-  spec.add_dependency 'cocina-models', '~> 0.32.0' # leave pinned to patch level until cocina-models hits 1.0
+  spec.add_dependency 'cocina-models', '~> 0.33.0' # leave pinned to patch level until cocina-models hits 1.0
   spec.add_dependency 'deprecation', '>= 0'
   spec.add_dependency 'faraday', '>= 0.15', '< 2'
   spec.add_dependency 'moab-versioning', '~> 4.0'

data/lib/dor/services/client.rb

@@ -36,6 +36,9 @@ module Dor
       # Error that is raised when the remote server returns a 401 Unauthorized
       class UnauthorizedResponse < UnexpectedResponse; end
 
+      # Error that is raised when the remote server returns a 409 Conflict
+      class ConflictResponse < UnexpectedResponse; end
+
       # Error that is raised when the remote server returns some unparsable response
       class MalformedResponse < Error; end
 
@@ -56,6 +59,11 @@ module Dor
         @object = Object.new(connection: connection, version: DEFAULT_VERSION, object_identifier: object_identifier)
       end
 
+      # @return [Dor::Services::Client::AdministrativeTagSearch] an instance of the `Client::AdministrativeTagSearch` class
+      def administrative_tags
+        @administrative_tags ||= AdministrativeTagSearch.new(connection: connection, version: DEFAULT_VERSION)
+      end
+
       # @return [Dor::Services::Client::Objects] an instance of the `Client::Objects` class
       def objects
         @objects ||= Objects.new(connection: connection, version: DEFAULT_VERSION)
@@ -91,7 +99,8 @@ module Dor
           self
         end
 
-        delegate :background_job_results, :marcxml, :objects, :object, :virtual_objects, to: :instance
+        delegate :background_job_results, :marcxml, :objects, :object,
+                 :virtual_objects, :administrative_tags, to: :instance
       end
 
       attr_writer :url, :token, :connection, :enable_get_retries
@@ -119,10 +128,7 @@ module Dor
           builder.adapter Faraday.default_adapter
           builder.headers[:user_agent] = user_agent
           builder.headers[TOKEN_HEADER] = "Bearer #{token}"
-          if with_retries
-            builder.request :retry, max: 4, interval: 1,
-                                    backoff_factor: 2, exceptions: ['Faraday::Error', 'Timeout::Error']
-          end
+          builder.request :retry, max: 4, interval: 1, backoff_factor: 2 if with_retries
         end
       end
 

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'active_support/json' # required for serializing time as iso8601
+
+module Dor
+  module Services
+    class Client
+      # API calls that are about searching AdministrativeTags
+      class AdministrativeTagSearch < VersionedService
+        # rubocop:disable Naming/UncommunicativeMethodParamName
+        def search(q:)
+          resp = connection.get do |req|
+            req.url "#{api_version}/administrative_tags/search?q=#{q}"
+          end
+
+          # Since argo is using this as a proxy, no need to parse the response.
+          return resp.body if resp.success?
+
+          raise_exception_based_on_response!(resp)
+        end
+        # rubocop:enable Naming/UncommunicativeMethodParamName
+      end
+    end
+  end
+end

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

@@ -21,10 +21,11 @@ module Dor
         # @option opts [Hash] :identity Data for identity metadata
         # @option opts [Hash] :technical Data for technical metadata
         # @option opts [Hash] :provenance Data for provenance metadata
+        # @option opts [Hash] :geo Data for geographic metadata
         # @example:
         #  legacy_update(descriptive: { updated: '2001-12-20', content: '<descMetadata />' })
         def legacy_update(opts)
-          opts = opts.slice(:descriptive, :rights, :identity, :content, :technical, :provenance)
+          opts = opts.slice(:descriptive, :rights, :identity, :content, :technical, :provenance, :geo)
           resp = connection.patch do |req|
             req.url "#{base_path}/legacy"
             req.headers['Content-Type'] = 'application/json'

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '6.2.0'
+      VERSION = '6.6.0'
     end
   end
 end

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

@@ -19,18 +19,22 @@ module Dor
 
         attr_reader :connection, :api_version
 
+        # rubocop:disable Metrics/MethodLength
         def raise_exception_based_on_response!(response, object_identifier = nil)
           exception_class = case response.status
                             when 404
                               NotFoundResponse
                             when 401
                               UnauthorizedResponse
+                            when 409
+                              ConflictResponse
                             else
                               UnexpectedResponse
                             end
           raise exception_class,
                 ResponseErrorFormatter.format(response: response, object_identifier: object_identifier)
         end
+        # rubocop:enable Metrics/MethodLength
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +228,7 @@ files:
 - dor-services-client.gemspec
 - lib/dor/services/client.rb
 - lib/dor/services/client/accession.rb
+- lib/dor/services/client/administrative_tag_search.rb
 - lib/dor/services/client/administrative_tags.rb
 - lib/dor/services/client/async_result.rb
 - lib/dor/services/client/background_job_results.rb