cloudinary 1.13.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5096280e7accb34f68e18a4979931fa98f0c03bfae01913b388679e499f332
-  data.tar.gz: 6d6afe81d600578d1741d5f4fb0b3a04c98bde8d9320cea260a4b371e8cd3a02
+  metadata.gz: 74a24f6c79eb085bd0f6bccdf71bfba55cf83b5f27f31153681af45e207a6090
+  data.tar.gz: 3d2ed94607da0f4edd8cebb48c281f4a53483ac6d6952ca5002b656a4906dfe1
 SHA512:
-  metadata.gz: 577d651df8534d2a1e294b6b86040507fff83d3af3176c91d436c528145459c110786ae49793a3aa589ae8d9d6107606a2854e5b494ba2207f74174390cb39e7
-  data.tar.gz: 9e8857df349c08949ad9e3327e2d4acad3f7bd4c4f36a667a9e5940f47555df92522ddd9e5cbe55387674994364b1087913bc5e7674f530eacd35a592470ef42
+  metadata.gz: fc3d2a7de323d029a24f4fe19069aee0f44deb6fd325fd1b0387d77045dcab2fdaa1f05edeb650f49a0a93150af2e7019e9098506567f7e7ea91b20a312cd3b5
+  data.tar.gz: e111b64de35d948c5fcb316d21a9123e779e9be6701de3b58fa2a49604eb73693ac200d1f13f3145b92e4b7892fb107ab663729472d0ec029bfd5b206a9d857e

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Bug report for Cloudinary Ruby SDK
+title: ''
+labels: ''
+assignees: const-cloudinary
+
+---
+
+## Bug report for Cloudinary Ruby SDK
+Before proceeding, please update to latest version and test if the issue persists
+
+## Describe the bug in a sentence or two.
+…
+
+## Issue Type (Can be multiple)
+[ ] Build - Can’t install or import the SDK
+[ ] Performance - Performance issues
+[ ] Behaviour - Functions aren’t working as expected (Such as generate URL)
+[ ] Documentation - Inconsistency between the docs and behaviour
+[ ] Other (Specify)
+
+## Steps to reproduce
+… if applicable
+
+## Error screenshots or Stack Trace (if applicable)
+…
+
+## Operating System
+[ ] Linux
+[ ] Windows
+[ ] OSX
+[ ] All
+
+## Environment and Libraries (fill in the version numbers)
+Cloudinary Ruby SDK version - 0.0.0
+Ruby Version - 0.0.0
+Rails Version - 0.0.0 
+Other Libraries (Carrierwave, ActiveStorage, etc) - 0.0.0
+
+## Repository
+If possible, please provide a link to a reproducible repository that showcases the problem

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Feature request for Cloudinary Ruby SDK
+title: ''
+labels: ''
+assignees: const-cloudinary
+
+---
+
+## Feature request for Cloudinary Ruby SDK
+…(If your feature is for other SDKs, please request them there)
+
+
+## Explain your use case
+… (A high level explanation of why you need this feature)
+
+## Describe the problem you’re trying to solve
+… (A more technical view of what you’d like to accomplish, and how this feature will help you achieve it)
+
+## Do you have a proposed solution?
+… (yes, no? Please elaborate if needed)

data/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+1.14.0 / 2020-05-06
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support of global folder in ActiveStorage
+  * Add duration to conditions in video
+
+Other Changes
+-------------
+
+  * Fix `URI.unescape is obsolete` warning
+  * Fix lingering Rails 6 autoload warnings
+  * Fix Ruby 1.9 CI build
+  * Allow setting uploader timeout to `nil`
+  * Update link to CarrierWave integration
+  * Update issue templates
+
 1.13.2 / 2020-01-19
 ===================
 

data/cloudinary.gemspec

@@ -24,11 +24,25 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "actionpack"
   s.add_development_dependency "nokogiri"
-  s.add_development_dependency "rake"
+
+  if RUBY_VERSION >= "2.2.0"
+    s.add_development_dependency "rake", ">= 13.0.1"
+  else
+    s.add_development_dependency "rake", "<= 12.2.1"
+  end
+
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec", '>=3.5'
   s.add_development_dependency "rails", "~>5.2" if RUBY_VERSION >= "2.2.2"
+
+  s.add_development_dependency "railties", "<= 4.2.7" if RUBY_VERSION <= "1.9.3"
   s.add_development_dependency "rspec-rails"
+
   s.add_development_dependency "rubyzip", "<=1.2.0" # support testing Ruby 1.9
-  s.add_development_dependency "simplecov"
+
+  if RUBY_VERSION <= "2.4.0"
+    s.add_development_dependency "simplecov", "<= 0.17.1" # support testing Ruby 1.9
+  else
+    s.add_development_dependency "simplecov", "> 0.18.0"
+  end
 end

data/lib/active_storage/service/cloudinary_service.rb

@@ -12,6 +12,15 @@ unless ActiveStorage::Blob.method_defined? :original_key
   end
 end
 
+module CloudinaryHelper
+  alias cloudinary_url_internal_original cloudinary_url_internal
+
+  def cloudinary_url_internal(source, options = {})
+    source = ActiveStorage::Blob.service.public_id(source) if defined? ActiveStorage::Blob.service.public_id
+    cloudinary_url_internal_original(source, options)
+  end
+end
+
 module ActiveStorage
   class Service::CloudinaryService < Service
     module Headers
@@ -31,7 +40,7 @@ module ActiveStorage
           options = @options.merge(options)
           Cloudinary::Uploader.upload(
             io,
-            public_id: public_id(key),
+            public_id: public_id_internal(key),
             resource_type: resource_type(io, key),
             context: {active_storage_key: key, checksum: checksum},
             extra_headers: extra_headers,
@@ -61,7 +70,7 @@ module ActiveStorage
     def url_for_direct_upload(key, **options)
       instrument :url, key: key do |payload|
         options = {:resource_type => resource_type(nil, key)}.merge(@options.merge(options.symbolize_keys))
-        options[:public_id] = public_id(key)
+        options[:public_id] = public_id_internal(key)
         options[:context] = {active_storage_key: key}
         options.delete(:file)
         payload[:url] = api_uri("upload", options)
@@ -137,13 +146,19 @@ module ActiveStorage
 
     end
 
+    def public_id(key)
+      return key unless @options[:folder]
+
+      File.join(@options.fetch(:folder), public_id_internal(key))
+    end
+
     private
 
     def api_uri(action, options)
       base_url = Cloudinary::Utils.cloudinary_api_url(action, options)
       upload_params = Cloudinary::Uploader.build_upload_params(options)
 
-      upload_params.reject! {|k, v| Cloudinary::Utils.safe_blank?(v)}
+      upload_params.reject! { |k, v| Cloudinary::Utils.safe_blank?(v) }
       unless options[:unsigned]
         upload_params = Cloudinary::Utils.sign_request(upload_params, options)
       end
@@ -173,7 +188,7 @@ module ActiveStorage
       @formats[content_type]
     end
 
-    def public_id(key)
+    def public_id_internal(key)
       # TODO: Allow custom manipulation of key to obscure how we store in Cloudinary
       key
     end

data/lib/cloudinary.rb

@@ -105,7 +105,7 @@ module Cloudinary
       if isNestedKey? key
         putNestedKey key, value
       else
-        set_config(key => URI.decode(value))
+        set_config(key => Utils.smart_unescape(value))
       end
     end
   end

data/lib/cloudinary/carrier_wave/remote.rb

@@ -4,7 +4,7 @@ module Cloudinary::CarrierWave
     if respond_to?(:process_uri)
       uri = process_uri(uri)
     else # Backward compatibility with old CarrierWave
-      uri = URI.parse(URI.escape(URI.unescape(uri)))
+      uri = URI.parse(Utils.smart_escape(Utils.smart_unescape(uri)))
     end
     return if uri.to_s.blank?
     self.original_filename = @cache_id = @filename = File.basename(uri.path).gsub(/[^a-zA-Z0-9\.\-\+_]/, '')

data/lib/cloudinary/cloudinary_controller.rb

@@ -1,13 +1,11 @@
 module Cloudinary::CloudinaryController
   protected
-  
+
   def valid_cloudinary_response?
     received_signature = request.query_parameters[:signature]
     calculated_signature = Cloudinary::Utils.api_sign_request(
       request.query_parameters.select{|key, value| [:public_id, :version].include?(key.to_sym)},
       Cloudinary.config.api_secret)
     return received_signature == calculated_signature
-  end  
+  end
 end
-
-ActionController::Base.send :include, Cloudinary::CloudinaryController

data/lib/cloudinary/railtie.rb

@@ -1,8 +1,12 @@
 class Cloudinary::Railtie < Rails::Railtie
   rake_tasks do
     Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
-  end  
+  end
   config.after_initialize do |app|
     ActionView::Base.send :include, CloudinaryHelper
   end
-end
+
+  ActiveSupport.on_load(:action_controller_base) do
+    ActionController::Base.send :include, Cloudinary::CloudinaryController
+  end
+end

data/lib/cloudinary/uploader.rb

@@ -317,7 +317,7 @@ class Cloudinary::Uploader
       params[:signature] = Cloudinary::Utils.api_sign_request(params.reject { |k, v| non_signable.include?(k) }, api_secret)
       params[:api_key]   = api_key
     end
-    timeout = options[:timeout] || Cloudinary.config.timeout || 60
+    timeout = options.fetch(:timeout) { Cloudinary.config.to_h.fetch(:timeout, 60) }
 
     result = nil
 

data/lib/cloudinary/utils.rb

@@ -42,6 +42,8 @@ class Cloudinary::Utils
     "page_x"               => "px",
     "page_y"               => "py",
     "tags"                 => "tags",
+    "initial_duration"     => "idu",
+    "duration"             => "du",
     "width"                => "w"
   }
 
@@ -563,7 +565,7 @@ class Cloudinary::Utils
       source = smart_escape(source)
       source_to_sign = source
     else
-      source = smart_escape(URI.decode(source))
+      source = smart_escape(smart_unescape(source))
       source_to_sign = source
       unless url_suffix.blank?
         raise(CloudinaryException, "url_suffix should not include . or /") if url_suffix.match(%r([\./]))
@@ -767,13 +769,18 @@ class Cloudinary::Utils
     "#{public_id}#{ext}"
   end
 
-  # Based on CGI::unescape. In addition does not escape / :
+  # Based on CGI::escape. In addition does not escape / :
   def self.smart_escape(string, unsafe = /([^a-zA-Z0-9_.\-\/:]+)/)
     string.gsub(unsafe) do |m|
       '%' + m.unpack('H2' * m.bytesize).join('%').upcase
     end
   end
 
+  # Based on CGI::unescape. In addition keeps '+' character as is
+  def self.smart_unescape(string)
+    CGI.unescape(string.sub('+', '%2B'))
+  end
+
   def self.random_public_id
     sr = defined?(ActiveSupport::SecureRandom) ? ActiveSupport::SecureRandom : SecureRandom
     sr.base64(20).downcase.gsub(/[^a-z0-9]/, "").sub(/^[0-9]+/, '')[0,20]

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.13.2"
+  VERSION = "1.14.0"
 end

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

@@ -164,7 +164,7 @@ var slice = [].slice,
   * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
   * @example
   *
-  * function Foo(){};  
+  * function Foo(){};
   * isFunction(Foo);
   * // => true
   *
@@ -3070,7 +3070,7 @@ var slice = [].slice,
      * @protected
      * @param {string} key - attribute name
      * @param {*|boolean} value - the value of the attribute. If the value is boolean `true`, return the key only.
-     * @returns {string} the attribute  
+     * @returns {string} the attribute
      *
      */
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -156,16 +156,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 description: Client library for easily using the Cloudinary service
 email:
 - nadav.soferman@cloudinary.com
@@ -175,6 +175,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"