cloudinary 1.12.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3837b9826e6f31a35e478b9d8bbf81027cee43ece65f7df161b748fd5c21dd9
-  data.tar.gz: 3b47da18531bbfe2252f6cfe4a071bc5972c286c2f5777758d1b1a7e1a30b07e
+  metadata.gz: 8c4d1942e462293cb9a3cf7d73878104de63cc041ad6c9a82ae985e9ce1c6dd7
+  data.tar.gz: fd09572e0b1be22051a711fb7aacfc1f3f46856531b5c0a3caf50fea49eabae5
 SHA512:
-  metadata.gz: 34d0a6214325094a27683345da51e605b7ba6f6ba5761d4c64478dea618dbf3d4ce14a255bf69d513704d72dca6ef5a27ee4bc6e5e81d66e5548341f9e7c2e8c
-  data.tar.gz: 383bbafb8b06b9bda3fdedbde2f6b7248bcee0bacd5576e98b8e9b79d9ff45cd7d1025056fe1edde412fbf4a04855ba4ea3af197c260374827026f7a0b883f55
+  metadata.gz: 66eea468a7816511382761d6ab667c39b4f90da2c765871d99a69d34091949a3fc8d4d2245cd3b53f18560a99eea59fdd2cdd0173d8e41e6ab8e040236d52dc4
+  data.tar.gz: 65c5d8536b106b88f6bf8de3a540df6ffed3f6fed39141d6dfbf47a5ae6b11f3ec37699722e5b20e8fe35c86f452f29ec0ba9b9f5edc776ce81efebbf8cd14f8

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,3 +1,65 @@
+
+1.15.0 / 2020-06-11
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support for `accessibility_analysis` parameter
+  
+Other Changes
+-------------
+  * Fix `download` function in `Cloudinary::CarrierWave`
+  * Fix handling of empty value in `if` parameter
+  * Fix consumption of configuration from environment variables
+
+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
+===================
+
+  * Fix asset extension detection in active storage service `url` method
+
+1.13.1 / 2019-11-24
+===================
+
+  * Remove `test_files` from `gemspec`
+  * Remove redundant binary files from `active_storage` spec
+  * Fix `rspec` deprecation warnings in Rails 6
+  * Add test for uploading IO
+
+1.13.0 / 2019-11-14
+===================
+
+New functionality and features
+------------------------------
+  * Add `SassC` `cloudinary-url` function
+  
+Other Changes
+-------------
+
+  * Fix ActiveStorage download not using `ssl` for `https`
+  * Fix resource type detection in ActiveStorage
+  * Fix `storage_type` instance method in `Cloudinary::CarrierWave` module
+  * Fix sample project, limit sqlite3 to a compatible version
+
 1.12.0 / 2019-10-02
 =============
 

data/cloudinary.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "cloudinary"
 
-  s.files         = (`git ls-files`.split("\n") - `git ls-files samples`.split("\n")) + Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files         = (`git ls-files`.split("\n") - `git ls-files {test,spec,features,samples}/*`.split("\n")) + Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
@@ -25,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
@@ -22,7 +31,6 @@ module ActiveStorage
 
     def initialize(**options)
       @options = options
-      @helper = ActionView::Base.new
     end
 
     def upload(key, io, filename: nil, checksum: nil, **options)
@@ -32,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,
@@ -49,9 +57,10 @@ module ActiveStorage
         url = Cloudinary::Utils.cloudinary_url(
           public_id(key),
           resource_type: resource_type(nil, key),
-          format: ext_for_content_type(content_type),
+          format: ext_for_file(filename, content_type),
           **@options.merge(options.symbolize_keys)
         )
+
         payload[:url] = url
 
         url
@@ -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)
@@ -102,12 +111,11 @@ module ActiveStorage
       uri = URI(url)
       if block_given?
         instrument :streaming_download, key: key do
-          Net::HTTP.start(uri.host, uri.port) do |http|
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
             request = Net::HTTP::Get.new uri
             http.request request do |response|
               response.read_body &block
             end
-
           end
         end
       else
@@ -130,7 +138,7 @@ module ActiveStorage
                     else range.end
                     end
         req['range'] = "bytes=#{[range.begin, range_end].join('-')}"
-        res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
           http.request(req)
         end
         res.body.force_encoding(Encoding::BINARY)
@@ -138,20 +146,41 @@ 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
       "#{base_url}?#{upload_params.to_query}"
     end
 
-    def ext_for_content_type(content_type)
+    # Helper method for getting the filename extension.
+    #
+    # It does the best effort when original filename does not include extension, but we know the mime-type.
+    #
+    # @param [ActiveStorage::Filename]  filename     The original filename.
+    # @param [string]                   content_type The content type of the file.
+    #
+    # @return [string] The extension of the filename.
+    def ext_for_file(filename, content_type)
+      ext = filename.respond_to?(:extension_without_delimiter) ? filename.extension_without_delimiter : nil
+      return ext unless ext.blank?
+
+      # Raw files are not convertible, no extension guessing for them
+      return nil if content_type_to_resource_type(content_type).eql?('raw')
+
+      # Fallback when there is no extension.
       @formats ||= Hash.new do |h, key|
         ext = Rack::Mime::MIME_TYPES.invert[key]
         h[key] = ext.slice(1..-1) unless ext.nil?
@@ -159,23 +188,36 @@ 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
 
-    def resource_type(io, key = "")
-      return 'image' unless key.respond_to? :attributes
-      options = key.attributes
-      content_type = options[:content_type] || (io.nil? ? '' : Marcel::MimeType.for(io))
-      case content_type.split('/')[0]
-      when 'video'
+    def content_type_to_resource_type(content_type)
+      type, subtype = content_type.split('/')
+      case type
+      when 'video', 'audio'
         'video'
       when 'text'
         'raw'
+      when 'application'
+        case subtype
+        when 'pdf', 'postscript'
+          'image'
+        when 'vnd.apple.mpegurl', 'x-mpegurl', 'mpegurl' # m3u8
+          'video'
+        else
+          'raw'
+        end
       else
         'image'
       end
     end
+
+    def resource_type(io, key = "")
+      options = key.respond_to?(:attributes) ? key.attributes : {}
+      content_type = options[:content_type] || (io.nil? ? '' : Marcel::MimeType.for(io))
+      content_type_to_resource_type(content_type)
+    end
   end
 end

data/lib/cloudinary.rb

@@ -64,19 +64,7 @@ module Cloudinary
     first_time = @@config.nil?
     @@config   ||= OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {}))
 
-    # Heroku support
-    if first_time && ENV["CLOUDINARY_CLOUD_NAME"]
-      set_config(
-        "cloud_name"          => ENV["CLOUDINARY_CLOUD_NAME"],
-        "api_key"             => ENV["CLOUDINARY_API_KEY"],
-        "api_secret"          => ENV["CLOUDINARY_API_SECRET"],
-        "secure_distribution" => ENV["CLOUDINARY_SECURE_DISTRIBUTION"],
-        "private_cdn"         => ENV["CLOUDINARY_PRIVATE_CDN"].to_s == 'true',
-        "secure"              => ENV["CLOUDINARY_SECURE"].to_s == 'true'
-      )
-    elsif first_time && ENV["CLOUDINARY_URL"]
-      config_from_url(ENV["CLOUDINARY_URL"])
-    end
+    config_from_env if first_time
 
     set_config(new_config) if new_config
     yield(@@config) if block_given?
@@ -105,7 +93,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
@@ -140,18 +128,34 @@ module Cloudinary
   end
 
   private
-  
+
+  def self.config_from_env
+    # Heroku support
+    if ENV["CLOUDINARY_CLOUD_NAME"]
+      config_keys = ENV.keys.select! { |key| key.start_with? "CLOUDINARY_" }
+      config_keys -= ["CLOUDINARY_URL"] # ignore it when explicit options are passed
+      config_keys.each do |full_key|
+        conf_key = full_key["CLOUDINARY_".length..-1].downcase # convert "CLOUDINARY_CONFIG_NAME" to "config_name"
+        conf_val = ENV[full_key]
+        conf_val = conf_val == 'true' if %w[true false].include?(conf_val) # cast relevant boolean values
+        set_config(conf_key => conf_val)
+      end
+    elsif ENV["CLOUDINARY_URL"]
+      config_from_url(ENV["CLOUDINARY_URL"])
+    end
+  end
+
   def self.config_env
     return ENV["CLOUDINARY_ENV"] if ENV["CLOUDINARY_ENV"]
     return Rails.env if defined? Rails::env
     nil
   end
-  
+
   def self.config_dir
-    return Pathname.new(ENV["CLOUDINARY_CONFIG_DIR"]) if ENV["CLOUDINARY_CONFIG_DIR"] 
+    return Pathname.new(ENV["CLOUDINARY_CONFIG_DIR"]) if ENV["CLOUDINARY_CONFIG_DIR"]
     self.app_root.join("config")
   end
-  
+
   def self.set_config(new_config)
     new_config.each{|k,v| @@config.send(:"#{k}=", v) if !v.nil?}
   end

data/lib/cloudinary/api.rb

@@ -78,7 +78,7 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type          = options[:type] || "upload"
     uri           = "resources/#{resource_type}/#{type}/#{public_id}"
-    call_api(:get, uri, 
+    call_api(:get, uri,
              only(options,
                   :cinemagraph_analysis,
                   :colors,
@@ -90,7 +90,8 @@ class Cloudinary::Api
                   :pages,
                   :phash,
                   :quality_analysis,
-                  :derived_next_cursor
+                  :derived_next_cursor,
+                  :accessibility_analysis
              ), options)
   end
 

data/lib/cloudinary/carrier_wave.rb

@@ -10,7 +10,8 @@ module Cloudinary::CarrierWave
   def self.included(base)
     base.storage Cloudinary::CarrierWave::Storage
     base.extend ClassMethods
-    base.class_attribute :storage_type, :metadata
+    base.class_attribute :metadata
+    base.class_attribute :storage_type, instance_reader: false
     override_in_versions(base, :blank?, :full_public_id, :my_public_id, :all_versions_processors, :stored_version)
   end
 

data/lib/cloudinary/carrier_wave/remote.rb

@@ -1,10 +1,10 @@
 module Cloudinary::CarrierWave
   def download!(uri, *args)
-    return super if !self.cloudinary_should_handle_remote?
+    return super unless self.cloudinary_should_handle_remote?
     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(Cloudinary::Utils.smart_escape(Cloudinary::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\.\-\+_]/, '')