cloudinary 1.20.0 → 1.23.0

data/lib/cloudinary.rb

@@ -133,13 +133,33 @@ module Cloudinary
   #
   # @return [OpenStruct]
   def self.make_new_config(config_module)
-    OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {})).tap do |config|
+    import_settings_from_file.tap do |config|
       config.extend(config_module)
       config.load_config_from_env
     end
   end
 
   private_class_method :make_new_config
+
+  # Import settings from yaml file
+  #
+  # @return [OpenStruct]
+  def self.import_settings_from_file
+    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
 end
   # Prevent require loop if included after Rails is already initialized.
   require "cloudinary/helper" if defined?(::ActionView::Base)

data/vendor/assets/javascripts/cloudinary/jquery.cloudinary.js

@@ -802,7 +802,7 @@ var slice = [].slice,
     function TextLayer(options) {
       var keys;
       TextLayer.__super__.constructor.call(this, options);
-      keys = ["resourceType", "resourceType", "fontFamily", "fontSize", "fontWeight", "fontStyle", "textDecoration", "textAlign", "stroke", "letterSpacing", "lineSpacing", "fontHinting", "fontAntialiasing", "text"];
+      keys = ["resourceType", "resourceType", "fontFamily", "fontSize", "fontWeight", "fontStyle", "textDecoration", "textAlign", "stroke", "letterSpacing", "lineSpacing", "fontHinting", "fontAntialiasing", "text", "textStyle"];
       if (options != null) {
         keys.forEach((function(_this) {
           return function(key) {
@@ -886,6 +886,11 @@ var slice = [].slice,
       return this;
     };
 
+    TextLayer.prototype.textStyle = function(textStyle) {
+      this.options.textStyle = textStyle;
+      return this;
+    };
+
 
     /**
      * generate the string representation of the layer
@@ -921,6 +926,10 @@ var slice = [].slice,
     };
 
     TextLayer.prototype.textStyleIdentifier = function() {
+      // Note: if a text-style argument is provided as a whole, it overrides everything else, no mix and match.
+      if (!Util.isEmpty(this.options.textStyle)) {
+        return this.options.textStyle;
+      }
       var components;
       components = [];
       if (this.options.fontWeight !== "normal") {
@@ -4302,12 +4311,20 @@ var slice = [].slice,
               switch (false) {
                 case !/w_auto:breakpoints/.test(dataSrc):
                   requiredWidth = maxWidth(containerWidth, tag);
-                  dataSrc = dataSrc.replace(/w_auto:breakpoints([_0-9]*)(:[0-9]+)?/, "w_auto:breakpoints$1:" + requiredWidth);
+                  if (requiredWidth) {
+                    dataSrc = dataSrc.replace(/w_auto:breakpoints([_0-9]*)(:[0-9]+)?/, "w_auto:breakpoints$1:" + requiredWidth);
+                  } else {
+                    setUrl = false;
+                  }
                   break;
                 case !(match = /w_auto(:(\d+))?/.exec(dataSrc)):
                   requiredWidth = applyBreakpoints.call(this, tag, containerWidth, match[2], options);
                   requiredWidth = maxWidth(requiredWidth, tag);
-                  dataSrc = dataSrc.replace(/w_auto[^,\/]*/g, "w_" + requiredWidth);
+                  if (requiredWidth) {
+                    dataSrc = dataSrc.replace(/w_auto[^,\/]*/g, "w_" + requiredWidth);
+                  } else {
+                    setUrl = false;
+                  }
               }
               Util.removeAttribute(tag, 'width');
               if (!options.responsive_preserve_height) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -276,7 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: cloudinary
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service