sdr-client 2.3.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 797ccc774c2d310146d945ce3dc5a58d2e2767a40608308cda938df7931bcdf7
-  data.tar.gz: b668cc544d1b0c593d2458b47658c768eafdf94bf0ea361be02b6f67c5af4b44
+  metadata.gz: '0389c464ad43e038268dc5242aff43d16229135dfead77a90a4ff8bba3e6009f'
+  data.tar.gz: 2c1ec7488c915f3a82a4f8c5d822539bec42ce1364163740301aa6ef5bcc771e
 SHA512:
-  metadata.gz: b7e999d795ed744dd7b2d51774718c9840a9ffa56430fe0947b53a7cabffa83ff611164af19576bf3c8b68331edcb25cd2a6063ac7bc8ce16acaaa3a58d184d5
-  data.tar.gz: f010f0624f37c1208d782ead081ea55610b9edbeffdfe4777b47192462278ea270588e5e8f0bdeb947ffc69bd3bf8712e32fedc8f46de71f4b063f3df563dd75
+  metadata.gz: c756bb46d362597a15907ce763b6212735745074e8604bfc34ed9f712f719c770103353003c93df7e014e066d74a3473da30c5f0d5186563892a7f4df10ff8b9
+  data.tar.gz: b5322b234dce3fcf3a8b3cfa5b40da2f65b4bcc7fcccba6f6cfe4f107e0e2dac688a804056d154c65c54259344b454c6f0de630b680aeb4fc4d9e0daaaff156f

data/.circleci/config.yml

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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    sdr-client (2.3.1)
+    sdr-client (2.5.0)
       activesupport
-      cocina-models (~> 0.89.0)
+      cocina-models (~> 0.90.0)
       config
       dry-monads
       faraday (>= 0.16)
@@ -12,17 +12,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.2)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     attr_extras (7.1.0)
     byebug (11.1.3)
-    cocina-models (0.89.1)
+    cocina-models (0.90.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -37,9 +37,9 @@ GEM
       super_diff
       thor
       zeitwerk (~> 2.1)
-    commonmarker (0.23.8)
+    commonmarker (0.23.9)
     concurrent-ruby (1.2.2)
-    config (4.1.0)
+    config (4.2.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     crack (0.4.5)
@@ -65,12 +65,12 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-schema (1.13.0)
+    dry-schema (1.13.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (>= 1.5, < 2)
+      dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
     dry-struct (1.6.0)
@@ -94,50 +94,51 @@ GEM
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.7.4)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     hashdiff (1.0.1)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.6.3)
-    jsonpath (1.1.2)
+    jsonpath (1.1.3)
       multi_json
     launchy (2.5.2)
       addressable (~> 2.8)
     minitest (5.18.0)
     multi_json (1.15.0)
-    nokogiri (1.14.2-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
     openapi_parser (0.15.0)
     optimist (3.0.1)
-    parallel (1.22.1)
-    parser (3.2.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)
-    racc (1.6.2)
+    racc (1.7.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
@@ -145,25 +146,28 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.48.0)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
+    rubocop-rspec (2.22.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     simplecov (0.22.0)
@@ -172,11 +176,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    super_diff (0.9.0)
+    super_diff (0.10.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.2.1)
+    thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
@@ -184,7 +188,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   x86_64-darwin-19
@@ -206,4 +210,4 @@ DEPENDENCIES
   webmock (~> 3.7)
 
 BUNDLED WITH
-   2.3.17
+   2.4.13

data/lib/sdr_client/deposit/files/direct_upload_request.rb

@@ -10,19 +10,37 @@ module SdrClient
           checksum = Digest::MD5.file(path).base64digest
           new(checksum: checksum,
               byte_size: ::File.size(path),
-              content_type: content_type || 'application/octet-stream',
+              content_type: clean_and_translate_content_type(content_type),
               filename: file_name)
         end
 
         def as_json
           {
-            blob: { filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type }
+            blob: { filename: filename, byte_size: byte_size, checksum: checksum,
+                    content_type: self.class.clean_and_translate_content_type(content_type) }
           }
         end
 
         def to_json(*_args)
           JSON.generate(as_json)
         end
+
+        # Invalid JSON files with a content type of application/json will trigger 400 errors in sdr-api
+        # since they are parsed and rejected (not clear why and what part of the stack is doing this).
+        # The work around is to change the content_type for any JSON files to a custom stand-in and
+        # specific to avoid the parsing, and then have this translated back to application/json after .
+        # upload is complete. There is a corresponding change in sdr-api to translate the content_type back
+        # before the Cocina is saved.
+        # See https://github.com/sul-dlss/happy-heron/issues/3075 for the original bug report
+        # See https://github.com/sul-dlss/sdr-api/pull/585 for the change in sdr-api
+        def self.clean_and_translate_content_type(content_type)
+          return 'application/octet-stream' if content_type.blank?
+
+          # ActiveStorage is expecting "application/x-stata-dta" not "application/x-stata-dta;version=14"
+          content_type = content_type.split(';')&.first
+
+          content_type == 'application/json' ? 'application/x-stanford-json' : content_type
+        end
       end
     end
   end

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '2.3.1'
+  VERSION = '2.5.0'
 end

data/sdr-client.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'cocina-models', '~> 0.89.0'
+  spec.add_dependency 'cocina-models', '~> 0.90.0'
   spec.add_dependency 'config'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.0
+        version: 0.90.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
   name: config
   requirement: !ruby/object:Gem::Requirement
@@ -289,7 +289,7 @@ metadata:
   source_code_uri: https://github.com/sul-dlss/sdr-client
   changelog_uri: https://github.com/sul-dlss/sdr-client/releases
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,8 +304,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api
 test_files: []