cloudinary 1.13.0 → 1.16.0

data/lib/cloudinary/carrier_wave.rb

@@ -9,6 +9,7 @@ module Cloudinary::CarrierWave
 
   def self.included(base)
     base.storage Cloudinary::CarrierWave::Storage
+    base.cache_storage = :file if base.cache_storage.blank?
     base.extend ClassMethods
     base.class_attribute :metadata
     base.class_attribute :storage_type, instance_reader: false

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\.\-\+_]/, '')

data/lib/cloudinary/carrier_wave/storage.rb

@@ -1,7 +1,8 @@
 class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
 
   def store!(file)
-    return if !uploader.enable_processing
+    return unless uploader.enable_processing
+
     if uploader.is_main_uploader?
       case file
       when Cloudinary::CarrierWave::PreloadedCloudinaryFile

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  
+    Dir[File.join(File.dirname(__FILE__),'../tasks/**/*.rake')].each { |f| load f }
+  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

@@ -64,6 +64,7 @@ class Cloudinary::Uploader
       :unique_filename           => Cloudinary::Utils.as_safe_bool(options[:unique_filename]),
       :upload_preset             => options[:upload_preset],
       :use_filename              => Cloudinary::Utils.as_safe_bool(options[:use_filename]),
+      :accessibility_analysis    => Cloudinary::Utils.as_safe_bool(options[:accessibility_analysis])
     }
     params
   end
@@ -77,6 +78,9 @@ class Cloudinary::Uploader
       params = build_upload_params(options)
       if file.is_a?(Pathname)
         params[:file] = File.open(file, "rb")
+      elsif file.is_a?(StringIO)
+        file.rewind
+        params[:file] = Cloudinary::Blob.new(file.read, options)
       elsif file.respond_to?(:read) || Cloudinary::Utils.is_remote?(file)
         params[:file] = file
       else
@@ -248,7 +252,7 @@ class Cloudinary::Uploader
     end
   end
 
-  # options may include 'exclusive' (boolean) which causes clearing this tag from all other resources 
+  # options may include 'exclusive' (boolean) which causes clearing this tag from all other resources
   def self.add_tag(tag, public_ids = [], options = {})
     exclusive = options.delete(:exclusive)
     command   = exclusive ? "set_exclusive" : "add"
@@ -317,7 +321,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"
   }
 
@@ -300,15 +302,11 @@ class Cloudinary::Utils
   # Translates the condition if provided.
   # @return [string] "if_" + ifValue
   # @private
-  def self.process_if(ifValue)
-    if ifValue
-      ifValue = normalize_expression(ifValue)
-
-      ifValue = "if_" + ifValue
-    end
+  def self.process_if(if_value)
+    "if_" + normalize_expression(if_value) unless if_value.to_s.empty?
   end
 
-  EXP_REGEXP = Regexp.new(PREDEFINED_VARS.keys.join("|")+'|('+CONDITIONAL_OPERATORS.keys.reverse.map { |k| Regexp.escape(k) }.join('|')+')(?=[ _])')
+  EXP_REGEXP = Regexp.new('(?<!\$)('+PREDEFINED_VARS.keys.join("|")+')'+'|('+CONDITIONAL_OPERATORS.keys.reverse.map { |k| Regexp.escape(k) }.join('|')+')(?=[ _])')
   EXP_REPLACEMENT = PREDEFINED_VARS.merge(CONDITIONAL_OPERATORS)
 
   def self.normalize_expression(expression)
@@ -563,7 +561,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 +765,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]
@@ -880,7 +883,7 @@ class Cloudinary::Utils
     when String then value.downcase == "true" || value == "1"
     when TrueClass then true
     when FalseClass then false
-    when Fixnum then value != 0
+    when Integer then value != 0
     when Symbol then value == :true
     else
       raise "Invalid boolean value #{value} of type #{value.class}"

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.13.0"
+  VERSION = "1.16.0"
 end

data/lib/tasks/cloudinary/fetch_assets.rake

@@ -0,0 +1,48 @@
+require 'tmpdir'
+require 'rest_client'
+require 'json'
+require 'rubygems/package'
+
+unless Rake::Task.task_defined?('cloudinary:fetch_assets') # prevent double-loading/execution
+  namespace :cloudinary do
+    desc "Fetch the latest JavaScript library files and create the JavaScript index files"
+    task :fetch_assets do
+      index_files = %w[jquery.ui.widget.js jquery.iframe-transport.js jquery.fileupload.js jquery.cloudinary.js]
+      processing_files = %w[canvas-to-blob.min.js load-image.all.min.js jquery.fileupload-process.js jquery.fileupload-image.js jquery.fileupload-validate.js]
+      files = index_files + processing_files
+
+      release = JSON(RestClient.get("https://api.github.com/repos/cloudinary/cloudinary_js/releases/latest"))
+
+      FileUtils.rm_rf 'vendor/assets'
+      html_folder = 'vendor/assets/html'
+      FileUtils.mkdir_p html_folder
+      js_folder = 'vendor/assets/javascripts/cloudinary'
+      FileUtils.mkdir_p js_folder
+
+      puts "Fetching cloudinary_js version #{release["tag_name"]}\n\n"
+      sio = StringIO.new(RestClient.get(release["tarball_url"]).body)
+      file = Zlib::GzipReader.new(sio)
+      tar = Gem::Package::TarReader.new(file)
+      tar.each_entry do |entry|
+        name = File.basename(entry.full_name)
+        if files.include? name
+          js_full_name = File.join(js_folder, name)
+          puts "Adding #{js_full_name}"
+          File.write js_full_name, entry.read
+        elsif name == 'cloudinary_cors.html'
+          html_full_name = File.join(html_folder, name)
+          puts "Adding #{html_full_name}"
+          File.write html_full_name, entry.read
+        end
+      end
+      puts "Creating 'index.js' and 'processing.js' files"
+      File.open("vendor/assets/javascripts/cloudinary/index.js", "w") do |f|
+        index_files.each { |name| f.puts "//= require ./#{name}" }
+      end
+      File.open("vendor/assets/javascripts/cloudinary/processing.js", "w") do |f|
+        processing_files.each { |name| f.puts "//= require ./#{name}" }
+      end
+    end
+
+  end
+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
   *
@@ -1403,7 +1403,8 @@ var slice = [].slice,
       "*": "mul",
       "/": "div",
       "+": "add",
-      "-": "sub"
+      "-": "sub",
+      "^": "pow",
     };
 
 
@@ -1486,8 +1487,8 @@ var slice = [].slice,
         return expression;
       }
       expression = String(expression);
-      operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*";
-      pattern = "((" + operators + ")(?=[ _])|" + Object.keys(Expression.PREDEFINED_VARS).join("|") + ")";
+      operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*|\\^";
+      pattern = "((" + operators + ")(?=[ _])|(?<!\$)(" + Object.keys(Expression.PREDEFINED_VARS).join("|") + "))";
       replaceRE = new RegExp(pattern, "g");
       expression = expression.replace(replaceRE, function(match) {
         return Expression.OPERATORS[match] || Expression.PREDEFINED_VARS[match];
@@ -3070,7 +3071,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.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2020-06-29 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"
@@ -218,98 +220,8 @@ files:
 - lib/cloudinary/utils.rb
 - lib/cloudinary/version.rb
 - lib/cloudinary/video_helper.rb
-- lib/tasks/cloudinary.rake
-- spec/access_control_spec.rb
-- spec/active_storage/Gemfile
-- spec/active_storage/application_system_test_case.rb
-- spec/active_storage/database/create_users_migration.rb
-- spec/active_storage/database/setup.rb
-- spec/active_storage/dummy/Rakefile
-- spec/active_storage/dummy/app/assets/config/manifest.js
-- spec/active_storage/dummy/app/assets/javascripts/application.js
-- spec/active_storage/dummy/app/assets/stylesheets/application.css
-- spec/active_storage/dummy/app/controllers/application_controller.rb
-- spec/active_storage/dummy/app/helpers/application_helper.rb
-- spec/active_storage/dummy/app/jobs/application_job.rb
-- spec/active_storage/dummy/app/models/application_record.rb
-- spec/active_storage/dummy/app/views/layouts/application.html.erb
-- spec/active_storage/dummy/bin/bundle
-- spec/active_storage/dummy/bin/rails
-- spec/active_storage/dummy/bin/rake
-- spec/active_storage/dummy/bin/yarn
-- spec/active_storage/dummy/config.ru
-- spec/active_storage/dummy/config/application.rb
-- spec/active_storage/dummy/config/boot.rb
-- spec/active_storage/dummy/config/database.yml
-- spec/active_storage/dummy/config/environment.rb
-- spec/active_storage/dummy/config/environments/development.rb
-- spec/active_storage/dummy/config/environments/production.rb
-- spec/active_storage/dummy/config/environments/test.rb
-- spec/active_storage/dummy/config/initializers/application_controller_renderer.rb
-- spec/active_storage/dummy/config/initializers/assets.rb
-- spec/active_storage/dummy/config/initializers/backtrace_silencers.rb
-- spec/active_storage/dummy/config/initializers/cookies_serializer.rb
-- spec/active_storage/dummy/config/initializers/filter_parameter_logging.rb
-- spec/active_storage/dummy/config/initializers/inflections.rb
-- spec/active_storage/dummy/config/initializers/mime_types.rb
-- spec/active_storage/dummy/config/initializers/wrap_parameters.rb
-- spec/active_storage/dummy/config/routes.rb
-- spec/active_storage/dummy/config/secrets.yml
-- spec/active_storage/dummy/config/spring.rb
-- spec/active_storage/dummy/config/storage.yml
-- spec/active_storage/dummy/config/webpacker.yml
-- spec/active_storage/dummy/package.json
-- spec/active_storage/dummy/public/404.html
-- spec/active_storage/dummy/public/422.html
-- spec/active_storage/dummy/public/500.html
-- spec/active_storage/dummy/public/apple-touch-icon-precomposed.png
-- spec/active_storage/dummy/public/apple-touch-icon.png
-- spec/active_storage/dummy/public/favicon.ico
-- spec/active_storage/fixtures/files/colors.bmp
-- spec/active_storage/fixtures/files/empty_file.txt
-- spec/active_storage/fixtures/files/favicon.ico
-- spec/active_storage/fixtures/files/icon.psd
-- spec/active_storage/fixtures/files/icon.svg
-- spec/active_storage/fixtures/files/image.gif
-- spec/active_storage/fixtures/files/racecar.jpg
-- spec/active_storage/fixtures/files/racecar.tif
-- spec/active_storage/fixtures/files/racecar_rotated.jpg
-- spec/active_storage/fixtures/files/report.pdf
-- spec/active_storage/fixtures/files/rotated_video.mp4
-- spec/active_storage/fixtures/files/video.mp4
-- spec/active_storage/fixtures/files/video_with_rectangular_samples.mp4
-- spec/active_storage/fixtures/files/video_with_undefined_display_aspect_ratio.mp4
-- spec/active_storage/fixtures/files/video_without_video_stream.mp4
-- spec/active_storage/service/cloudinary_service_spec.rb
-- spec/active_storage/service/configurations.yml
-- spec/active_storage/test_helper.rb
-- spec/api_spec.rb
-- spec/archive_spec.rb
-- spec/auth_token_spec.rb
-- spec/cache_spec.rb
-- spec/cloudinary_helper_spec.rb
-- spec/cloudinary_spec.rb
-- spec/data/sync_static/app/assets/javascripts/1.coffee
-- spec/data/sync_static/app/assets/javascripts/1.js
-- spec/data/sync_static/app/assets/stylesheets/1.css
-- spec/docx.docx
-- spec/favicon.ico
-- spec/image_spec.rb
-- spec/logo.png
-- spec/movie.mp4
-- spec/rake_spec.rb
-- spec/sample_asset_file.tsv
-- spec/search_spec.rb
-- spec/spec_helper.rb
-- spec/storage_spec.rb
-- spec/streaminig_profiles_api_spec.rb
-- spec/support/helpers/temp_file_helpers.rb
-- spec/support/shared_contexts/rake.rb
-- spec/uploader_spec.rb
-- spec/utils_methods_spec.rb
-- spec/utils_spec.rb
-- spec/video_tag_spec.rb
-- spec/video_url_spec.rb
+- lib/tasks/cloudinary/fetch_assets.rake
+- lib/tasks/cloudinary/sync_static.rake
 - tools/update_version
 - vendor/assets/html/cloudinary_cors.html
 - vendor/assets/javascripts/cloudinary/canvas-to-blob.min.js
@@ -346,95 +258,4 @@ rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
-test_files:
-- spec/access_control_spec.rb
-- spec/active_storage/Gemfile
-- spec/active_storage/application_system_test_case.rb
-- spec/active_storage/database/create_users_migration.rb
-- spec/active_storage/database/setup.rb
-- spec/active_storage/dummy/Rakefile
-- spec/active_storage/dummy/app/assets/config/manifest.js
-- spec/active_storage/dummy/app/assets/javascripts/application.js
-- spec/active_storage/dummy/app/assets/stylesheets/application.css
-- spec/active_storage/dummy/app/controllers/application_controller.rb
-- spec/active_storage/dummy/app/helpers/application_helper.rb
-- spec/active_storage/dummy/app/jobs/application_job.rb
-- spec/active_storage/dummy/app/models/application_record.rb
-- spec/active_storage/dummy/app/views/layouts/application.html.erb
-- spec/active_storage/dummy/bin/bundle
-- spec/active_storage/dummy/bin/rails
-- spec/active_storage/dummy/bin/rake
-- spec/active_storage/dummy/bin/yarn
-- spec/active_storage/dummy/config.ru
-- spec/active_storage/dummy/config/application.rb
-- spec/active_storage/dummy/config/boot.rb
-- spec/active_storage/dummy/config/database.yml
-- spec/active_storage/dummy/config/environment.rb
-- spec/active_storage/dummy/config/environments/development.rb
-- spec/active_storage/dummy/config/environments/production.rb
-- spec/active_storage/dummy/config/environments/test.rb
-- spec/active_storage/dummy/config/initializers/application_controller_renderer.rb
-- spec/active_storage/dummy/config/initializers/assets.rb
-- spec/active_storage/dummy/config/initializers/backtrace_silencers.rb
-- spec/active_storage/dummy/config/initializers/cookies_serializer.rb
-- spec/active_storage/dummy/config/initializers/filter_parameter_logging.rb
-- spec/active_storage/dummy/config/initializers/inflections.rb
-- spec/active_storage/dummy/config/initializers/mime_types.rb
-- spec/active_storage/dummy/config/initializers/wrap_parameters.rb
-- spec/active_storage/dummy/config/routes.rb
-- spec/active_storage/dummy/config/secrets.yml
-- spec/active_storage/dummy/config/spring.rb
-- spec/active_storage/dummy/config/storage.yml
-- spec/active_storage/dummy/config/webpacker.yml
-- spec/active_storage/dummy/package.json
-- spec/active_storage/dummy/public/404.html
-- spec/active_storage/dummy/public/422.html
-- spec/active_storage/dummy/public/500.html
-- spec/active_storage/dummy/public/apple-touch-icon-precomposed.png
-- spec/active_storage/dummy/public/apple-touch-icon.png
-- spec/active_storage/dummy/public/favicon.ico
-- spec/active_storage/fixtures/files/colors.bmp
-- spec/active_storage/fixtures/files/empty_file.txt
-- spec/active_storage/fixtures/files/favicon.ico
-- spec/active_storage/fixtures/files/icon.psd
-- spec/active_storage/fixtures/files/icon.svg
-- spec/active_storage/fixtures/files/image.gif
-- spec/active_storage/fixtures/files/racecar.jpg
-- spec/active_storage/fixtures/files/racecar.tif
-- spec/active_storage/fixtures/files/racecar_rotated.jpg
-- spec/active_storage/fixtures/files/report.pdf
-- spec/active_storage/fixtures/files/rotated_video.mp4
-- spec/active_storage/fixtures/files/video.mp4
-- spec/active_storage/fixtures/files/video_with_rectangular_samples.mp4
-- spec/active_storage/fixtures/files/video_with_undefined_display_aspect_ratio.mp4
-- spec/active_storage/fixtures/files/video_without_video_stream.mp4
-- spec/active_storage/service/cloudinary_service_spec.rb
-- spec/active_storage/service/configurations.yml
-- spec/active_storage/test_helper.rb
-- spec/api_spec.rb
-- spec/archive_spec.rb
-- spec/auth_token_spec.rb
-- spec/cache_spec.rb
-- spec/cloudinary_helper_spec.rb
-- spec/cloudinary_spec.rb
-- spec/data/sync_static/app/assets/javascripts/1.coffee
-- spec/data/sync_static/app/assets/javascripts/1.js
-- spec/data/sync_static/app/assets/stylesheets/1.css
-- spec/docx.docx
-- spec/favicon.ico
-- spec/image_spec.rb
-- spec/logo.png
-- spec/movie.mp4
-- spec/rake_spec.rb
-- spec/sample_asset_file.tsv
-- spec/search_spec.rb
-- spec/spec_helper.rb
-- spec/storage_spec.rb
-- spec/streaminig_profiles_api_spec.rb
-- spec/support/helpers/temp_file_helpers.rb
-- spec/support/shared_contexts/rake.rb
-- spec/uploader_spec.rb
-- spec/utils_methods_spec.rb
-- spec/utils_spec.rb
-- spec/video_tag_spec.rb
-- spec/video_url_spec.rb
+test_files: []