cloudinary 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 675877dafeb654d86f21a603814835b907b0b560
-  data.tar.gz: 0afd3a11251a44cbc84293ded02975cd1473b01b
+  metadata.gz: 7a96fb520a45441c0cc40d980dc03836c6b7ffc4
+  data.tar.gz: 29924a2fa48916d03132b9bf6a080749471b558d
 SHA512:
-  metadata.gz: d33e51978a4d8e65e5c7bb1463d8fe1c17ffbf8e4c099fb5b9cf4160877e69c6bd60698507e6718d1457ee713b4168d5782058a9399c3f5b67522e3c0bb16e02
-  data.tar.gz: 1833b23e9d849a38ddc2d88844d89b33bb903c0e4acfcc6ede358995338df7fbb8922887fd924e96ae6be9f46964db69f3bdfe9f2b45036444d511647eedef0f
+  metadata.gz: 86b21f0e18c8759c79162d2b8f2cde2f1fd8807eae924c4fa6906f698f4a92e518763328a91dc36022c62edbf8772bad6b5f3885b41e4457831d1f11dcdd0d56
+  data.tar.gz: 94b7b4a747cb5bab25112cf0ac2041df8fa48009efbbc7f5719fe2df809ea3ae0d0f823928a3b0c6862839f4f3124db8ab3f0e6b2f2de52500d168570d118cb4

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+1.4.0 / 2017-01-30
+==================
+
+  * Add Akamai token generator
+  * Merge pull request #201 from nashby/fix-image-formats
+  * Remove video formats from the image formats array.
+
 1.3.0 / 2016-12-22
 ==================
 

data/lib/cloudinary/akamai.rb

@@ -0,0 +1,50 @@
+require 'openssl'
+
+module Cloudinary
+  module Akamai
+    SEPARATOR = '~'
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def generate_token(options)
+        key = options[:key] || Cloudinary.config.akamai_key
+        throw "Missing akamai_key configuration" unless key
+        name = options[:token_name] || "__cld_token__"
+        start = options[:start_time]
+        expiration = options[:end_time]
+        ip = options[:ip]
+        acl = options[:acl]
+        window = options[:window]
+
+        start = Time.new.getgm.to_i if start == 'now'
+        unless expiration
+          if window
+            expiration = (start || Time.new.getgm.to_i) + window
+          else
+            throw 'Must provide either end_time or window'
+          end
+        end
+
+        token = []
+        token << "ip=#{ip}" if ip
+        token << "st=#{start}" if start
+        token << "exp=#{expiration}"
+        token << "acl=#{acl}"
+        auth = digest(token.join(SEPARATOR), key)
+        token << "hmac=#{auth}"
+        "#{name}=#{token.join(SEPARATOR)}"
+      end
+
+      private
+
+      def digest(message, key = Cloudinary.config.akamai_key)
+        bin_key = Array(key).pack("H*")
+        digest = OpenSSL::Digest::SHA256.new
+        OpenSSL::HMAC.hexdigest(digest, bin_key, message)
+      end
+    end
+  end
+end

data/lib/cloudinary/utils.rb

@@ -5,8 +5,10 @@ require 'uri'
 require 'aws_cf_signer'
 require 'json'
 require 'cgi'
+require 'cloudinary/akamai'
 
 class Cloudinary::Utils
+  include Cloudinary::Akamai
   # @deprecated Use Cloudinary::SHARED_CDN
   SHARED_CDN = Cloudinary::SHARED_CDN
   DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION = {:width => :auto, :crop => :limit}
@@ -626,7 +628,7 @@ class Cloudinary::Utils
     end
   end
 
-  IMAGE_FORMATS = %w(ai bmp bpg djvu eps eps3 flif gif h264 hdp hpx ico j2k jp2 jpc jpe jpg miff mka mp4 pdf png psd svg tif tiff wdp webm webp zip )
+  IMAGE_FORMATS = %w(ai bmp bpg djvu eps eps3 flif gif hdp hpx ico j2k jp2 jpc jpe jpg miff pdf png psd svg tif tiff wdp webp zip )
 
   AUDIO_FORMATS = %w(aac aifc aiff flac m4a mp3 ogg wav)
 

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/api_spec.rb

@@ -373,6 +373,10 @@ describe Cloudinary::Api do
     Cloudinary::Api.subfolders("test_folder1")
   end
 
+  it "should throw if folder is missing" do
+    Cloudinary::Api.subfolders("I_do_not_exist")
+  end
+
   describe '.restore'  do
     it 'should restore a deleted resource' do
       expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:payload, :public_ids] => "api_test_restore", [:url] => /.*\/restore$/))

data/spec/utils_methods_spec.rb

@@ -7,12 +7,46 @@ include Cloudinary
 describe Utils do
 
   it 'should parse integer range values' do
-    expect(Utils.instance_eval {norm_range_value("200")}).to eq( "200")
+    expect(Utils.instance_eval { norm_range_value("200") }).to eq("200")
   end
   it "should parse float range values" do
-    expect(Utils.instance_eval {norm_range_value("200.0")}).to eq("200.0"), "parse a float"
+    expect(Utils.instance_eval { norm_range_value("200.0") }).to eq("200.0"), "parse a float"
   end
   it "should parse a percent range value" do
-    expect(Utils.instance_eval {norm_range_value("20p")}).to eq("20p")
+    expect(Utils.instance_eval { norm_range_value("20p") }).to eq("20p")
+  end
+  describe 'Utils.generate_token' do
+    config_backup = Cloudinary.config.clone
+    before do
+      Cloudinary.config.akamai_key = '00112233FF99'
+    end
+    after do
+      Cloudinary.config.each_pair { |k, _| Cloudinary.config.delete_field(k) }
+      Cloudinary.config(config_backup.to_h)
+    end
+    it "should generate an Akamai token with start_time and window" do
+      token = Utils.generate_token start_time: 1111111111, acl: '/image/*', window: 300
+      expect(token).to eq('__cld_token__=st=1111111111~exp=1111111411~acl=/image/*~hmac=0854e8b6b6a46471a80b2dc28c69bd352d977a67d031755cc6f3486c121b43af')
+    end
+    it "should generate an Akamai token with window" do
+      first_exp = Time.new.getgm.to_i + 300
+      # expiration is calculated automatically as now + window
+      token = Utils.generate_token acl: '*', window: 300
+      second_exp = Time.new.getgm.to_i + 300
+      match = /exp=(\d+)/.match(token)
+      expect(match[1]).to be_truthy
+      expiration = match[1].to_i
+      expect(expiration).to be_between(first_exp, second_exp)
+      expect(Utils.generate_token acl: '*', end_time: expiration).to eq(token)
+    end
+
+    it "should accept a key" do
+      expect(Utils.generate_token acl: '*', end_time: 10000000, key: '00aabbff')
+          .to eq('__cld_token__=exp=10000000~acl=*~hmac=030eafb6b19e499659d699b3d43e7595e35e3c0060e8a71904b3b8c8759f4890')
+    end
+    it "should throw if no end_time or window is provided" do
+      expect { Utils.generate_token acl: '*' }.to raise_error
+
+    end
   end
 end

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

@@ -1,6 +1,6 @@
 
 /**
- * Cloudinary's JavaScript library - Version 2.1.8
+ * Cloudinary's JavaScript library - Version 2.1.9
  * Copyright Cloudinary
  * see https://github.com/cloudinary/cloudinary_js
  *
@@ -1370,7 +1370,7 @@ var slice = [].slice,
       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_breakpoints", "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", "responsive_class", "responsive_use_breakpoints", "responsive_width", "round_dpr", "secure", "secure_cdn_subdomain", "secure_distribution", "shorten", "type", "url_suffix", "use_root_path", "version"];
 
 
     /**
@@ -2715,10 +2715,12 @@ var slice = [].slice,
     /** @override */
 
     ImageTag.prototype.attributes = function() {
-      var attr;
+      var attr, options, srcAttribute;
       attr = ImageTag.__super__.attributes.call(this) || [];
-      if (attr['src'] == null) {
-        attr['src'] = new Cloudinary(this.getOptions()).url(this.publicId);
+      options = this.getOptions();
+      srcAttribute = options.responsive && !options.client_hints ? 'data-src' : 'src';
+      if (attr[srcAttribute] == null) {
+        attr[srcAttribute] = new Cloudinary(this.getOptions()).url(this.publicId);
       }
       return attr;
     };
@@ -2913,7 +2915,7 @@ var slice = [].slice,
   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, findContainerWidth, maxWidth, updateDpr;
 
-    VERSION = "2.1.8";
+    VERSION = "2.1.9";
 
     CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
 
@@ -4148,7 +4150,7 @@ var slice = [].slice,
     TextLayer: TextLayer,
     SubtitlesLayer: SubtitlesLayer,
     Cloudinary: Cloudinary,
-    VERSION: "2.1.8",
+    VERSION: "2.1.9",
     CloudinaryJQuery: CloudinaryJQuery
   };
   return cloudinary;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -129,6 +129,7 @@ files:
 - Rakefile
 - cloudinary.gemspec
 - lib/cloudinary.rb
+- lib/cloudinary/akamai.rb
 - lib/cloudinary/api.rb
 - lib/cloudinary/blob.rb
 - lib/cloudinary/carrier_wave.rb