cloudinary 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c84e7c9af68c85ecdeb1ddd30697cb955f9adec
-  data.tar.gz: d5cfea39e3837d16d2263219c0f659646744c7e8
+  metadata.gz: 40c8821125bf4aa673a4e681867b3544f6a07b8f
+  data.tar.gz: 8093407d979244579abefcdff28b689a1ede0911
 SHA512:
-  metadata.gz: fde41b6bacc1124a5fc422bceb62a8ba2816092b9449bb7520c86f34e6740dd72985b528d7102246d262a50d43e372c6519b9e7ba4a39536866d1cb575efa39f
-  data.tar.gz: 869ad3bc70bf3d16dfd448da4de2c9e950e0891547cae4583308a0892f49962001e5a82809a1877003d2659eac84cbfe961603743720853b4809241e132c454d
+  metadata.gz: 4b99e1b9657ce647e83af64300d134da80fe46e8cf22f0e379b966b7d548f2a004c659ebce923805aeedcdb32031d131e06bcffc8db7c1003546cafd02d8b647
+  data.tar.gz: 494b6a5c1934cd0074047c37f6d9ee1e4506c08f97d9db02706b71dee4a970c23c710bf91f43a1b67509793a7a7780597cf8f01a80f3bde7b9f5e1699caae0ce

data/CHANGELOG.md

@@ -1,4 +1,17 @@
 
+1.1.4 / 2016-03-22
+==================
+
+New functionality and features
+------------------------------
+
+  * Add conditional transformation
+
+Other Changes
+-------------
+
+  * Fix direct upload in the sample project
+
 1.1.3 / 2016-03-16
 ==================
 

data/lib/cloudinary/utils.rb

@@ -10,7 +10,24 @@ class Cloudinary::Utils
   # @deprecated Use Cloudinary::SHARED_CDN
   SHARED_CDN = Cloudinary::SHARED_CDN
   DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION = {:width => :auto, :crop => :limit}
-
+  CONDITIONAL_OPERATORS = {
+    "=" => 'eq',
+    "!=" => 'ne',
+    "<" => 'lt',
+    ">" => 'gt',
+    "<=" => 'lte',
+    ">=" => 'gte',
+    "&&" => 'and',
+    "||" => 'or'
+  }
+
+  CONDITIONAL_PARAMETERS = {
+    "width" => "w",
+    "height" => "h",
+    "aspect_ratio" => "ar",
+    "page_count" => "pc",
+    "face_count" => "fc"
+  }
   # Warning: options are being destructively updated!
   def self.generate_transformation_string(options={}, allow_implicit_crop_mode = false)
     # allow_implicit_crop_mode was added to support height and width parameters without specifying a crop mode.
@@ -75,6 +92,7 @@ class Cloudinary::Utils
 
     overlay = process_layer(options.delete(:overlay))
     underlay = process_layer(options.delete(:underlay))
+    ifValue = process_if(options.delete(:if))
 
     params = {
       :a   => angle,
@@ -125,9 +143,11 @@ class Cloudinary::Utils
       params[range_value] = norm_range_value params[range_value] if params[range_value].present?
     end
 
-    transformation = params.reject{|_k,v| v.blank?}.map{|k,v| "#{k}_#{v}"}.sort.join(",")
     raw_transformation = options.delete(:raw_transformation)
-    transformation = [transformation, raw_transformation].reject(&:blank?).join(",")
+    transformation = params.reject{|_k,v| v.blank?}.map{|k,v| "#{k}_#{v}"}.sort
+    transformation = transformation.join(",")
+    transformation = [ifValue, transformation, raw_transformation].reject(&:blank?).join(",")
+
     transformations = base_transformations << transformation
     if responsive_width
       responsive_width_transformation = Cloudinary.config.responsive_width_transformation || DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION
@@ -144,6 +164,21 @@ class Cloudinary::Utils
     transformations.reject(&:blank?).join("/")
   end
 
+  # Parse "if" parameter
+  # Translates the condition if provided.
+  # @return [string] "if_" + ifValue
+  # @private
+  def self.process_if(ifValue)
+    if ifValue
+      ifValue = ifValue.gsub(
+        /(#{CONDITIONAL_PARAMETERS.keys.join("|")}|[=<>&|!]+)/,
+        CONDITIONAL_PARAMETERS.merge(CONDITIONAL_OPERATORS))
+        .gsub(/[ _]+/, "_")
+
+      ifValue = "if_" + ifValue
+    end
+  end
+
   # Parse layer options
   # @return [string] layer transformation string
   # @private

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/utils_spec.rb

@@ -391,13 +391,13 @@ describe Cloudinary::Utils do
     describe param do
       let(:root_path) { "http://res.cloudinary.com/#{cloud_name}" }
       let(:layers_options) { [
-      # [name,                    options,                                              result]
-        ["string",                "text:hello",                                         "text:hello"],
-        ["public_id",             { "public_id" => "logo" },                            "logo"],
-        ["public_id with folder", { "public_id" => "folder/logo" },                     "folder:logo"],
-        ["private",               { "public_id" => "logo", "type" => "private" },       "private:logo"],
-        ["format",                { "public_id" => "logo", "format" => "png" },         "logo.png"],
-        ["video",                 { "resource_type" => "video", "public_id" => "cat" }, "video:cat"],
+        # [name,                    options,                                              result]
+        ["string", "text:hello", "text:hello"],
+        ["public_id", { "public_id" => "logo" }, "logo"],
+        ["public_id with folder", { "public_id" => "folder/logo" }, "folder:logo"],
+        ["private", { "public_id" => "logo", "type" => "private" }, "private:logo"],
+        ["format", { "public_id" => "logo", "format" => "png" }, "logo.png"],
+        ["video", { "resource_type" => "video", "public_id" => "cat" }, "video:cat"],
       ] }
       it "should support #{param}" do
         layers_options.each do |name, options, result|
@@ -667,5 +667,69 @@ describe Cloudinary::Utils do
     expect(Cloudinary::Utils.encode_double_array([[1, 2, 3, 4], [5, 6, 7, 8]])).to eq("1,2,3,4|5,6,7,8")
   end
 
+  describe ":if" do
+    describe 'with literal condition string' do
+      it "should include the if parameter as the first component in the transformation string" do
+        expect(["sample", { if: "w_lt_200", crop: "fill", height: 120, width: 80 }])
+          .to produce_url("#{upload_path}/if_w_lt_200,c_fill,h_120,w_80/sample")
+        expect(["sample", { crop: "fill", height: 120, if: "w_lt_200", width: 80 }])
+          .to produce_url("#{upload_path}/if_w_lt_200,c_fill,h_120,w_80/sample")
 
+      end
+      it "should allow multiple conditions when chaining transformations " do
+        expect(["sample", transformation: [{ if: "w_lt_200", crop: "fill", height: 120, width: 80 },
+                                           { if: "w_gt_400", crop: "fit", width: 150, height: 150 },
+                                           { effect: "sepia" }]])
+          .to produce_url("#{upload_path}/if_w_lt_200,c_fill,h_120,w_80/if_w_gt_400,c_fit,h_150,w_150/e_sepia/sample")
+      end
+
+      describe "including spaces and operators" do
+        it "should translate operators" do
+          expect(["sample", { if: "w < 200", crop: "fill", height: 120, width: 80 }])
+            .to produce_url("#{upload_path}/if_w_lt_200,c_fill,h_120,w_80/sample")
+        end
+      end
+
+      describe 'if end' do
+        it "should include the if_end as the last parameter in its component" do
+          expect(["sample", transformation: [{ if: "w_lt_200" },
+                                             { crop: "fill", height: 120, width: 80, effect: "sharpen" },
+                                             { effect: "brightness:50" },
+                                             { effect: "shadow", color: "red" },
+                                             { if: "end" }]])
+            .to produce_url("#{upload_path}/if_w_lt_200/c_fill,e_sharpen,h_120,w_80/e_brightness:50/co_red,e_shadow/if_end/sample")
+        end
+        it "should support if_else with transformation parameters" do
+          expect(["sample", transformation: [{ if: "w_lt_200", crop: "fill", height: 120, width: 80 },
+                                             { if: "else", crop: "fill", height: 90, width: 100 }]])
+            .to produce_url("#{upload_path}/if_w_lt_200,c_fill,h_120,w_80/if_else,c_fill,h_90,w_100/sample")
+        end
+        it "if_else should be without any transformation parameters" do
+          expect(["sample", transformation: [{ if: "w_lt_200" },
+                                             { crop: "fill", height: 120, width: 80 },
+                                             { if: "else" },
+                                             { crop: "fill", height: 90, width: 100 }]])
+            .to produce_url("#{upload_path}/if_w_lt_200/c_fill,h_120,w_80/if_else/c_fill,h_90,w_100/sample")
+        end
+      end
+      it "should support and translate operators:  '=', '!=', '<', '>', '<=', '>=', '&&', '||'" do
+
+        allOperators =
+          'if_'           +
+            'w_eq_0_and'    +
+            '_w_ne_0_or'    +
+            '_h_lt_0_and'   +
+            '_ar_gt_0_and'   +
+            '_pc_lte_0_and'  +
+            '_fc_gte_0'      +
+            ',e_grayscale'
+
+        expect( ["sample",
+                 :if =>"width = 0 && w != 0 || height < 0 and aspect_ratio > 0 and page_count <= 0 and face_count >= 0",
+                 :effect =>"grayscale"])
+          .to produce_url("#{upload_path}/#{allOperators}/sample")
+    end
+
+    end
+  end
 end

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

@@ -1,6 +1,6 @@
 
 /**
- * Cloudinary's JavaScript library - Version 2.0.7
+ * Cloudinary's JavaScript library - Version 2.0.8
  * Copyright Cloudinary
  * see https://github.com/cloudinary/cloudinary_js
  *
@@ -778,6 +778,19 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
       "||": 'or'
     };
 
+    Condition.PARAMETERS = {
+      "width": "w",
+      "height": "h",
+      "aspect_ratio": "ar",
+      "aspectRatio": "ar",
+      "page_count": "pc",
+      "pageCount": "pc",
+      "face_count": "fc",
+      "faceCount": "fc"
+    };
+
+    Condition.BOUNDRY = "[ _]+";
+
 
     /**
      * Represents a transformation condition
@@ -829,22 +842,12 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
      */
 
     Condition.prototype.normalize = function(value) {
-      var list, v;
-      list = value.split(/[ _]+/);
-      list = (function() {
-        var j, len, results;
-        results = [];
-        for (j = 0, len = list.length; j < len; j++) {
-          v = list[j];
-          if (Condition.OPERATORS[v] != null) {
-            results.push(Condition.OPERATORS[v]);
-          } else {
-            results.push(v);
-          }
-        }
-        return results;
-      })();
-      return list.join('_');
+      var replaceRE;
+      replaceRE = new RegExp("(" + Object.keys(Condition.PARAMETERS).join("|") + "|[=<>&|!]+)", "g");
+      value = value.replace(replaceRE, function(match) {
+        return Condition.OPERATORS[match] || Condition.PARAMETERS[match];
+      });
+      return value.replace(/[ _]+/g, '_');
     };
 
 
@@ -969,8 +972,8 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
      * @return {Condition} this condition
      */
 
-    Condition.prototype.pages = function(operator, value) {
-      return this.predicate("pg", operator, value);
+    Condition.prototype.pageCount = function(operator, value) {
+      return this.predicate("pc", operator, value);
     };
 
 
@@ -981,8 +984,8 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
      * @return {Condition} this condition
      */
 
-    Condition.prototype.faces = function(operator, value) {
-      return this.predicate("faces", operator, value);
+    Condition.prototype.faceCount = function(operator, value) {
+      return this.predicate("fc", operator, value);
     };
 
     return Condition;
@@ -1859,12 +1862,12 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
 
     DEFAULT_CONFIGURATION_PARAMS = {
       responsive_class: 'cld-responsive',
-      responsive_use_stoppoints: true,
+      responsive_use_breakpoints: true,
       round_dpr: true,
       secure: (typeof window !== "undefined" && window !== null ? (ref = window.location) != null ? ref.protocol : void 0 : void 0) === 'https:'
     };
 
-    Configuration.CONFIG_PARAMS = ["api_key", "api_secret", "cdn_subdomain", "cloud_name", "cname", "private_cdn", "protocol", "resource_type", "responsive_class", "responsive_use_stoppoints", "responsive_width", "round_dpr", "secure", "secure_cdn_subdomain", "secure_distribution", "shorten", "type", "url_suffix", "use_root_path", "version"];
+    Configuration.CONFIG_PARAMS = ["api_key", "api_secret", "cdn_subdomain", "cloud_name", "cname", "private_cdn", "protocol", "resource_type", "responsive_class", "responsive_use_breakpoints", "responsive_width", "round_dpr", "secure", "secure_cdn_subdomain", "secure_distribution", "shorten", "type", "url_suffix", "use_root_path", "version"];
 
 
     /**
@@ -2471,7 +2474,7 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
   Cloudinary = (function() {
     var AKAMAI_SHARED_CDN, CF_SHARED_CDN, DEFAULT_POSTER_OPTIONS, DEFAULT_VIDEO_SOURCE_TYPES, OLD_AKAMAI_SHARED_CDN, SHARED_CDN, VERSION, absolutize, applyBreakpoints, cdnSubdomainNumber, closestAbove, cloudinaryUrlPrefix, defaultBreakpoints, finalizeResourceType, parentWidth;
 
-    VERSION = "2.0.7";
+    VERSION = "2.0.8";
 
     CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
 
@@ -3651,7 +3654,7 @@ var extend = function(child, parent) { for (var key in parent) { if (hasProp.cal
     ImageTag: ImageTag,
     VideoTag: VideoTag,
     Cloudinary: Cloudinary,
-    VERSION: "2.0.7",
+    VERSION: "2.0.8",
     CloudinaryJQuery: CloudinaryJQuery
   };
   return cloudinary;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer