cloudinary 1.8.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd535c0bc5341c9ba6dc09a32f24b59886cbee9
-  data.tar.gz: 410e9129e4990f62ebbeeb2fe20cdf340db91277
+  metadata.gz: c78db40dfbd0f2a2fa579c3817208c11c89136be
+  data.tar.gz: c1f15ae49d99c4c1edb404cd6c49eb4a6c992a58
 SHA512:
-  metadata.gz: 808f9c7439fb2c6e0f2b3b9fba6bb92d96d08b9e3436723a22cdfa974bf1c4b6d64a3c1ea43a73d0fb46c09f20355c42c1922723535ba2246f10003776d7bc30
-  data.tar.gz: f04de4f7cd51a3e25b1f0b48153774f62ec0644a532eb48fc2db8b373a6e962507cce4db6025f17a2e8095bf0828fb992e53c4c2dd43068155938480bdb80ba8
+  metadata.gz: e8b61e2b1660f36ed2f4cb2b85a38010b8135455e1c1ad743dfe3f267c695c7f88195d038a7548fbe2f6c6d63a005dd458e396ba1f33370c937cf424f5ad14b0
+  data.tar.gz: dbec90b6f71bbad87e31740e419d225bd8804a012310ee55121661d93a48e4d136ae1b86e8ed80b86111d9f004dde54399c72e3f39138686b77616fc7624b92e

data/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+1.9.0 / 2018-02-27
+==================
+
+New functionality and features
+------------------------------
+
+  * Add `access_control` parameter to `upload` and `update`
+  * Add `format` to CarrierWave plug-in's `PreloadedFile` 
+
+Other Changes
+-------------
+
+  * Fix upload categorization test
+
 1.8.3 / 2018-02-04
 ==================
 

data/lib/cloudinary/api.rb

@@ -93,6 +93,7 @@ class Cloudinary::Api
     type           = options[:type] || "upload"
     uri            = "resources/#{resource_type}/#{type}/#{public_id}"
     update_options = {
+      :access_control     => Cloudinary::Utils.json_array_param(options[:access_control]),
       :tags               => options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(","),
       :context            => Cloudinary::Utils.encode_context(options[:context]),
       :face_coordinates   => Cloudinary::Utils.encode_double_array(options[:face_coordinates]),

data/lib/cloudinary/preloaded_file.rb

@@ -1,7 +1,7 @@
 class Cloudinary::PreloadedFile
   PRELOADED_CLOUDINARY_PATH = /^([^\/]+)\/([^\/]+)\/v(\d+)\/([^#]+)#([^\/]+)$/
 
-  attr_reader :filename, :version, :public_id, :signature, :resource_type, :type
+  attr_reader :filename, :version, :public_id, :signature, :resource_type, :type, :format
   def initialize(file_info)
     @resource_type, @type, @version, @filename, @signature = file_info.scan(PRELOADED_CLOUDINARY_PATH).first    
     @public_id, @format = Cloudinary::PreloadedFile.split_format(@filename)      
@@ -29,4 +29,4 @@ class Cloudinary::PreloadedFile
     return [public_id, format]    
   end
   
-end
+end

data/lib/cloudinary/uploader.rb

@@ -18,6 +18,7 @@ class Cloudinary::Uploader
     options.keys.each { |key| options[key.to_sym] = options.delete(key) if key.is_a?(String) }
 
     params = {
+      :access_control            => Cloudinary::Utils.json_array_param(options[:access_control]),
       :access_mode               => options[:access_mode],
       :allowed_formats           => Cloudinary::Utils.build_array(options[:allowed_formats]).join(","),
       :async                     => Cloudinary::Utils.as_safe_bool(options[:async]),

data/lib/cloudinary/utils.rb

@@ -313,6 +313,20 @@ class Cloudinary::Utils
     Digest::SHA1.hexdigest("#{to_sign}#{api_secret}")
   end
 
+  # Returns a JSON array as String.
+  # Yields the array before it is converted to JSON format
+  # @api private
+  # @param [Hash|String|Array<Hash>] data
+  # @return [String|nil] a JSON array string or `nil` if data is `nil`
+  def self.json_array_param(data)
+    return nil if data.nil?
+
+    data = JSON.parse(data) if data.is_a?(String)
+    data = [data] unless data.is_a?(Array)
+    data = yield data if block_given?
+    JSON.generate(data)
+  end
+
   def self.generate_responsive_breakpoints_string(breakpoints)
     return nil if breakpoints.nil?
     breakpoints = build_array(breakpoints)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.8.3"
+  VERSION = "1.9.0"
 end

data/spec/access_control_spec.rb

@@ -0,0 +1,99 @@
+require 'rspec'
+require 'cloudinary'
+require 'spec_helper'
+require 'time'
+
+# Calculates days as seconds
+def days(n)
+  n * 3600 * 24
+end
+
+describe "Access Control" do
+  let (:acl) {{
+      :access_type => 'anonymous',
+      :start => '2019-02-22 16:20:57 +0200',
+      :end => '2019-03-22 00:00 +0200'
+  }}
+  let (:acl_2) {{
+      :access_type => 'anonymous',
+      :start => '2019-02-22 16:20:57Z',
+      :end => '2019-03-22 00:00 +0200'
+  }}
+  let (:acl_string) {
+    '{"access_type":"anonymous","start":"2019-02-22 16:20:57 +0200","end":"2019-03-22 00:00 +0200"}'
+  }
+  let (:options) {{
+      :public_id => TIMESTAMP_TAG,
+      :tags => [TEST_TAG, TIMESTAMP_TAG, 'access_control_test']
+  }}
+  let(:resource ){
+    Cloudinary::Uploader.upload(
+      TEST_IMG,
+      options)
+  }
+  describe 'build_upload_params' do
+    it "should accept a Hash value" do
+      params = Cloudinary::Uploader.build_upload_params access_control: acl
+      expect(params).to have_key(:access_control)
+      expect(params[:access_control]).to be_a String
+      expect(params[:access_control]).to match(/^\[.+\]$/)
+
+    end
+    it "should accept an array of Hash values" do
+      params = Cloudinary::Uploader.build_upload_params access_control: [acl, acl_2]
+      expect(params).to have_key(:access_control)
+      expect(params[:access_control]).to be_a String
+      expect(params[:access_control]).to match(/^\[.+\]$/)
+      j = JSON.parse(params[:access_control])
+      expect(j.length).to be(2)
+      expect(j[0]["access_type"]).to eql(acl[:access_type])
+      expect(j[0]["start"]).to eql(acl[:start])
+      expect(j[0]["end"]).to eql(acl[:end])
+    end
+    it "should accept a JSON string" do
+      params = Cloudinary::Uploader.build_upload_params access_control: acl_string
+      expect(params).to have_key(:access_control)
+      expect(params[:access_control]).to be_a String
+      expect(params[:access_control]).to eql("[#{acl_string}]")
+    end
+  end
+
+  describe 'upload' do
+      break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
+      include_context "cleanup", TIMESTAMP_TAG
+
+      it 'should allow the user to define ACL in the upload parameters' do
+        options[:access_control] = [acl]
+        expect(RestClient::Request).to receive(:execute).with(
+            deep_hash_value( {[:payload, :access_control] => "[#{acl_string}]"})
+        ).and_call_original
+        expect(resource).to have_key('access_control')
+        response_acl = resource["access_control"]
+        expect(response_acl.length).to be(1)
+        expect(response_acl[0]["access_type"]).to eq("anonymous")
+        expect(Time.parse(response_acl[0]["start"])).to eq(Time.parse(acl[:start]))
+        expect(Time.parse(response_acl[0]["end"])).to eq(Time.parse(acl[:end]))
+      end
+  end
+  describe 'update' do
+      break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
+      include_context "cleanup", TIMESTAMP_TAG
+
+      it 'should allow the user to define ACL in the update parameters' do
+        resource # upload before setting the expect
+        expect(RestClient::Request).to receive(:execute).with(
+            deep_hash_value( {[:payload, :access_control] => "[#{acl_string}]"})
+        ).and_call_original
+        result = Cloudinary::Api.update(
+            resource['public_id'],
+            :tags => [TEST_TAG, TIMESTAMP_TAG, 'access_control_test'],
+            :access_control => acl)
+        expect(result).to have_key('access_control')
+        response_acl = result["access_control"]
+        expect(response_acl.length).to be(1)
+        expect(response_acl[0]["access_type"]).to eq("anonymous")
+        expect(Time.parse(response_acl[0]["start"])).to eq(Time.parse(acl[:start]))
+        expect(Time.parse(response_acl[0]["end"])).to eq(Time.parse(acl[:end]))
+      end
+  end
+end

data/spec/uploader_spec.rb

@@ -269,7 +269,7 @@ describe Cloudinary::Uploader do
   end
   
   it "should support requesting categorization" do
-    expect{Cloudinary::Uploader.upload(TEST_IMG, { :categorization => :illegal, :tags => [TEST_TAG, TIMESTAMP_TAG]})}.to raise_error(CloudinaryException, /Illegal value|not a valid|is invalid/)
+    expect{Cloudinary::Uploader.upload(TEST_IMG, { :categorization => :illegal, :tags => [TEST_TAG, TIMESTAMP_TAG]})}.to raise_error(CloudinaryException, /Illegal value|not a valid|is not valid/)
   end
   
   it "should support requesting detection" do

data/spec/utils_methods_spec.rb

@@ -15,4 +15,40 @@ describe Utils do
   it "should parse a percent range value" do
     expect(Utils.instance_eval { norm_range_value("20p") }).to eq("20p")
   end
+  describe "json_array_param" do
+    let (:data) {{:one => 1, :two => 2, "three" => 3}}
+    let (:data_s) {"{\"one\":1,\"two\":2,\"three\":3}"}
+    let (:data2) {{:foo => "bar"}}
+    let (:data2_s) {"{\"foo\":\"bar\"}"}
+    it "should convert a hash to json array" do
+      result = Utils.json_array_param(data)
+      expect(result).to match(/^\[.+\]$/)
+    end
+    it "should convert an array of hash to json array" do
+      result = Utils.json_array_param([data, data2])
+      expect(result).to eql("[#{data_s},#{data2_s}]")
+    end
+    it "should convert a json string to json array string" do
+      result = Utils.json_array_param(data_s)
+      expect(result).to eql("[#{data_s}]")
+    end
+    it "should accept a JSON array string and return it" do
+      result = Utils.json_array_param("[#{data_s},#{data2_s}]")
+      expect(result).to eql("[#{data_s},#{data2_s}]")
+    end
+    it "should throw an error if input string is not valid json string" do
+      expect{Utils.json_array_param("I'm not a JSON object!")}.to raise_error(JSON::ParserError)
+    end
+    it "should support a block" do
+      hash = {:block => "works"}
+      hash_s = '{"block":"works"}'
+      result = Utils.json_array_param(data) do |array|
+        array[0]['foo'] = 'foobar'
+        array.push(hash)
+
+      end
+      expect(result).to include(hash_s)
+      expect(result).to include('foobar')
+    end
+  end
 end

data/spec/utils_spec.rb

@@ -727,6 +727,17 @@ describe Cloudinary::Utils do
     signature = Cloudinary::Utils.api_sign_request({ :public_id => "folder/file", :version => "1234" }, Cloudinary.config.api_secret)
     preloaded = Cloudinary::PreloadedFile.new("image/upload/v1234/folder/file.jpg#" + signature)
     expect(preloaded).to be_valid
+    [
+      [:filename, 'folder/file.jpg'],
+      [:version, '1234'],
+      [:public_id, 'folder/file'],
+      [:signature, signature],
+      [:resource_type, 'image'],
+      [:type, 'upload'],
+      [:format, 'jpg']
+    ].each do |attr,value|
+      expect(preloaded.send(attr)).to eq(value)
+    end
   end
 
   it "should escape public_ids" do

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

@@ -1,6 +1,6 @@
 
 /**
- * Cloudinary's JavaScript library - Version 2.4.0
+ * Cloudinary's JavaScript library - Version 2.5.0
  * Copyright Cloudinary
  * see https://github.com/cloudinary/cloudinary_js
  *
@@ -3460,9 +3460,9 @@ var slice = [].slice,
 
   })(HtmlTag);
   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;
+    var AKAMAI_SHARED_CDN, CF_SHARED_CDN, DEFAULT_POSTER_OPTIONS, DEFAULT_VIDEO_SOURCE_TYPES, OLD_AKAMAI_SHARED_CDN, SEO_TYPES, SHARED_CDN, VERSION, absolutize, applyBreakpoints, cdnSubdomainNumber, closestAbove, cloudinaryUrlPrefix, defaultBreakpoints, finalizeResourceType, findContainerWidth, maxWidth, updateDpr;
 
-    VERSION = "2.4.0";
+    VERSION = "2.5.0";
 
     CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
 
@@ -3479,6 +3479,14 @@ var slice = [].slice,
 
     DEFAULT_VIDEO_SOURCE_TYPES = ['webm', 'mp4', 'ogv'];
 
+    SEO_TYPES = {
+      "image/upload": "images",
+      "image/private": "private_images",
+      "image/authenticated": "authenticated_images",
+      "raw/upload": "files",
+      "video/upload": "videos"
+    };
+
 
     /**
     * @const {Object} Cloudinary.DEFAULT_IMAGE_PARAMS
@@ -3586,7 +3594,13 @@ var slice = [].slice,
      */
 
     finalizeResourceType = function(resourceType, type, urlSuffix, useRootPath, shorten) {
-      var options;
+      var key, options;
+      if (resourceType == null) {
+        resourceType = "image";
+      }
+      if (type == null) {
+        type = "upload";
+      }
       if (Util.isPlainObject(resourceType)) {
         options = resourceType;
         resourceType = options.resource_type;
@@ -3599,17 +3613,17 @@ var slice = [].slice,
         type = 'upload';
       }
       if (urlSuffix != null) {
-        if (resourceType === 'image' && type === 'upload') {
-          resourceType = "images";
-          type = null;
-        } else if (resourceType === 'image' && type === 'private') {
-          resourceType = 'private_images';
-          type = null;
-        } else if (resourceType === 'raw' && type === 'upload') {
-          resourceType = 'files';
-          type = null;
-        } else {
-          throw new Error("URL Suffix only supported for image/upload and raw/upload");
+        resourceType = SEO_TYPES[resourceType + "/" + type];
+        type = null;
+        if (resourceType == null) {
+          throw new Error("URL Suffix only supported for " + (((function() {
+            var results;
+            results = [];
+            for (key in SEO_TYPES) {
+              results.push(key);
+            }
+            return results;
+          })()).join(', ')));
         }
       }
       if (useRootPath) {
@@ -3674,9 +3688,6 @@ var slice = [].slice,
       if (!options.cloud_name) {
         throw 'Unknown cloud_name';
       }
-      if (options.url_suffix && !options.private_cdn) {
-        throw 'URL Suffix only supported in private CDN';
-      }
       if (publicId.search('/') >= 0 && !publicId.match(/^v[0-9]+/) && !publicId.match(/^https?:\//) && !((ref = options.version) != null ? ref.toString() : void 0)) {
         options.version = 1;
       }
@@ -4702,7 +4713,7 @@ var slice = [].slice,
     TextLayer: TextLayer,
     SubtitlesLayer: SubtitlesLayer,
     Cloudinary: Cloudinary,
-    VERSION: "2.4.0",
+    VERSION: "2.5.0",
     CloudinaryJQuery: CloudinaryJQuery
   };
   return cloudinary;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -169,6 +169,7 @@ files:
 - lib/cloudinary/version.rb
 - lib/cloudinary/video_helper.rb
 - lib/tasks/cloudinary.rake
+- spec/access_control_spec.rb
 - spec/api_spec.rb
 - spec/archive_spec.rb
 - spec/auth_token_spec.rb
@@ -230,6 +231,7 @@ signing_key:
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
 test_files:
+- spec/access_control_spec.rb
 - spec/api_spec.rb
 - spec/archive_spec.rb
 - spec/auth_token_spec.rb