dor-services-client 3.9.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bceb8dd278f9e782afb494fc38b72157bad6425c3d2bab9c4c8ce8f51c087d
-  data.tar.gz: bda8ba7c5f23ec3e9a231f86ad60e615cdea8c5b621709d38038aee1daa45735
+  metadata.gz: 5bc4758395797b8e5b89c28b1db1587628728e0983e1f85f2985875b80b1f907
+  data.tar.gz: f6e2af51ab5b85c9b5295779f2bb8cf3466deed3016bf9fd281f17657e414919
 SHA512:
-  metadata.gz: 6c921f485d6f2ec30550817b5ca6800b7fa73a3397b8a7c288bf25e574f27d2bb0b32858962bcdff79062b5c17b741ef6758b8d2c53201939d0c27e4c1ac9934
-  data.tar.gz: 3aa62231af7c8caeee3642b2769c7aa91f6b3a280e11dfb0ebd4c6d9a59542ad012be2bfb89706b9cec7a0123937be4589ba5432101ee3aed8682edfdccb7b71
+  metadata.gz: ada4de8d9117375cda2225b2491a57f96c599fd44a77273e2c04c85e1b9a75acdbc82e0da641cb7e1cba16f1ee8b4b0e8e3fdf26eb325c1dff2b02b06d9773f5
+  data.tar.gz: 14b7d08e789e16c122631b18989786e2e2a44a78f010ce8d943694001786f475a9120bb1341d6f2c4cc6f432ae9d261881a436ad4cd5db90f1f7d3209d98a534

data/dor-services-client.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 4.2', '< 7'
   spec.add_dependency 'cocina-models', '~> 0.6.0'
-  spec.add_dependency 'deprecation'
   spec.add_dependency 'faraday', '~> 0.15'
   spec.add_dependency 'moab-versioning', '~> 4.0'
   spec.add_dependency 'nokogiri', '~> 1.8'

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

@@ -5,9 +5,6 @@ module Dor
     class Client
       # API calls relating to files
       class Files < VersionedService
-        extend Deprecation
-        self.deprecation_horizon = 'dor-services-client version 4.0'
-
         # @param object_identifier [String] the pid for the object
         def initialize(connection:, version:, object_identifier:)
           super(connection: connection, version: version)
@@ -26,20 +23,6 @@ module Dor
           resp.body
         end
 
-        # Get the preserved file contents
-        # @param [String] filename the name of the file to retrieve
-        # @param [Integer] version the version of the file to retrieve
-        # @return [String] the file contents from the SDR
-        def preserved_content(filename:, version:)
-          resp = connection.get do |req|
-            req.url "#{api_version}/sdr/objects/#{object_identifier}/content/#{CGI.escape(filename)}?version=#{version}"
-          end
-          return unless resp.success?
-
-          resp.body
-        end
-        deprecation_deprecate preserved_content: 'use preservation-client .content instead'
-
         # Get the list of files in the workspace
         # @return [Array<String>] the list of filenames in the workspace
         def list

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

@@ -15,10 +15,6 @@ module Dor
           @object_identifier = object_identifier
         end
 
-        def sdr
-          @sdr ||= SDR.new(parent_params)
-        end
-
         def metadata
           @metadata ||= Metadata.new(parent_params)
         end

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

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '3.9.2'
+      VERSION = '4.0.0'
     end
   end
 end

data/lib/dor/services/client.rb

@@ -3,27 +3,13 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
-require 'deprecation'
 require 'cocina/models'
 require 'faraday'
 require 'singleton'
 require 'zeitwerk'
 
-class DorServicesClientInflector < Zeitwerk::Inflector
-  def camelize(basename, _abspath)
-    case basename
-    when 'sdr'
-      'SDR'
-    when 'version'
-      'VERSION'
-    else
-      super
-    end
-  end
-end
-
 loader = Zeitwerk::Loader.new
-loader.inflector = DorServicesClientInflector.new
+loader.inflector = Zeitwerk::GemInflector.new(__FILE__)
 loader.push_dir(File.absolute_path("#{__FILE__}/../../.."))
 loader.setup
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,20 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: deprecation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +219,6 @@ files:
 - lib/dor/services/client/objects.rb
 - lib/dor/services/client/release_tags.rb
 - lib/dor/services/client/response_error_formatter.rb
-- lib/dor/services/client/sdr.rb
 - lib/dor/services/client/version.rb
 - lib/dor/services/client/versioned_service.rb
 - lib/dor/services/client/virtual_objects.rb

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

@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-require 'nokogiri'
-require 'moab'
-
-module Dor
-  module Services
-    class Client
-      # Deprecated; remove in release 4.0
-      # API calls that are about preserved objects
-      class SDR < VersionedService
-        extend Deprecation
-        self.deprecation_horizon = 'dor-services-client version 4.0'
-
-        # @param object_identifier [String] the pid for the object
-        def initialize(connection:, version:, object_identifier:)
-          super(connection: connection, version: version)
-          @object_identifier = object_identifier
-        end
-
-        # Gets the current version number for the object
-        # @raise [UnexpectedResponse] when the response is not successful.
-        # @raise [MalformedResponse] when the response is not parseable.
-        # @return [Integer] the current version
-        def current_version
-          xml = current_version_response
-          begin
-            doc = Nokogiri::XML xml
-            raise if doc.root.name != 'currentVersion'
-
-            return Integer(doc.text)
-          rescue StandardError
-            raise MalformedResponse, "Unable to parse XML from current_version API call: #{xml}"
-          end
-        end
-        deprecation_deprecate current_version: 'use preservation-client .current_version instead'
-
-        def signature_catalog
-          resp = signature_catalog_response
-
-          return Moab::SignatureCatalog.new(digital_object_id: object_identifier, version_id: 0) if resp.status == 404
-          raise UnexpectedResponse, ResponseErrorFormatter.format(response: resp, object_identifier: object_identifier) unless resp.success?
-
-          Moab::SignatureCatalog.parse resp.body
-        end
-        deprecation_deprecate signature_catalog: 'use preservation-client .signature_catalog instead'
-
-        # Retrieves file difference manifest for contentMetadata from SDR
-        #
-        # @param [String] current_content The contentMetadata xml
-        # @param [String] subset ('all') The keyword for file attributes 'shelve', 'preserve', 'publish'.
-        # @param [Integer, NilClass] version (nil)
-        # @return [Moab::FileInventoryDifference] the differences for the given content and subset (i.e.: cm_inv_diff manifest)
-        def content_diff(current_content:, subset: 'all', version: nil)
-          raise ArgumentError, "Invalid subset value: #{subset}" unless %w[all shelve preserve publish].include?(subset)
-
-          resp = content_diff_response(current_content: current_content, subset: subset, version: version)
-
-          Moab::FileInventoryDifference.parse(resp)
-        end
-        deprecation_deprecate content_diff: 'use preservation-client .content_inventory_diff instead'
-
-        # @param [String] datastream The identifier of the metadata datastream
-        # @return [String, NilClass] datastream content from previous version of the object (from SDR storage), or nil if response status is 404
-        # @raise [UnexpectedResponse] on an unsuccessful, non-404 response from the server
-        def metadata(datastream:)
-          resp = connection.get do |req|
-            req.url "#{base_path}/metadata/#{datastream}.xml"
-          end
-          return resp.body if resp.success?
-          return if resp.status == 404
-
-          raise UnexpectedResponse, ResponseErrorFormatter.format(response: resp, object_identifier: object_identifier)
-        end
-        deprecation_deprecate metadata: 'use preservation-client .metadata instead'
-
-        private
-
-        attr_reader :object_identifier
-
-        def signature_catalog_response
-          connection.get do |req|
-            req.url "#{base_path}/manifest/signatureCatalog.xml"
-          end
-        end
-
-        # make the request to the server for the currentVersion xml
-        # @raise [UnexpectedResponse] on an unsuccessful response from the server
-        # @return [String] the raw xml from the server
-        def current_version_response
-          resp = connection.get do |req|
-            req.url current_version_path
-          end
-          return resp.body if resp.success?
-
-          raise UnexpectedResponse, ResponseErrorFormatter.format(response: resp, object_identifier: object_identifier)
-        end
-
-        def current_version_path
-          "#{base_path}/current_version"
-        end
-
-        # make the request to the server for the content diff
-        # @raise [UnexpectedResponse] on an unsuccessful response from the server
-        # @return [String] the raw xml from the server
-        def content_diff_response(current_content:, subset:, version:)
-          resp = connection.post do |req|
-            req.url content_diff_path(subset: subset, version: version)
-            req.headers['Content-Type'] = 'application/xml'
-            req.body = current_content
-          end
-          raise UnexpectedResponse, ResponseErrorFormatter.format(response: resp, object_identifier: object_identifier) unless resp.success?
-
-          resp.body
-        end
-
-        def content_diff_path(subset:, version:)
-          query_string = { subset: subset }
-          query_string[:version] = version.to_s unless version.nil?
-          query_string = URI.encode_www_form(query_string)
-          "#{base_path}/cm-inv-diff?#{query_string}"
-        end
-
-        def base_path
-          "#{api_version}/sdr/objects/#{object_identifier}"
-        end
-      end
-    end
-  end
-end