cloudinary 1.22.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ba1d838324b0f283f26a61ae3f1a208d81883abbe181dba68c519bac3a3a08
-  data.tar.gz: e5e2465d95e0a5aeb5cdf340f0d6763745475dd82f9e828d8b6d39380b833fbc
+  metadata.gz: 5eb49ce85c34e632ed20f09a8600694177bf8f82c8490ff5463554c0ab4b3b2e
+  data.tar.gz: cf2558234f2c9c5dac2de81d2ef2060432a36297a50728f9f01df8997de2805d
 SHA512:
-  metadata.gz: 1cee80dca707cc686d4a26de17c4e1ada511d34a052c0205436f092082def7ff4defba0705ce4dad5a36bf50512dbcec5886ac09fb94e9932bcafde010b5bd78
-  data.tar.gz: 9c86c99dffb906973c0da80f699fcd66c8a48afc31290c6bbba40307ec20e3a9fe81a0ee25315918a556c00abcce30ad33dc0a84074a30814d219b308fcb5862
+  metadata.gz: 33147b3fb85715a5472259c06d636a29b45df54eee79d56677b2d2eca846b999e8452e4f6f0661bc9c198ad776d0313f64fb8444075c46fbec789463a2107c22
+  data.tar.gz: fc33de4ab89ec6bc63be65bad25fcbd0344975e8344ef29ecb365f9dd93c9bf7d6e611f96f8f60cd3d08cc222d308e6b04c27b835d4d9672b1c529821337dee2

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+1.23.0 / 2022-04-05
+==================
+
+New functionality and features
+------------------------------
+
+  * Add support for multiple ACLs in `AuthToken`
+  * Add support for disable b-frames for video codec
+  * Add support for aliases in Configuration
+  * Add support for `filename` upload parameter
+
+Other Changes
+-------------
+
+  * Fix escaping of special characters in `public_id`
+  * Fix support of the lowercase response headers
+  * Fix CarrierWave file retrieval after store
+
 1.22.0 / 2022-02-17
 ==================
 

data/lib/cloudinary/auth_token.rb

@@ -21,7 +21,12 @@ module Cloudinary
       start = options[:start_time]
       expiration = options[:expiration]
       ip = options[:ip]
+
       acl = options[:acl]
+      if acl.present?
+        acl = acl.is_a?(String) ? [acl] : acl
+      end
+
       duration = options[:duration]
       url = options[:url]
       start = Time.new.getgm.to_i if start == 'now'
@@ -41,9 +46,9 @@ module Cloudinary
       token << "ip=#{ip}" if ip
       token << "st=#{start}" if start
       token << "exp=#{expiration}"
-      token << "acl=#{escape_to_lower(acl)}" if acl
+      token << "acl=#{escape_to_lower(acl.join('!'))}" if acl && acl.size > 0
       to_sign = token.clone
-      to_sign << "url=#{escape_to_lower(url)}" if url && acl.blank?
+      to_sign << "url=#{escape_to_lower(url)}" if url && (acl.blank? || acl.size == 0)
       auth = digest(to_sign.join(SEPARATOR), key)
       token << "hmac=#{auth}"
       "#{name}=#{token.join(SEPARATOR)}"

data/lib/cloudinary/base_api.rb

@@ -19,9 +19,12 @@ module Cloudinary::BaseApi
         # This sets the instantiated self as the response Hash
         update Cloudinary::Api.parse_json_response response
 
-        @rate_limit_allowed   = response.headers[:x_featureratelimit_limit].to_i if response.headers[:x_featureratelimit_limit]
-        @rate_limit_reset_at  = Time.parse(response.headers[:x_featureratelimit_reset]) if response.headers[:x_featureratelimit_reset]
-        @rate_limit_remaining = response.headers[:x_featureratelimit_remaining].to_i if response.headers[:x_featureratelimit_remaining]
+        # According to RFC 2616, header names are case-insensitive.
+        lc_headers = response.headers.transform_keys(&:downcase)
+
+        @rate_limit_allowed   = lc_headers[:x_featureratelimit_limit].to_i if lc_headers[:x_featureratelimit_limit]
+        @rate_limit_reset_at  = Time.parse(lc_headers[:x_featureratelimit_reset]) if lc_headers[:x_featureratelimit_reset]
+        @rate_limit_remaining = lc_headers[:x_featureratelimit_remaining].to_i if lc_headers[:x_featureratelimit_remaining]
       end
     end
   end

data/lib/cloudinary/carrier_wave/process.rb

@@ -154,8 +154,16 @@ module Cloudinary::CarrierWave
     format = Cloudinary::PreloadedFile.split_format(original_filename || "").last
     return format || "" if resource_type == "raw"
     format = requested_format || format || default_format
- 
+
     format = format.to_s.downcase
     Cloudinary::FORMAT_ALIASES[format] || format
   end
+
+  def store!(new_file=nil)
+    super
+
+    column = model.send(:_mounter, mounted_as).send(:serialization_column)
+    identifier = model.send(:attribute, column)
+    retrieve_from_store!(identifier) unless identifier.nil?
+  end
 end

data/lib/cloudinary/uploader.rb

@@ -114,6 +114,9 @@ class Cloudinary::Uploader
     else
       filename = "cloudinaryfile"
     end
+
+    filename = options[:filename] if options[:filename]
+
     unique_upload_id = Cloudinary::Utils.random_public_id
     upload     = nil
     index      = 0

data/lib/cloudinary/utils.rb

@@ -885,7 +885,7 @@ class Cloudinary::Utils
 
   # Based on CGI::unescape. In addition keeps '+' character as is
   def self.smart_unescape(string)
-    CGI.unescape(string.sub('+', '%2B'))
+    CGI.unescape(string.gsub('+', '%2B'))
   end
 
   def self.random_public_id
@@ -1185,9 +1185,10 @@ class Cloudinary::Utils
 
   # A video codec parameter can be either a String or a Hash.
   #
-  # @param [Object] param <code>vc_<codec>[ : <profile> : [<level>]]</code>
+  # @param [Object] param <code>vc_<codec>[ : <profile> : [<level> : [<b_frames>]]]</code>
   #                       or <code>{ codec: 'h264', profile: 'basic', level: '3.1' }</code>
-  # @return [String] <code><codec> : <profile> : [<level>]]</code> if a Hash was provided
+  #                       or <code>{ codec: 'h265', profile: 'auto', level: 'auto', b_frames: false }</code>
+  # @return [String] <code><codec> : <profile> : [<level> : [<b_frames>]]]</code> if a Hash was provided
   #                   or the param if a String was provided.
   #                   Returns NIL if param is not a Hash or String
   # @private
@@ -1201,6 +1202,9 @@ class Cloudinary::Utils
           video.concat ":" + param[:profile]
           if param.has_key? :level
             video.concat ":" + param[:level]
+            if param.has_key?(:b_frames) && param[:b_frames] === false
+              video.concat ":bframes_no"
+            end
           end
         end
       end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.22.0"
+  VERSION = "1.23.0"
 end

data/lib/cloudinary.rb

@@ -145,7 +145,18 @@ module Cloudinary
   #
   # @return [OpenStruct]
   def self.import_settings_from_file
-    OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {}))
+    yaml_env_config = begin
+      yaml_source = ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result
+      yaml_config = if YAML.respond_to?(:safe_load)
+                      YAML.safe_load(yaml_source, aliases: true)
+                    else
+                      YAML.load(yaml_source)
+                    end
+      yaml_config[config_env]
+    rescue StandardError
+      {}
+    end
+    OpenStruct.new(yaml_env_config)
   end
 
   private_class_method :import_settings_from_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer