shrine 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9762e59a3b310aecf9e4c2789e35df5b814826cf1db60e258faed44fdb1efe6
-  data.tar.gz: 857d1abbb026440d32e105cbbd248a89792e4f7b094b7e9509c2a735de32dfe0
+  metadata.gz: 26dd77c39f9d5b7cc4240eacea23823453959aad469acc1d86571f129c24c347
+  data.tar.gz: 9c25f9de3f8c8be835e096da01b47c0636e03158b423a306b89895de05ca4294
 SHA512:
-  metadata.gz: b295b7d382c7e73384fcb69f3df1b049427ea2c40e5a84bd4505295cdc8e423aee7e8d76d7b153ecf7c5e0dbea6208d1a693448ee6e97037a9ebeff5fb9ebf46
-  data.tar.gz: 8263b3c88336b7ab9e7744ab3de1cae8cc00474af72e95d7c85fca96f89f900c6f347dc7ceaf440143ee5410bd7d00a8a85dab342644fb052ccdf81b974a185e
+  metadata.gz: 4ae941f20c889d15300bb0a3bb522f8ad9f0cbd9bb80578246bc4d5ed37b1177ecc911172a405872919210bdaa05b1e67f23d77fc97d9c827ef85b01898dd336
+  data.tar.gz: 16fbafcc5d29e70f6d0d4a36fc2123a4a8f705345021b00e87c863826d73970a7bd8116aa19ad5c3a2a03763b0e5e435398ae15a21428d0b932c52a7bb648f8e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.2 (2020-08-05)
+
+* `s3` – Fix `S3#open` not working on aws-sdk-core 3.104 and above (@janko)
+
 ## 3.2.1 (2020-01-12)
 
 * `derivation_endpoint` – Use `Rack::Files` constant on Rack >= 2.1 (@janko)

data/doc/release_notes/3.2.2.md

@@ -0,0 +1,14 @@
+---
+title: Shrine 3.2.2
+---
+
+## Bug fixes
+
+* aws-sdk-core 3.104.0 introduced a backwards incompatible changes that caused
+  `Shrine::Storage::S3#open` to start raising an exception.
+
+  ```
+  NoMethodError: undefined method `bytesize' for #<Array:0x000000000a721be0>
+  ```
+
+  This has now been fixed.

data/lib/shrine/storage/s3.rb

@@ -103,7 +103,7 @@ class Shrine
       #
       # [`Aws::S3::Object#get`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#get-instance_method
       def open(id, rewindable: true, **options)
-        chunks, length = get_object(object(id), options)
+        chunks, length = get(object(id), options)
 
         Down::ChunkedIO.new(chunks: chunks, rewindable: rewindable, size: length)
       rescue Aws::S3::Errors::NoSuchKey
@@ -279,22 +279,36 @@ class Shrine
         end
       end
 
-      # Aws::S3::Object#get doesn't allow us to get the content length of the
-      # object before the content is downloaded, so we hack our way around it.
-      def get_object(object, params)
-        req = client.build_request(:get_object, bucket: bucket.name, key: object.key, **params)
+      if Gem::Version.new(Aws::CORE_GEM_VERSION) >= Gem::Version.new("3.104.0")
+        def get(object, params)
+          enum = object.enum_for(:get, **params)
 
-        body = req.enum_for(:send_request)
-        begin
-          body.peek # start the request
-        rescue StopIteration
-          # the S3 object is empty
+          begin
+            content_length = Integer(enum.peek.last["content-length"])
+          rescue StopIteration
+            content_length = 0
+          end
+
+          chunks = Enumerator.new { |y| loop { y << enum.next.first } }
+
+          [chunks, content_length]
         end
+      else
+        def get(object, params)
+          req = client.build_request(:get_object, bucket: bucket.name, key: object.key, **params)
+
+          body = req.enum_for(:send_request)
+          begin
+            body.peek # start the request
+          rescue StopIteration
+            # the S3 object is empty
+          end
 
-        content_length = Integer(req.context.http_response.headers["Content-Length"])
-        chunks         = Enumerator.new { |y| loop { y << body.next } }
+          content_length = Integer(req.context.http_response.headers["Content-Length"])
+          chunks         = Enumerator.new { |y| loop { y << body.next } }
 
-        [chunks, content_length]
+          [chunks, content_length]
+        end
       end
 
       # The file is copyable if it's on S3 and on the same Amazon account.

data/lib/shrine/version.rb

@@ -8,7 +8,7 @@ class Shrine
   module VERSION
     MAJOR = 3
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -457,6 +457,7 @@ files:
 - doc/release_notes/3.1.0.md
 - doc/release_notes/3.2.0.md
 - doc/release_notes/3.2.1.md
+- doc/release_notes/3.2.2.md
 - doc/retrieving_uploads.md
 - doc/securing_uploads.md
 - doc/storage/file_system.md
@@ -551,7 +552,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Toolkit for file attachments in Ruby applications