cloudinary 1.10.1.pre.rc → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb25e44546e36644c7d562315948d628363ac984bffa7996d0bee6892b58847c
-  data.tar.gz: c3e79edcf802119dfeac58f0d29d21486069e1ae3969cc29ccc1dcd7fb67fa5f
+  metadata.gz: c1a428a9c1a34b4a9b89df196292b88396095867df660cc2c327d7427dab2d1f
+  data.tar.gz: 43a242c30de9e936d416b6cce0af16029456e913b31609e772631c02c2367409
 SHA512:
-  metadata.gz: 7709d94ff7742280031303c25fb8c19f8f45404b0d44eb372fb3a08865996433274780dee195be1a203467653f88de221cb28fbaa585d9a6559c78ac85fb80cf
-  data.tar.gz: ad6b1ea6ecda326aad5afd5b3d794abd1851778d59bab1ec692f6ea69da4897fc8edaea0a36bfd9b30b1e5988786556ed1c3fa5eb43c731681dfbda3fd834407
+  metadata.gz: b17ad9f448a25c419ef19ea8df67d87d774fdf9fe03c48300a9575fd2efcd3cc0ce51990a1656db517334ad1aefadd1e3f4923a6c5bef539771f6c8fccdeee84
+  data.tar.gz: ae35973b12d626696eba7c41d631c36f30f9a3c8fb107fffeed37161959958b91dfa1d5e5682962c077f3db2314d82b2e802e0a65c55cbaa9d1f022e778013ed

data/CHANGELOG.md

@@ -1,4 +1,27 @@
 
+1.11.0 / 2018-12-12
+===================
+
+New functionality and features
+------------------------------
+
+  * Support new parameters and values:
+      * `auto` keyword in the `start_offset` 
+      * `art` artistic effect
+      * `fps`
+      * `quality_analysis`
+      * `quality_override`
+      * `pre` custom function transformation 
+  * Add namespace to the cloudinary controller to avoiding conflicts (#319)
+
+Other Changes
+-------------
+
+  * Add "Join the Community"
+  * Merge pull request #290 from zenspider/fix_carrierwave_deps
+      * Fixed direct references to ::CarrierWave with `defined?` guards.
+      * Fix debugging output to use mutex so output isn't garbled.
+
 1.10.1-rc / 2018-11-20
 ======================
 

data/README.md

@@ -266,6 +266,9 @@ Contact us [https://cloudinary.com/contact](https://cloudinary.com/contact)
 
 Stay tuned for updates, tips and tutorials: [Blog](https://cloudinary.com/blog), [Twitter](https://twitter.com/cloudinary), [Facebook](https://www.facebook.com/Cloudinary).
 
+## Join the Community ##########################################################
+
+Impact the product, hear updates, test drive new features and more! Join [here](https://www.facebook.com/groups/CloudinaryCommunity).
 
 ## License #######################################################################
 

data/lib/cloudinary.rb

@@ -153,7 +153,7 @@ module Cloudinary
 end
   # Prevent require loop if included after Rails is already initialized.
   require "cloudinary/helper" if defined?(::ActionView::Base)
-  require "cloudinary/controller" if defined?(::ActionController::Base)
+  require "cloudinary/cloudinary_controller" if defined?(::ActionController::Base)
   require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
   require "cloudinary/engine" if defined?(Rails) && defined?(Rails::Engine)
 

data/lib/cloudinary/api.rb

@@ -78,7 +78,18 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type          = options[:type] || "upload"
     uri           = "resources/#{resource_type}/#{type}/#{public_id}"
-    call_api(:get, uri, only(options, :colors, :exif, :faces, :image_metadata, :pages, :phash, :coordinates, :max_results), options)
+    call_api(:get, uri, 
+             only(options, 
+                  :colors,
+                  :coordinates,
+                  :exif,
+                  :faces,
+                  :image_metadata,
+                  :max_results,
+                  :pages,
+                  :phash,
+                  :quality_analysis
+             ), options)
   end
 
   def self.restore(public_ids, options={})
@@ -94,19 +105,20 @@ class Cloudinary::Api
     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(","),
+      :auto_tagging       => options[:auto_tagging] && options[:auto_tagging].to_f,
+      :background_removal => options[:background_removal],
+      :categorization     => options[:categorization],
       :context            => Cloudinary::Utils.encode_context(options[:context]),
-      :face_coordinates   => Cloudinary::Utils.encode_double_array(options[:face_coordinates]),
       :custom_coordinates => Cloudinary::Utils.encode_double_array(options[:custom_coordinates]),
+      :detection          => options[:detection],
+      :face_coordinates   => Cloudinary::Utils.encode_double_array(options[:face_coordinates]),
       :moderation_status  => options[:moderation_status],
-      :raw_convert        => options[:raw_convert],
+      :notification_url   => options[:notification_url],
+      :quality_override   => options[:quality_override],
       :ocr                => options[:ocr],
-      :categorization     => options[:categorization],
-      :detection          => options[:detection],
+      :raw_convert        => options[:raw_convert],
       :similarity_search  => options[:similarity_search],
-      :background_removal => options[:background_removal],
-      :auto_tagging       => options[:auto_tagging] && options[:auto_tagging].to_f,
-      :notification_url   => options[:notification_url]
+      :tags               => options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")
     }
     call_api(:post, uri, update_options, options)
   end

data/lib/cloudinary/carrier_wave.rb

@@ -3,7 +3,7 @@ require 'cloudinary/carrier_wave/process'
 require 'cloudinary/carrier_wave/error'
 require 'cloudinary/carrier_wave/remote'
 require 'cloudinary/carrier_wave/preloaded'
-require 'cloudinary/carrier_wave/storage'
+require 'cloudinary/carrier_wave/storage' if defined?(::CarrierWave) # HACK
 
 module Cloudinary::CarrierWave
 

data/lib/cloudinary/{controller.rb → cloudinary_controller.rb}

@@ -1,4 +1,4 @@
-module CloudinaryController
+module Cloudinary::CloudinaryController
   protected
   
   def valid_cloudinary_response?
@@ -10,4 +10,4 @@ module CloudinaryController
   end  
 end
 
-ActionController::Base.send :include, CloudinaryController
+ActionController::Base.send :include, Cloudinary::CloudinaryController

data/lib/cloudinary/migrator.rb

@@ -299,7 +299,9 @@ class Cloudinary::Migrator
   
   def debug(message)
     if @debug
-      $stderr.print "#{Time.now} Cloudinary::Migrator #{message}\n"
+      mutex.synchronize{
+        $stderr.print "#{Time.now} Cloudinary::Migrator #{message}\n"
+      }
     end
   end
 

data/lib/cloudinary/uploader.rb

@@ -51,6 +51,8 @@ class Cloudinary::Uploader
       :phash                     => Cloudinary::Utils.as_safe_bool(options[:phash]),
       :proxy                     => options[:proxy],
       :public_id                 => options[:public_id],
+      :quality_analysis          => Cloudinary::Utils.as_safe_bool(options[:quality_analysis]),
+      :quality_override          => options[:quality_override],
       :raw_convert               => options[:raw_convert],
       :responsive_breakpoints    => Cloudinary::Utils.generate_responsive_breakpoints_string(options[:responsive_breakpoints]),
       :return_delete_token       => Cloudinary::Utils.as_safe_bool(options[:return_delete_token]),

data/lib/cloudinary/utils.rb

@@ -85,6 +85,7 @@ class Cloudinary::Utils
       end_offset
       fetch_format
       flags
+      fps
       gravity
       height
       if
@@ -190,10 +191,14 @@ class Cloudinary::Utils
       options[:start_offset], options[:end_offset] = split_range options.delete(:offset)
     end
 
+    fps = options.delete(:fps)
+    fps = fps.join('-') if fps.is_a? Array
+
     overlay = process_layer(options.delete(:overlay))
     underlay = process_layer(options.delete(:underlay))
     ifValue = process_if(options.delete(:if))
     custom_function = process_custom_function(options.delete(:custom_function))
+    custom_pre_function = process_custom_pre_function(options.delete(:custom_pre_function))
 
     params = {
       :a   => normalize_expression(angle),
@@ -205,7 +210,8 @@ class Cloudinary::Utils
       :dpr => normalize_expression(dpr),
       :e   => normalize_expression(effect),
       :fl  => flags,
-      :fn  => custom_function,
+      :fn  => custom_function || custom_pre_function,
+      :fps => fps,
       :h   => normalize_expression(height),
       :l  => overlay,
       :o => normalize_expression(options.delete(:opacity)),
@@ -1063,6 +1069,11 @@ class Cloudinary::Utils
   end
   private_class_method :process_video_params
 
+  def self.process_custom_pre_function(param)
+    value = process_custom_function(param)
+    value ? "pre:#{value}" : NIL
+  end
+
   def self.process_custom_function(param)
     return param unless param.is_a? Hash
 

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.10.1-rc"
+  VERSION = "1.11.0"
 end

data/spec/api_spec.rb

@@ -130,6 +130,13 @@ describe Cloudinary::Api do
     expect(resource["derived"].length).to eq(1)
   end
 
+  it "should support the quality_analysis parameter" do
+    resource = @api.resource(test_id_1, :quality_analysis => true)
+    expect(resource).not_to be_blank
+    expect(resource).to have_key("quality_analysis")
+    expect(resource["quality_analysis"]).to have_key("focus")
+  end
+
   it "should allow deleting derived resource" do
     derived_resource_id = "derived_id"
     expect(RestClient::Request).to receive(:execute).with(deep_hash_value( {[:payload, :derived_resource_ids] => derived_resource_id}))
@@ -375,6 +382,14 @@ describe Cloudinary::Api do
     Cloudinary::Api.update("public_id", {:auto_tagging => 0.5})
   end
 
+  it "should support quality_override" do
+    ['auto:advanced', 'auto:best', '80:420', 'none'].each do |q|
+      expected = {[:payload, :quality_override] => q}
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      Cloudinary::Api.update Pathname.new(TEST_IMG), :quality_override => q
+    end
+  end
+
   it "should support listing by moderation kind and value" do
     expect(RestClient::Request).to receive(:execute).with(deep_hash_value([:url] => /.*manual\/approved$/, [:payload, :max_results] => 1000))
     Cloudinary::Api.resources_by_moderation(:manual, :approved, :max_results => 1000)

data/spec/uploader_spec.rb

@@ -35,6 +35,20 @@ describe Cloudinary::Uploader do
     expect(result["status"]).to eq("pending")
   end
 
+  it "should support the quality_analysis parameter" do
+    result = Cloudinary::Uploader.upload(Pathname.new(TEST_IMG), :quality_analysis => true, :tags => [TEST_TAG, TIMESTAMP_TAG])
+    expect(result).to have_key("quality_analysis")
+    expect(result["quality_analysis"]).to have_key("focus")
+  end
+
+  it "should support the quality_override parameter" do
+    ['auto:advanced', 'auto:best', '80:420', 'none'].each do |q|
+      expected = {[:payload, :quality_override] => q}
+      expect(RestClient::Request).to receive(:execute).with(deep_hash_value(expected))
+      Cloudinary::Uploader.upload Pathname.new(TEST_IMG), :quality_override => q
+    end
+  end
+
   describe '.rename' do
     before(:all) do
       @result        = Cloudinary::Uploader.upload(TEST_IMG, :tags => [TEST_TAG, TIMESTAMP_TAG])

data/spec/utils_spec.rb

@@ -458,6 +458,12 @@ describe Cloudinary::Utils do
             .and empty_options
   end
 
+  it "should support artistic effect" do
+    expect(["test", { :effect => "art:incognito"}])
+      .to produce_url("#{upload_path}/e_art:incognito/test")
+            .and empty_options
+  end
+
   it "should support keyframe_interval" do
     expect(["test", { :keyframe_interval => 10 }])
       .to produce_url("#{upload_path}/ki_10/test")
@@ -945,5 +951,20 @@ describe Cloudinary::Utils do
       expect( actual).to eq("fn_#{custom_function_remote_str}")
 
     end
+
+    it 'should accept a string value' do
+      actual = Cloudinary::Utils.generate_transformation_string :custom_pre_function => custom_function_wasm_str
+      expect( actual).to eq("fn_pre:#{custom_function_wasm_str}")
+    end
+    it 'should accept a hash of options' do
+      actual = Cloudinary::Utils.generate_transformation_string :custom_pre_function => custom_function_wasm
+      expect( actual).to eq("fn_pre:#{custom_function_wasm_str}")
+    end
+    it 'should base64 encoded URL for a remote function' do
+      actual = Cloudinary::Utils.generate_transformation_string :custom_pre_function => custom_function_remote
+      expect( actual).to eq("fn_pre:#{custom_function_remote_str}")
+
+    end
+
   end
 end

data/spec/video_url_spec.rb

@@ -106,6 +106,11 @@ describe Cloudinary::Utils do
             .to produce_url("#{upload_path}/#{short}_35p/video_id")
                   .and empty_options
         end
+        it 'should support the "auto" keyword' do
+          expect(["video_id", { :resource_type => 'video', long => 'auto' }])
+            .to produce_url("#{upload_path}/#{short}_auto/video_id")
+                  .and empty_options
+        end
       end
     end
 
@@ -161,6 +166,20 @@ describe Cloudinary::Utils do
 
       end
     end
+    it "should support the fps parameter" do
+      [
+        ['24-29.97', 'fps_24-29.97'],
+        [24, 'fps_24'],
+        [24.973, 'fps_24.973'],
+        ['24', 'fps_24'],
+        ['-24', 'fps_-24'],
+        ['$v', 'fps_$v'],
+        [[24, 29.97], 'fps_24-29.97'],
+        [['24', '$v'], 'fps_24-$v']
+      ].each do |value, param|
+        expect(Cloudinary::Utils.generate_transformation_string(:fps => value)).to eq(param)
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.10.1.pre.rc
+  version: 1.11.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -171,7 +171,7 @@ files:
 - lib/cloudinary/carrier_wave/process.rb
 - lib/cloudinary/carrier_wave/remote.rb
 - lib/cloudinary/carrier_wave/storage.rb
-- lib/cloudinary/controller.rb
+- lib/cloudinary/cloudinary_controller.rb
 - lib/cloudinary/downloader.rb
 - lib/cloudinary/engine.rb
 - lib/cloudinary/exceptions.rb
@@ -244,9 +244,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: cloudinary
 rubygems_version: 2.7.8