Fixed error for download method with block - #211

Author: ankane

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.2 (unreleased)
+
+- Fixed error for `download` method with block
+
 ## 2.0.1 (2024-12-29)
 
 - Added support for Ruby 3.4

lib/lockbox/active_storage_extensions.rb

@@ -80,7 +80,7 @@ def initialize(name, record, attachable)
 
     module Attachment
       def download
-        result = super
+        result = super(&nil)
 
         options = Utils.encrypted_options(record, name)
         # only trust the metadata when migrating
@@ -91,7 +91,15 @@ def download
           result = Utils.decrypt_result(record, name, options, result)
         end
 
-        result
+        if block_given?
+          io = StringIO.new(result)
+          chunk_size = 5.megabytes
+          while (chunk = io.read(chunk_size))
+            yield chunk
+          end
+        else
+          result
+        end
       end
 
       def variant(*args)

test/active_storage_test.rb

@@ -281,6 +281,15 @@ def test_open_blank
     end
   end
 
+  def test_download_block
+    user = User.create!(avatar: attachment)
+    chunks = []
+    user.avatar.download do |chunk|
+      chunks << chunk
+    end
+    assert_equal content, chunks.join
+  end
+
   def test_metadata
     user = User.create!