azure-blob 0.5.6 → 0.5.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae3b7fceea9be12467a971a8145a7ebc24e4e20c9debc0ad13ec2388fdf65b8
-  data.tar.gz: 057cd633b835d5481e73666f2656a5e0e7bc78de5110805e647a2f95f10e0c93
+  metadata.gz: b05479c9f6ba44b76af4d096021a2a887e8774caf4dcd1c2e02a98c8a2998426
+  data.tar.gz: 75c680b7c740b541e078cb9a1fc4f7c213719abfa68d3057a21982a1a0977320
 SHA512:
-  metadata.gz: 3ace2b7d5b08599d59db6c2d0df8bc376c9c1cc1b50b8671691c04ac4f72945e10fb588f115d5d34f662db126ddb5b8ded1f7263cf3b06f3a5e9b5141d02c084
-  data.tar.gz: 1f3407a9e1826f63f77c51acb0d1583724a4b30dd64418f53369d58cdf2c3da66bc48eba7899405e01c844823e9ab64c45ffde6fc68e73264cc107e3f764ec19
+  metadata.gz: 1116f9eec87e05685dd8177f400cc322b1a393e0d96eaf91bfe52cfb465ebc7ded753ff1c040f9dbed031038c6cca2cab80bd7eec591d4e020ac151c7a1b59af
+  data.tar.gz: 76a9a8840903de54253fce878ccee22ba55be7097f018c171a3b6863862fa19e2656475dbf415b609426a428212acb14d35117c55c6d8905060f3909be28d61a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.5.7.1] 2025-04-22
+
+- Fixed a bug when reusing the account name in the container name. #22
+
+## [0.5.7] 2025-02-21
+
+- Add `copy_blob`
+- Update `compose` to use `copy_blob` if 1 source key and blob is <= 256MiB
+
 ## [0.5.6] 2025-01-17
 
 - Fix user delegation key not refreshing (#14)

data/Rakefile

@@ -20,6 +20,15 @@ end
 task default: %i[test]
 
 task :test do
+  [
+    "AZURE_ACCOUNT_NAME",
+    "AZURE_PRIVATE_CONTAINER",
+    "AZURE_PUBLIC_CONTAINER",
+  ].each do |env|
+    value = ENV[env]
+    raise "#{env} variable need to be set if you are using the nix/devenv environment, consider running generate-env-file" if value.nil? || value.empty?
+  end
+
   Rake::Task["test_client"].execute
   Rake::Task["test_rails"].execute
 end

data/lib/active_storage/service/azure_blob_service.rb

@@ -123,16 +123,22 @@ module ActiveStorage
     def compose(source_keys, destination_key, filename: nil, content_type: nil, disposition: nil, custom_metadata: {})
       content_disposition = content_disposition_with(type: disposition, filename: filename) if disposition && filename
 
-      client.create_append_blob(
-        destination_key,
-        content_type: content_type,
-        content_disposition: content_disposition,
-        metadata: custom_metadata,
-      )
-
-      source_keys.each do |source_key|
-        stream(source_key) do |chunk|
-          client.append_blob_block(destination_key, chunk)
+      # use copy_blob operation if composing a new blob from a single existing blob
+      # and that single blob is <= 256 MiB which is the upper limit for copy_blob operation
+      if source_keys.length == 1 && client.get_blob_properties(source_keys[0]).size <= 256.megabytes
+        client.copy_blob(destination_key, source_keys[0], metadata: custom_metadata)
+      else
+        client.create_append_blob(
+          destination_key,
+          content_type: content_type,
+          content_disposition: content_disposition,
+          metadata: custom_metadata,
+        )
+
+        source_keys.each do |source_key|
+          stream(source_key) do |chunk|
+            client.append_blob_block(destination_key, chunk)
+          end
         end
       end
     end

data/lib/azure_blob/client.rb

@@ -77,6 +77,25 @@ module AzureBlob
       Http.new(uri, headers, signer:).get
     end
 
+    # Copy a blob
+    #
+    # Calls to {Copy Blob From URL}[https://learn.microsoft.com/en-us/rest/api/storageservices/copy-blob-from-url]
+    #
+    # Takes a key (path) and a source_key (path).
+    #
+    def copy_blob(key, source_key, options = {})
+      uri = generate_uri("#{container}/#{key}")
+
+      source_uri = signed_uri(source_key, permissions: "r", expiry: Time.at(Time.now.to_i + 300).utc.iso8601)
+
+      headers = {
+        "x-ms-copy-source": source_uri.to_s,
+        "x-ms-requires-sync": "true",
+      }
+
+      Http.new(uri, headers, signer:, **options.slice(:metadata, :tags)).put
+    end
+
     # Delete a blob
     #
     # Calls to {Delete Blob}[https://learn.microsoft.com/en-us/rest/api/storageservices/delete-blob]
@@ -202,7 +221,7 @@ module AzureBlob
       uri = generate_uri(container)
       headers = {}
       headers[:"x-ms-blob-public-access"] = "blob" if options[:public_access]
-      headers[:"x-ms-blob-public-access"] = options[:public_access] if ["container","blob"].include?(options[:public_access])
+      headers[:"x-ms-blob-public-access"] = options[:public_access] if [ "container", "blob" ].include?(options[:public_access])
 
       uri.query = URI.encode_www_form(restype: "container")
       response = Http.new(uri, headers, signer:).put

data/lib/azure_blob/shared_key_signer.rb

@@ -11,7 +11,7 @@ module AzureBlob
       @account_name = account_name
       @access_key = Base64.decode64(access_key)
       @host = host
-      @remove_prefix = @host.include?("/#{@account_name}")
+      @remove_prefix = @host.end_with?("/#{@account_name}")
     end
 
     def authorization_header(uri:, verb:, headers: {})

data/lib/azure_blob/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AzureBlob
-  VERSION = "0.5.6"
+  VERSION = "0.5.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-blob
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7.1
 platform: ruby
 authors:
 - Joé Dupuis