active_storage_bunny 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d8ca0414380a8f138a9eb2f3f5d7cb4c4f9aac29c6e2aae5dace40532bd689
-  data.tar.gz: 45e0cb4b9be82b4bb3228792481dd5a8734bcde61e3941841d88bcadb6e808fb
+  metadata.gz: a3a4228b63965eea285975f7afabeeac6e9bb2f3bde3f24638c2d6e662ace50b
+  data.tar.gz: eee8cd70a77ef6b5eb1d6cdc12f294d45f54f051ca3b344cb48148cf8e03fac0
 SHA512:
-  metadata.gz: 1362ce11eb5dc5022c037547724b6f230fc5b9fab0857ba258ff1a5dbf52a6a11625d12df5dfe2956326b7d77340737bffd969cfb55f5902be5b981929fd1133
-  data.tar.gz: 007041caf3ab0f9b3e42787df1be4344acb2ee045631295fe8a9b3c8129e6d45b61d80d4f910528bf0befce53e16db4232ccc2056722febde6dd1992a553c800
+  metadata.gz: 46100469320d9f53dfff19edcee376fdede6fbffe42a6662df4913133fea5ebd232af76b670c92910f402fc474addecc27a24dcca3e6ce347f0501ce1a7eb9eb
+  data.tar.gz: 5b38882608dfc9636ea0ad89dd5345ca1cc6f9c0b06ee581e146cf295e0a4041ea8d1d30f0f4411b845fba782ce3e239c06a037bb45dc7430f3cf3362ef79dd0

data/lib/active_storage/service/bunny_service.rb

@@ -4,17 +4,20 @@ require 'active_support/core_ext/numeric/bytes'
 require 'bunny_storage_client'
 
 module ActiveStorage
-  # Wraps the Amazon Simple Storage Service (S3) as an Active Storage service.
+  # Wraps the BunnyCDN Storage as an Active Storage service.
   # See ActiveStorage::Service for the generic API documentation that applies to all services.
   class Service::BunnyService < Service
 
-    CDN_BASE_URL = "https://#{ENV['BUNNY_STORAGE_ZONE']}.b-cdn.net"
+    attr_reader :client, :base_url
 
-    attr_reader :client
+    def initialize(access_key:, api_key:, storage_zone:, region:, cdn: false)
+      @client = BunnyStorageClient.new(access_key, api_key, storage_zone, region)
 
-    def initialize(access_key:, api_key:, storage_zone:, **options)
-      @client = BunnyStorageClient.new(access_key, api_key, storage_zone)
-      super(**options)
+      if cdn
+        @base_url = cdn
+      else
+        @base_url = "https://#{storage_zone}.b-cdn.net"
+      end
     end
 
     def upload(key, io, checksum: nil, filename: nil, content_type: nil, disposition: nil, custom_metadata: {}, **)
@@ -25,10 +28,16 @@ module ActiveStorage
     end
 
     def download(key, &block)
-      instrument :download, key: key do
-        object_for(key).get_file.to_s.force_encoding(Encoding::BINARY)
-      rescue StandardError
-        raise ActiveStorage::FileNotFoundError
+      if block_given?
+        instrument :streaming_download, { key: key } do
+          stream(key, &block)
+        end
+      else
+        instrument :download, key: key do
+          io = StringIO.new object_for(key).get_file
+
+          io.set_encoding(Encoding::BINARY)
+        end
       end
     end
 
@@ -39,20 +48,29 @@ module ActiveStorage
     end
 
     def delete_prefixed(prefix)
-      instrument :delete_prefixed, prefix: prefix do
-        # BunnyStorageClient does not natively support this operation yet.
-      end
+      delete prefix
+      # instrument :delete_prefixed, prefix: prefix do
+      #   # BunnyStorageClient does not natively support this operation yet.
+      # end
     end
 
-
     def exist?(key)
       instrument :exist, key: key do |payload|
-        answer = object_for(key).exists?
+        answer = object_for(key).exist?
         payload[:exist] = answer
         answer
       end
     end
 
+    def url(key, expires_in:, disposition:, filename:, **options)
+      instrument :url, {key: key} do |payload|
+        url = public_url key
+        payload[:url] = url
+
+        url
+      end
+    end
+
     def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
       instrument :url, key: key do |payload|
         generated_url = object_for(key).presigned_url :put, expires_in: expires_in.to_i,
@@ -79,7 +97,7 @@ module ActiveStorage
     end
 
     def public_url(key)
-      File.join(CDN_BASE_URL, key)
+      File.join(base_url, key)
     end
 
     def upload_with_single_part(key, io, checksum: nil, content_type: nil, content_disposition: nil, custom_metadata: {})
@@ -89,8 +107,15 @@ module ActiveStorage
       raise ActiveStorage::IntegrityError
     end
 
-    def stream_file(key)
-      # BunnyStorageClient does not natively support this operation yet.
+    def stream(key, options = {}, &block)
+      io = StringIO.new object_for(key).get_file
+      io.set_encoding(Encoding::BINARY)
+
+      chunk_size = 5.megabytes
+
+      while chunk = io.read(chunk_size)
+        yield chunk
+      end
     end
 
     def object_for(key)

data/lib/active_storage_bunny/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageBunny
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ramit Koul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny_storage_client
@@ -33,7 +33,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 description: ActiveStorageBunny is a gem that integrates BunnyCDN storage services
   with Active Storage.
 email: