cloudinary 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fcfb2ec23208e42dc314f218a803b9ddc0d62fc
-  data.tar.gz: d77b2eceee548a28eccca9f3b653cc8946936d2b
+  metadata.gz: 334dc407a90f5a0d121718d87976528ec216786c
+  data.tar.gz: e326b4b46e3a18c3bbe3367ad460d208f169972e
 SHA512:
-  metadata.gz: 326be4f55c3abb55067a0dd4353e2b9bf4607a09f068bc78569094f4bb50006dfed3474863ffcea9a486b3f515ef7dc074d2833b54d8de1924cc8289edddafc7
-  data.tar.gz: 755b17418a13dd7749947a78af187c01edec641a82097425af880a66b43a7d2b30036940f0e397788c6d65a1b7e84dbf9fcc053c90f81a2282bf52a3b74ccfb3
+  metadata.gz: e163279980d8a009331cf45d5f946e8ac7579c4c2086ff15311ccd872eef6e9a19e43e66996de42b5a6a6a719b52e0b1e3f59d5d8a9fa54c18141f931b6608c0
+  data.tar.gz: 5a0cabe2f96432e09427c89e8b790bb3d68f345f34658867d991f8784cbda8a0bd76b04c9e92f4501a46ead871bfd53b54a7206a597ae5b424d59f054c0b8034

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+1.2.3 / 2016-08-21
+==================
+
+  * Allow a string to be passed as eager transformation
+  * Add `delete_derived_by_transformation` to the Api methods.
+  * Support videos mode for url suffixes. 
+  * Support url suffixes without private cdn
+  * Fix `values_match?`
+
 1.2.2 / 2016-07-16
 ==================
 

data/lib/cloudinary/api.rb

@@ -126,6 +126,22 @@ class Cloudinary::Api
     call_api(:delete, uri, { :derived_resource_ids => derived_resource_ids }, options)
   end
 
+  # Delete derived resources identified by transformation for the provided public_ids
+  # @param [String|Array] public_ids The resources the derived resources belong to
+  # @param [String|Hash|Array] transformations the transformation(s) associated with the derived resources
+  # @param [Hash] options
+  # @option options [String] :resource_type ("image")
+  # @option options [String] :type ("upload")
+  def self.delete_derived_by_transformation(public_ids, transformations, options={})
+    resource_type = options[:resource_type] || "image"
+    type          = options[:type] || "upload"
+    uri           = "resources/#{resource_type}/#{type}"
+    params = {:public_ids => public_ids}.merge(only(options, :invalidate))
+    params[:keep_original] = true
+    params[:transformations] = Cloudinary::Utils.build_eager(transformations)
+    call_api(:delete, uri, params, options)
+  end
+
   def self.tags(options={})
     resource_type = options[:resource_type] || "image"
     uri           = "tags/#{resource_type}"
@@ -144,9 +160,9 @@ class Cloudinary::Api
     call_api(:delete, "transformations/#{transformation_string(transformation)}", {}, options)
   end
 
-  # updates - supports:
-  #   "allowed_for_strict" boolean
-  #   "unsafe_update" transformation params - updates a named transformation parameters without regenerating existing images
+# updates - supports:
+#   "allowed_for_strict" boolean
+#   "unsafe_update" transformation params - updates a named transformation parameters without regenerating existing images
   def self.update_transformation(transformation, updates, options={})
     params                 = only(updates, :allowed_for_strict)
     params[:unsafe_update] = transformation_string(updates[:unsafe_update]) if updates[:unsafe_update]
@@ -157,7 +173,7 @@ class Cloudinary::Api
     call_api(:post, "transformations/#{name}", { :transformation => transformation_string(definition) }, options)
   end
 
-  # upload presets
+# upload presets
   def self.upload_presets(options={})
     call_api(:get, "upload_presets", only(options, :next_cursor, :max_results), options)
   end

data/lib/cloudinary/uploader.rb

@@ -286,6 +286,7 @@ class Cloudinary::Uploader
     api_url                  = Cloudinary::Utils.cloudinary_api_url(action, options)
     headers                  = { "User-Agent" => Cloudinary::USER_AGENT }
     headers['Content-Range'] = options[:content_range] if options[:content_range]
+    headers.merge!(options[:extra_headers]) if options[:extra_headers]
     RestClient::Request.execute(:method => :post, :url => api_url, :payload => params.reject { |k, v| v.nil? || v=="" }, :timeout => timeout, :headers => headers) do
     |response, request, tmpresult|
       raise CloudinaryException, "Server returned unexpected status code - #{response.code} - #{response.body}" unless [200, 400, 401, 403, 404, 500].include?(response.code)

data/lib/cloudinary/utils.rb

@@ -316,8 +316,6 @@ class Cloudinary::Utils
     url_suffix = options.delete(:url_suffix)
     use_root_path = config_option_consume(options, :use_root_path)
 
-    raise(CloudinaryException, "URL Suffix only supported in private CDN") if url_suffix.present? and not private_cdn
-
     original_source = source
     return original_source if source.blank?
     if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)
@@ -401,6 +399,9 @@ class Cloudinary::Utils
       when resource_type.to_s == "raw" && type.to_s == "upload"
         resource_type = "files"
         type = nil
+      when resource_type.to_s == "video" && type.to_s == "upload"
+        resource_type = "videos"
+        type = nil
       else
         raise(CloudinaryException, "URL Suffix only supported for image/upload, image/private and raw/upload")
       end
@@ -748,14 +749,21 @@ class Cloudinary::Utils
     }
   end
 
+  #
   # @private
+  # @param [String|Hash|Array] an eager transformation can be a string or hash, with or without a format. The parameter also accepts an array of eager transformations.
   def self.build_eager(eager)
     return nil if eager.nil?
     Cloudinary::Utils.build_array(eager).map do
     |transformation, format|
-      transformation = transformation.clone
-      format = transformation.delete(:format) || format
-      [Cloudinary::Utils.generate_transformation_string(transformation, true), format].compact.join("/")
+      unless transformation.is_a? String
+        transformation = transformation.clone
+        if transformation.respond_to?(:delete)
+          format = transformation.delete(:format) || format
+        end
+        transformation = Cloudinary::Utils.generate_transformation_string(transformation, true)
+      end
+      [transformation, format].compact.join("/")
     end.join("|")
   end
 

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/api_spec.rb

@@ -125,6 +125,28 @@ describe Cloudinary::Api do
     @api.delete_derived_resources(derived_resource_id)
   end
 
+  it "should allow deleting derived resources by transformations" do
+    public_id = "public_id"
+    transformations = "c_crop,w_100"
+    expect(RestClient::Request).to receive(:execute).with(
+        deep_hash_value( {[:payload, :public_ids] => public_id,
+                          [:payload, :transformations] => "c_crop,w_100"}))
+    @api.delete_derived_by_transformation(public_id, "c_crop,w_100")
+
+    transformations = {:crop => "crop", :width => 100}
+    expect(RestClient::Request).to receive(:execute).with(
+        deep_hash_value( {[:payload, :public_ids] => public_id,
+                          [:payload, :transformations] => "c_crop,w_100"}))
+    @api.delete_derived_by_transformation(public_id, transformations)
+
+    transformations = [{:crop => "crop", :width => 100}, {:crop => "scale", :width => 300}]
+    expect(RestClient::Request).to receive(:execute).with(
+        deep_hash_value( {[:payload, :public_ids] => public_id,
+                          [:payload, :transformations] => "c_crop,w_100|c_scale,w_300"}))
+    @api.delete_derived_by_transformation(public_id, transformations)
+
+  end
+
   it "should allow deleting resources" do
     expect(RestClient::Request).to receive(:execute).with(deep_hash_value( {[:payload, :public_ids] => ["apit_test", "test_id_2", "api_test3"]}))
     @api.delete_resources(["apit_test", "test_id_2", "api_test3"])

data/spec/spec_helper.rb

@@ -166,7 +166,7 @@ end
 RSpec::Matchers.define :deep_hash_value do |expected|
   match do |actual|
     expected.all? do |path, value|
-      Cloudinary.values_match? deep_fetch(actual, path), value
+      Cloudinary.values_match? value, deep_fetch(actual, path)
     end
   end
 end
@@ -175,7 +175,7 @@ RSpec::Matchers.alias_matcher :have_deep_hash_values_of, :deep_hash_value
 
 module Cloudinary
   # @api private
-  def self.values_match?( actual, expected)
+  def self.values_match?(expected, actual)
     if Hash === actual
       return hashes_match?(expected, actual) if Hash === expected
     elsif Array === expected && Enumerable === actual && !(Struct === actual)

data/spec/uploader_spec.rb

@@ -83,7 +83,18 @@ describe Cloudinary::Uploader do
   end
   
   it "should support eager" do
-    Cloudinary::Uploader.upload(TEST_IMG, :eager =>[{ :crop =>"scale", :width =>"2.0"}], :tags => [TEST_TAG, TIMESTAMP_TAG])
+    result = Cloudinary::Uploader.upload(TEST_IMG, :eager =>[{ :crop =>"scale", :width =>"2.0"}], :tags => [TEST_TAG, TIMESTAMP_TAG])
+    expect(result["eager"].length).to be(1)
+    expect(result).to have_deep_hash_values_of(["eager", 0, "transformation"] => "c_scale,w_2.0")
+    result = Cloudinary::Uploader.upload(TEST_IMG, :eager =>"c_scale,w_2.0", :tags => [TEST_TAG, TIMESTAMP_TAG])
+    expect(result["eager"].length).to be(1)
+    expect(result).to have_deep_hash_values_of(["eager", 0, "transformation"] => "c_scale,w_2.0")
+    result = Cloudinary::Uploader.upload(TEST_IMG, :eager =>["c_scale,w_2.0", { :crop =>"crop", :width =>"0.5", :format => "tiff"}], :tags => [TEST_TAG, TIMESTAMP_TAG])
+    expect(result["eager"].length).to be(2)
+    expect(result).to have_deep_hash_values_of(
+                          ["eager", 0, "transformation"] => "c_scale,w_2.0",
+                          ["eager", 1, "transformation"] => "c_crop,w_0.5/tiff"
+                      )
   end
 
   it "should support headers" do

data/spec/utils_spec.rb

@@ -87,8 +87,13 @@ describe Cloudinary::Utils do
             .and empty_options
   end
 
-  it "should disallow url_suffix in shared distribution" do
-    expect { Cloudinary::Utils.cloudinary_url("test", { :url_suffix => "hello" }) }.to raise_error(CloudinaryException)
+  it "should support url_suffix in shared distribution" do
+    expect(["test", { :url_suffix => "hello" }])
+      .to produce_url("http://res.cloudinary.com/#{cloud_name}/images/test/hello")
+            .and empty_options
+    expect(["test", { :url_suffix => "hello", :angle => 0 }])
+      .to produce_url("http://res.cloudinary.com/#{cloud_name}/images/a_0/test/hello")
+            .and empty_options
   end
 
   it "should disallow url_suffix in non upload types" do
@@ -133,6 +138,12 @@ describe Cloudinary::Utils do
             .and empty_options
   end
 
+  it "should support url_suffix for videos" do
+    expect(["test", { :url_suffix => "hello", :private_cdn => true, :resource_type => :video }])
+      .to produce_url("http://#{cloud_name}-res.cloudinary.com/videos/test/hello")
+            .and empty_options
+  end
+
   it "should support url_suffix for private uploads" do
     expect(["test", { :url_suffix => "hello", :private_cdn => true, :resource_type => :image, :type => :private }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/private_images/test/hello")

metadata

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