cloudinary 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e13d4a9d8701f1b37bfa34a12f4d393390a2d61ee0a351edb35c662f347ef2f
-  data.tar.gz: d818c41861f532a8cc991d8bba70fc3bf29ae3fcbe0e769efec86a4457767045
+  metadata.gz: 4f827756d17fc0b871d277a5bbdc6bc1ab3edeb30cf8765f29dd9fda17f6870d
+  data.tar.gz: 91e533b452f021f65255e26caed2271d5a96387a5c5728f5268720c9a2306fb6
 SHA512:
-  metadata.gz: c32eab5d9184adb7063bbd5f5b1a9e728ded397b76834bceaa331faf9d3429e4ad45bf7493aa4e3ceedcdf33eba21b4354fbd7173bcd7c3727382d9b5b43793e
-  data.tar.gz: 28c275bc3ae56751653ceefca9cbd81609ee9894cac57ee259ded5083ca94c64a2936196fd5bff92e1cd09c91275edce33b98e0fcf9edf903d2c70ad6fa1ad6d
+  metadata.gz: 837eb7160f55eed0b1df45d041c2a8deb18ccd0acd6ee405cf70f151ee7926bf5715bd9852f7da21ef393a28e8ad630d40770d47ed7b296c915a98dd5fb8f417
+  data.tar.gz: a724d55a25e2b09a33d2c722021ad3c335a034e822961f86312916b6296902d1b65417ae0f630537fa10f603cf7ff28f98b291f648777d371d578524a0062ba9

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+2.2.0 / 2024-09-08
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for ActiveStorage model service configuration
+
+Other Changes
+-------------
+
+  * Fix asset type detection in ActiveStorage
+  * Add explicit `ostruct` dependency
+
 2.1.2 / 2024-08-18
 ==================
 

data/cloudinary.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "faraday", ">= 2.0.1", "< 3.0.0"
   s.add_dependency "faraday-multipart", "~> 1.0", ">= 1.0.4"
   s.add_dependency 'faraday-follow_redirects', '~> 0.3.0'
+  s.add_dependency "ostruct"
 
   s.add_development_dependency "rails", ">= 6.1.7", "< 8.0.0"
   s.add_development_dependency "rexml", ">= 3.2.5", "< 4.0.0"

data/lib/active_storage/service/cloudinary_service.rb

@@ -17,9 +17,13 @@ module CloudinaryHelper
   alias cloudinary_url_internal_original cloudinary_url_internal
 
   def cloudinary_url_internal(source, options = {})
-    if defined?(ActiveStorage::Blob.service.public_id) && options.fetch(:type, "").to_s != "fetch"
-      source = ActiveStorage::Blob.service.public_id(source)
+    service_instance, options = ActiveStorage::Service::CloudinaryService.fetch_service_instance_and_config(source, options)
+    service_instance ||= ActiveStorage::Blob.service
+
+    if defined?(service_instance.public_id) && options.fetch(:type, "").to_s != "fetch"
+      source = service_instance.public_id(source)
     end
+
     cloudinary_url_internal_original(source, options)
   end
 end
@@ -58,6 +62,7 @@ module ActiveStorage
     end
 
     def url(key, filename: nil, content_type: '', **options)
+      key = find_blob_or_use_key(key)
       instrument :url, key: key do |payload|
         url = Cloudinary::Utils.cloudinary_url(
           full_public_id_internal(key, options),
@@ -101,6 +106,7 @@ module ActiveStorage
     end
 
     def delete(key)
+      key = find_blob_or_use_key(key)
       instrument :delete, key: key do
         options = {
           resource_type: resource_type(nil, key),
@@ -117,6 +123,7 @@ module ActiveStorage
     end
 
     def exist?(key)
+      key = find_blob_or_use_key(key)
       instrument :exist, key: key do |payload|
         begin
           options = {
@@ -153,8 +160,7 @@ module ActiveStorage
 
     # Return the partial content in the byte +range+ of the file at the +key+.
     def download_chunk(key, range)
-      url = Cloudinary::Utils.cloudinary_url(public_id(key), resource_type: resource_type(nil, key))
-      uri = URI(url)
+      uri = URI(url(key))
       instrument :download, key: key do
         req = Net::HTTP::Get.new(uri)
         range_end = case
@@ -190,6 +196,33 @@ module ActiveStorage
       full_public_id_internal(public_id)
     end
 
+    def self.fetch_service_instance_and_config(source, options)
+      return [nil, options] unless defined?(ActiveStorage::BlobKey) && source.is_a?(ActiveStorage::BlobKey) &&
+        source.respond_to?(:attributes) && source.attributes.key?(:service_name)
+
+      service_name = source.attributes[:service_name]
+
+      begin
+        service_instance = ActiveStorage::Blob.services.fetch(service_name.to_sym)
+
+        unless service_instance.instance_of?(ActiveStorage::Service::CloudinaryService)
+          Rails.logger.error "Expected service instance #{service_instance.class.name} to be of type ActiveStorage::Service::CloudinaryService."
+          return [nil, options]
+        end
+
+        service_config = Rails.application.config.active_storage.service_configurations.fetch(service_name)
+        options        = service_config.merge(options)
+      rescue NameError => e
+        Rails.logger.error "Failed to retrieve the service instance for #{service_name}: #{e.message}"
+        return [nil, options]
+      rescue => e
+        Rails.logger.error "An unexpected error occurred: #{e.message}"
+        return [nil, options]
+      end
+
+      [service_instance, options]
+    end
+
     private
 
     def api_uri(action, options)
@@ -278,5 +311,19 @@ module ActiveStorage
       end
       content_type_to_resource_type(content_type)
     end
+
+    def find_blob_or_use_key(key)
+      if key.is_a?(ActiveStorage::BlobKey)
+        key
+      else
+        begin
+          blob = ActiveStorage::Blob.find_by(key: key)
+          blob ? ActiveStorage::BlobKey.new(blob.attributes.as_json) : key
+        rescue ActiveRecord::StatementInvalid => e
+          # Return the original key if an error occurs
+          key
+        end
+      end
+    end
   end
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement