cloudinary 1.0.85 → 1.1.0

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.85"
+  VERSION = "1.1.0"
 end

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

@@ -1,5 +1,5 @@
 /*
- * Cloudinary's jQuery library - v1.0.23
+ * Cloudinary's jQuery library - v1.0.24
  * Copyright Cloudinary
  * see https://github.com/cloudinary/cloudinary_js
  */
@@ -30,7 +30,8 @@
   var OLD_AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net";
   var AKAMAI_SHARED_CDN = "res.cloudinary.com";
   var SHARED_CDN = AKAMAI_SHARED_CDN;
-  var DEFAULT_POSTER_OPTIONS = { format: 'jpg', resource_type: 'video' }
+  var DEFAULT_POSTER_OPTIONS = { format: 'jpg', resource_type: 'video' };
+  var DEFAULT_VIDEO_SOURCE_TYPES = ['webm', 'mp4', 'ogv'];
   function utf8_encode (argString) {
     // http://kevin.vanzonneveld.net
     // +   original by: Webtoolkit.info (http://www.webtoolkit.info/)
@@ -285,20 +286,30 @@
     return base_transformations.join("/");
   }
 
+  var number_pattern = "([0-9]*)\\.([0-9]+)|([0-9]+)";
+  var offset_any_pattern = "(" + number_pattern + ")([%pP])?";
+
   function split_range(range) {
-    var ary = range;
-    if(typeof range === 'string'){
-      var offset_any_pattern = "(([0-9]*)\\.([0-9]+)|([0-9]+))([%pP])?"
-      var offset_any_pattern_re = "("+offset_any_pattern+ ")\.\.("+offset_any_pattern+")";
-      if (range.match(offset_any_pattern_re )){
-        ary = range.split("..");
-      }
+    var splitted;
+    switch(range.constructor){
+      case String:
+        var offset_any_pattern_re = "("+offset_any_pattern+ ")\.\.("+offset_any_pattern+")";
+        if (range.match(offset_any_pattern_re )){
+          splitted = range.split("..");
+        }
+        break;
+      case Array:
+        splitted = range;
+        break;
+      default :
+        splitted = [null, null];
+
     }
-    return ary;
+    return splitted;
   }
 
   function norm_range_value(value) {
-    var offset = value.match(new RegExp("^" + offset_any_pattern()+ "$"));
+    var offset = String(value).match(new RegExp("^" + offset_any_pattern+ "$"));
     if( offset){
       var modifier   = present(offset[5]) ? 'p' : '';
       value  = (offset[1] || offset[4]) + modifier;
@@ -306,14 +317,6 @@
     return value;
   }
 
-  function number_pattern(){
-    return "([0-9]*)\\.([0-9]+)|([0-9]+)";
-  }
-
-  function offset_any_pattern(){
-    return "(" + number_pattern() + ")([%pP])?";
-  }
-
   function absolutize(url) {
     if (!url.match(/^https?:\//)) {
       var prefix = document.location.protocol + "//" + document.location.host;
@@ -502,6 +505,23 @@
         return null;
     }
   }
+  
+  function join_pair(key, value) {
+    if (!value) {
+      return undefined;
+    } else if (value === true) {
+      return key;
+    } else {
+      return key + "=\"" + value + "\"";
+    }
+  }
+
+  function html_attrs(attrs) {
+    var pairs = $.map(attrs, function(value, key) { return join_pair(key, value); });
+    pairs.sort();
+    return pairs.filter(function(pair){return pair;}).join(" ");
+  }
+
   var cloudinary_config = null;
   var responsive_config = null;
   var responsive_resize_initialized = false;
@@ -512,7 +532,6 @@
     OLD_AKAMAI_SHARED_CDN: OLD_AKAMAI_SHARED_CDN,
     AKAMAI_SHARED_CDN: AKAMAI_SHARED_CDN,
     SHARED_CDN: SHARED_CDN,
-    DEFAULT_POSTER_OPTIONS: DEFAULT_POSTER_OPTIONS,
     config: function(new_config, new_value) {
       if (!cloudinary_config) {
         cloudinary_config = {};
@@ -538,7 +557,7 @@
       return cloudinary_url(public_id, options);
     },
     video_thumbnail_url: function(public_id, options) {
-      options = $.extend(DEFAULT_POSTER_OPTIONS, options);
+      options = $.extend({}, DEFAULT_POSTER_OPTIONS, options);
       return cloudinary_url(public_id, options);
     },
     url_internal: cloudinary_url,
@@ -546,6 +565,13 @@
       options = $.extend({}, options);
       return generate_transformation_string(options);
     },
+    /**
+     * Generate an HTML image tag based on the public ID and options
+     * as a jQuery object. The tag is preinitialized with cloudinary functionality.
+     * @param {String} public_id the cloudinary resource ID
+     * @param {String} [options]
+     * @returns {jQuery} Image tag
+     */
     image: function(public_id, options) {
       options = $.extend({}, options);
       var url = prepare_html_url(public_id, options);
@@ -553,7 +579,8 @@
       return img;
     },
     video_thumbnail: function(public_id, options) {
-      image(public_id, $.merge(DEFAULT_POSTER_OPTIONS, options));
+      options = $.extend({}, DEFAULT_POSTER_OPTIONS, options);
+      image(public_id, options);
     },
     facebook_profile_image: function(public_id, options) {
       return $.cloudinary.image(public_id, $.extend({type: 'facebook'}, options));
@@ -570,6 +597,76 @@
     fetch_image: function(public_id, options) {
       return $.cloudinary.image(public_id, $.extend({type: 'fetch'}, options));
     },
+    /**
+     * Creates an HTML video tag for the provided public_id
+     * @param {String} public_id the resource public ID
+     * @param {Object} [options] options for the resource and HTML tag
+     * @param {(String|Array<String>)} [options.source_types] Specify which
+     *        source type the tag should include. defaults to webm, mp4 and ogv.
+     * @param {String} [options.source_transformation] specific transformations
+     *        to use for a specific source type.
+     * @param {(String|Object)} [options.poster] image URL or
+     *        poster options that may include a <tt>public_id</tt> key and
+     *        poster-specific transformations
+     * @example <caption>Exmaple of generating a video tag:</caption>
+     * $.cloudinary.video("mymovie.mp4");
+     * $.cloudinary.video("mymovie.mp4", {source_types: 'webm'});
+     * $.cloudinary.video("mymovie.ogv", {poster: "myspecialplaceholder.jpg"});
+     * $.cloudinary.video("mymovie.webm", {source_types: ['webm', 'mp4'], poster: {effect: 'sepia'}});
+     * @return {string} HTML video tag
+     */
+    video: function(public_id, options) {
+      options = options || {};
+      public_id = public_id.replace(/\.(mp4|ogv|webm)$/, '');
+      var source_types = option_consume(options, 'source_types', []);
+      var source_transformation = option_consume(options, 'source_transformation', {});
+      var fallback = option_consume(options, 'fallback_content', '');
+
+      if (source_types.length == 0) source_types = DEFAULT_VIDEO_SOURCE_TYPES;
+      var video_options = $.extend(true, {}, options);
+
+      if (video_options.hasOwnProperty('poster')) {
+        if ($.isPlainObject(video_options.poster)) {
+          if (video_options.poster.hasOwnProperty('public_id')) {
+            video_options.poster = cloudinary_url(video_options.poster.public_id, video_options.poster);
+          } else {
+            video_options.poster = cloudinary_url(public_id, $.extend({}, DEFAULT_POSTER_OPTIONS, video_options.poster));
+          }
+        }
+      } else {
+        video_options.poster = cloudinary_url(public_id, $.extend({}, DEFAULT_POSTER_OPTIONS, options));
+      }
+      
+      if (!video_options.poster) delete video_options.poster;
+
+      var html = '<video ';
+
+      if (!video_options.hasOwnProperty('resource_type')) video_options.resource_type = 'video';
+      var multi_source = $.isArray(source_types) && source_types.length > 1;
+      var source = public_id;
+      if (!multi_source){
+        source = source + '.' + build_array(source_types)[0];
+      }
+      var src = cloudinary_url(source, video_options);
+      if (!multi_source) video_options.src = src;
+      if (video_options.hasOwnProperty("html_width")) video_options.width = option_consume(video_options, 'html_width');
+      if (video_options.hasOwnProperty("html_height")) video_options.height = option_consume(video_options, 'html_height');
+      html = html + html_attrs(video_options) + '>';
+      if (multi_source) {          
+        for(var i = 0; i < source_types.length; i++) {
+          var source_type = source_types[i];
+          var transformation = source_transformation[source_type] || {};
+          src = cloudinary_url(source + "." + source_type, $.extend(true, {resource_type: 'video'}, options, transformation));
+          var video_type = source_type == 'ogv' ? 'ogg' : source_type;
+          var mime_type = "video/" + video_type;
+          html = html + '<source '+ html_attrs({src: src, type: mime_type}) + '>';
+        }
+      }
+
+      html = html + fallback;
+      html = html + '</video>';
+      return html;
+    },
     sprite_css: function(public_id, options) {
       options = $.extend({type: 'sprite'}, options);
       if (!public_id.match(/.css$/)) options.format = 'css';
@@ -580,15 +677,16 @@
      * Use the following classes:
      * - cld-hidpi - only set dpr_auto
      * - cld-responsive - update both dpr_auto and w_auto
-     * @param: options
-     * - responsive_resize - should responsive images be updated on resize (default: true).
-     * - responsive_debounce - if set, how many milliseconds after resize is done before the image is replaces (default: 100). Set to 0 to disable.
-     * - responsive_use_stoppoints:
-     *   - true - always use stoppoints for width
-     *   - "resize" - use exact width on first render and stoppoints on resize (default)
-     *   - false - always use exact width
      * Stoppoints - to prevent creating a transformation for every pixel, stop-points can be configured. The smallest stop-point that is larger than
      *    the wanted width will be used. The default stoppoints are all the multiples of 10. See calc_stoppoint for ways to override this.
+     * @param {Object} options
+     * @param {boolean} [options.responsive_resize=true] should responsive images be updated on resize (default: true).
+     * @param {integer} [options.responsive_debounce=100] if set, how many milliseconds after resize is done before the image is replaces (default: 100). Set to 0 to disable.
+     * @param {boolean|String} [options.responsive_use_stoppoints]
+     *   <ul><li>true - always use stoppoints for width</li>
+     *   <li>"resize" - use exact width on first render and stoppoints on resize (default)</li>
+     *   <li>false - always use exact width</li></ul>
+     * @param {boolean} [options.responsive_preserve_height] if set to true, original css height is perserved. Should only be used if the transformation supports different aspect ratios.
      */
       responsive: function(options) {
       responsive_config = $.extend(responsive_config || {}, options);
@@ -667,15 +765,15 @@
 
   /**
    * Update hidpi (dpr_auto) and responsive (w_auto) fields according to the current container size and the device pixel ratio.
-   * Only images marked with the cld-responsive class have w_auto updated.
-   * options:
-   * - responsive_use_stoppoints:
-   *   - true - always use stoppoints for width
-   *   - "resize" - use exact width on first render and stoppoints on resize (default)
-   *   - false - always use exact width
-   * - responsive:
-   *   - true - enable responsive on this element. Can be done by adding cld-responsive.
-   *            Note that $.cloudinary.responsive() should be called once on the page.
+   * Only images marked with the <tt>cld-responsive</tt> class have w_auto updated.
+   * @param {Object} [options] Options
+   * @param {boolean|String} [options.responsive_use_stoppoints]
+   *   <ul><li>true - always use stoppoints for width</li>
+   *   <li>"resize" - use exact width on first render and stoppoints on resize (default)</li>
+   *   <li>false - always use exact width</li></ul>
+   * @param {boolean} [options.responsive] if true, enable responsice on this element. Note that $.cloudinary.responsive() should be called once on the page.
+   * @param {boolean} [options.responsive_preserve_height] if set to true, original css height is perserved. Should only be used if the transformation supports different aspect ratios.
+   * @return {$.fn}
    */
   $.fn.cloudinary_update = function(options) {
     options = options || {};
@@ -700,8 +798,8 @@
 
         for (nthParent = 0; nthParent < parentsLength; nthParent+=1) {
           container = parents[nthParent];
-          if (container && container.clientWidth) {
-            containerWidth = container.clientWidth;
+          containerWidth = $(container).width();
+          if (containerWidth) {
             break;
           }
         }
@@ -721,7 +819,7 @@
         }
         src = src.replace(/\bw_auto\b/g, "w_" + requestedWidth);
         attrs.width = null;
-        attrs.height = null;
+        if (!options.responsive_preserve_height) attrs.height = null;
       }
       // Update dpr according to the device's devicePixelRatio
       attrs.src = src.replace(/\bdpr_(1\.0|auto)\b/g, "dpr_" + $.cloudinary.device_pixel_ratio());
@@ -730,7 +828,6 @@
     return this;
   };
 
-
   var webp = null;
   $.fn.webpify = function(options, webp_options) {
     var that = this;
@@ -838,7 +935,9 @@
 
       if (!this.fileupload('option').url) {
         var cloud_name = options.cloud_name || $.cloudinary.config().cloud_name;
-        var upload_url = "https://api.cloudinary.com/v1_1/" + cloud_name + "/upload";
+        var resource_type = options.resource_type || "auto";
+        var type = options.type || "upload";
+        var upload_url = "https://api.cloudinary.com/v1_1/" + cloud_name + "/" + resource_type + "/" + type;
         this.fileupload('option', 'url', upload_url);
       }
     }
@@ -855,9 +954,13 @@
     options = options || {};
     upload_params = $.extend({}, upload_params) || {};
 
-    if (upload_params.cloud_name) {
-      options.cloud_name = upload_params.cloud_name;
-      delete upload_params.cloud_name;
+    var attrs_to_move = ["cloud_name", "resource_type", "type"];
+    for (var i = 0; i < attrs_to_move.length; i++) {
+      var attr = attrs_to_move[i];
+      if (upload_params[attr]) {
+        options[attr] = upload_params[attr];
+        delete upload_params[attr];
+      }
     }
 
     // Serialize upload_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.85
+  version: 1.1.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   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: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library for easily using the Cloudinary service
@@ -105,8 +105,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -169,17 +169,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cloudinary
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service