preservation-client 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8382e6e4993d58f70000d22aa01ed1445ce9e04c936b925c8c7d95ba0aa082
-  data.tar.gz: c8d2c619e732d4d2767f565df028b24cdd68d7f6c08a22213bb60be74302756f
+  metadata.gz: 7eee0269825cc3a5d9d0829cb77182adbc808bca2fe5d7dab6a7fc835d387e1d
+  data.tar.gz: b6bf9a6c5b2999beaece87a2501a31e8c436258f9dc44bd8c5eadf6e8fc9e520
 SHA512:
-  metadata.gz: d615d2d61a5beaa03c21a43e3df4808fc3b7fec90a674c5cfdb82dd8438801eb72e66f863424852717eaaf51fe8891736599aed0a21c2dc571b9d8b59bfde6c6
-  data.tar.gz: 0cfa10e23ab7a1baa0d0748df1189b31d95a44f1711ceab5ece29ee61c19a8e056dd1eaabfa73dd492c96e66fefa56297ba1f795b276d57f3fba8f65961d9bc1
+  metadata.gz: '0855b28859c90a6a5f65d648434dc2895f2da1eb69cbebac0b0ebad90a451c71cd1122a3664ea073b64aa96fe945c26a358e8d756569d47b1180f56d79198ded'
+  data.tar.gz: b50c7d13f330e7cd5fcd3b651adc7570ced9db6c40c658d8f14f6f3dafc3d5e250f0ddf4088e3888a7e39e28c91406996770b21a718779b08e9e8688a2233ffb

data/.circleci/config.yml

@@ -1,35 +1,10 @@
 version: 2.1
-
-jobs:
+orbs:
+  ruby-rails: sul-dlss/ruby-rails@2.0.0
+workflows:
   build:
-    docker:
-      - image: circleci/ruby:2.7.1
-        environment:
-          CC_TEST_REPORTER_ID: 02e8afad8d0b699828dd69b6f45b598e7317b2d9828ea23380c3a97113068a0c
-          RAILS_ENV: test
-    steps:
-      - checkout
-      - run:
-          name: Install Bundler
-          command: gem install bundler
-      - run:
-          name: Which bundler?
-          command: bundle -v
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-      - run:
-          name: Lint using rubocop
-          command: bundle exec rubocop
-      - run:
-          name: Setup Code Climate test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
-            ./cc-test-reporter before-build
-      - run:
-          name: rspec
-          command: bundle exec rspec
-      - run:
-          name: upload test coverage report to Code Climate
-          command: ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?
+    jobs:
+      - ruby-rails/lint:
+          name: lint
+      - ruby-rails/test-gem:
+          name: test

data/.rubocop.yml

@@ -1,7 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-rspec
+  - rubocop-rake
+
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
 
 Layout/EmptyLinesAroundClassBody:
   Enabled: false
@@ -11,7 +15,7 @@ Metrics/BlockLength:
     - 'preservation-client.gemspec'
     - 'spec/**/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - 'lib/preservation/client/response_error_formatter.rb'
@@ -26,3 +30,117 @@ Style/Documentation:
 
 Style/WordArray:
   Enabled: false
+
+Gemspec/DateAssignment: # new in 1.10
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Layout/SpaceBeforeBrackets: # new in 1.7
+  Enabled: true
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: true
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: true
+Lint/EmptyBlock: # new in 1.1
+  Enabled: true
+Lint/EmptyClass: # new in 1.3
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/ArgumentsForwarding: # new in 1.1
+  Enabled: true
+Style/CollectionCompact: # new in 1.2
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # new in 1.1
+  Enabled: true
+Style/EndlessMethod: # new in 1.8
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/HashExcept: # new in 1.7
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: true
+Style/NilLambda: # new in 1.3
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SwapValues: # new in 1.1
+  Enabled: true
+
+RSpec/ExcessiveDocstringSpacing: # new in 2.5
+  Enabled: true
+RSpec/IdenticalEqualityAssertion: # new in 2.4
+  Enabled: true
+RSpec/SubjectDeclaration: # new in 2.5
+  Enabled: true
+RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+  Enabled: true
+RSpec/Rails/AvoidSetupHook: # new in 2.4
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,15 +1,92 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-01-27 18:06:55 -0800 using RuboCop version 0.77.0.
+# `rubocop --auto-gen-config --auto-gen-only-exclude`
+# on 2022-01-14 04:40:44 UTC using RuboCop version 1.24.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
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'preservation-client.gemspec'
+
 # Offense count: 2
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
-  Max: 34
+  Exclude:
+    - 'lib/preservation/client/versioned_api_service.rb'
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods, Max.
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Exclude:
+    - 'lib/preservation/client/versioned_api_service.rb'
+
+# Offense count: 1
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/preservation/client_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: Max, CountAsOne.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/preservation/client/objects_spec.rb'
+    - 'spec/preservation/client_spec.rb'
+
+# Offense count: 1
+RSpec/IdenticalEqualityAssertion:
+  Exclude:
+    - 'spec/preservation/client_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: Max.
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/preservation/client/objects_spec.rb'
+    - 'spec/preservation/client/response_error_formatter_spec.rb'
+    - 'spec/preservation/client_spec.rb'
+
+# Offense count: 66
+# Configuration parameters: AllowSubject, Max.
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+    - 'spec/preservation/client/catalog_spec.rb'
+    - 'spec/preservation/client/objects_spec.rb'
+    - 'spec/preservation/client/response_error_formatter_spec.rb'
+    - 'spec/preservation/client/versioned_api_service_spec.rb'
+
+# Offense count: 10
+# Configuration parameters: IgnoreSharedExamples.
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/preservation/client/versioned_api_service_spec.rb'
+
+# Offense count: 10
+# Configuration parameters: Max.
+RSpec/NestedGroups:
+  Exclude:
+    - 'spec/preservation/client/catalog_spec.rb'
+    - 'spec/preservation/client/versioned_api_service_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+RSpec/ScatteredLet:
+  Exclude:
+    - 'spec/preservation/client/objects_spec.rb'
+
+# Offense count: 24
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/preservation/client/objects_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/preservation/client/response_error_formatter_spec.rb'

data/lib/preservation/client/error_faraday_middleware.rb

@@ -4,7 +4,7 @@ module Preservation
   class Client
     # This wraps any faraday connection errors with preservation-client errors
     # see https://www.rubydoc.info/gems/faraday/Faraday/ClientError for info on errors
-    class ErrorFaradayMiddleware < Faraday::Response::Middleware
+    class ErrorFaradayMiddleware < Faraday::Middleware
       def call(env)
         @app.call(env)
       rescue Faraday::ConnectionFailed, Faraday::SSLError, Faraday::TimeoutError => e

data/lib/preservation/client/version.rb

@@ -2,6 +2,6 @@
 
 module Preservation
   class Client
-    VERSION = '3.3.1'
+    VERSION = '4.0.0'
   end
 end

data/lib/preservation/client/versioned_api_service.rb

@@ -31,7 +31,7 @@ module Preservation
         raise NotFoundError, errmsg
       rescue Faraday::Error => e
         errmsg = "Preservation::Client.#{caller_locations.first.label} for #{object_id} " \
-          "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
+                 "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
         raise UnexpectedResponseError, errmsg
       end
 
@@ -90,11 +90,11 @@ module Preservation
         raise UnexpectedResponseError, errmsg
       rescue Faraday::ResourceNotFound => e
         errmsg = "Preservation::Client.#{caller_locations.first.label} " \
-          "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
+                 "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
         raise NotFoundError, errmsg
       rescue Faraday::Error => e
         errmsg = "Preservation::Client.#{caller_locations.first.label} " \
-          "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
+                 "got #{e.response[:status]} from Preservation at #{req_url}: #{e.response[:body]}"
         exception_class = e.response[:status] == 423 ? LockedError : UnexpectedResponseError
         raise exception_class, errmsg
       end

data/lib/preservation/client.rb

@@ -63,6 +63,7 @@ module Preservation
     end
 
     attr_writer :url, :connection, :token
+
     delegate :update, to: :catalog
 
     private

data/preservation-client.gemspec

@@ -27,17 +27,21 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.7' # 3.0 except for dor-services-app
 
-  spec.add_dependency 'activesupport', '>= 4.2', '< 7'
-  spec.add_dependency 'faraday', '>= 0.15', '< 2.0'
-  spec.add_dependency 'moab-versioning', '~> 4.3'
+  spec.add_dependency 'activesupport', '>= 4.2', '< 8'
+  spec.add_dependency 'faraday', '~> 2.0'
+  spec.add_dependency 'moab-versioning', '~> 5.0'
   spec.add_dependency 'zeitwerk', '~> 2.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.77.0'
-  spec.add_development_dependency 'simplecov', '~> 0.17.0' # For CodeClimate
+  spec.add_development_dependency 'rubocop', '~> 1.24'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.1'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: preservation-client
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,25 +29,19 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.15'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.15'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -56,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -140,28 +134,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '1.24'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +232,7 @@ metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://github.com/sul-dlss/preservation-client
   source_code_uri: https://github.com/sul-dlss/preservation-client.
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -218,14 +241,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.19
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A thin client for getting info from SDR preservation.