cloudinary 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4d1942e462293cb9a3cf7d73878104de63cc041ad6c9a82ae985e9ce1c6dd7
-  data.tar.gz: fd09572e0b1be22051a711fb7aacfc1f3f46856531b5c0a3caf50fea49eabae5
+  metadata.gz: 38bfe3ef22f15b588b0cc8d80a433eb76d31b899eed350a8722547eeeee86643
+  data.tar.gz: f00c4f2e455a3ef278a5169df4fd40f982e65f774ccd444095053663dc531c15
 SHA512:
-  metadata.gz: 66eea468a7816511382761d6ab667c39b4f90da2c765871d99a69d34091949a3fc8d4d2245cd3b53f18560a99eea59fdd2cdd0173d8e41e6ab8e040236d52dc4
-  data.tar.gz: 65c5d8536b106b88f6bf8de3a540df6ffed3f6fed39141d6dfbf47a5ae6b11f3ec37699722e5b20e8fe35c86f452f29ec0ba9b9f5edc776ce81efebbf8cd14f8
+  metadata.gz: 560784ae8664c5d3425599cb40cd72f69010223a22ae8d62dbb0c16033ce25dc28ae5810f39adb859436209d767dbfbe097974f7f8018add701eb072556e5bb3
+  data.tar.gz: 551b473e18bb1774a724da52201c8a8d463cb7dcaaa3926de8f980b150fb18e69c03d50d39fa6e9d11d2d8f29d1413759953d714166252c6390e08ad5811c668

data/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+1.16.0 / 2020-06-29
+===================
+
+New functionality and features
+------------------------------
+
+  * Add support for uploading `StringIO`
+
+Other Changes
+-------------
+
+  * Set default cache storage to `file` in `CarrierWave`
+  * Fix `normalize_expression` to ignore predefined variables
+  * Fix sample projects
+
 1.15.0 / 2020-06-11
 ===================
 

data/Rakefile

@@ -1,55 +1,13 @@
 require 'bundler'
 require 'fileutils'
-require 'tmpdir'
-require 'rest_client'
-require 'json'
-require 'rubygems/package'
-
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 Bundler::GemHelper.install_tasks
 
-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
+path = File.expand_path(__dir__)
+Dir.glob("#{path}/lib/tasks/**/*.rake").each { |f| import f }
 
-end
 task :build => "cloudinary:fetch_assets"

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/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/railtie.rb

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

data/lib/cloudinary/uploader.rb

@@ -78,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

data/lib/cloudinary/utils.rb

@@ -306,7 +306,7 @@ class Cloudinary::Utils
     "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)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.15.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

@@ -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];

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -220,7 +220,8 @@ files:
 - lib/cloudinary/utils.rb
 - lib/cloudinary/version.rb
 - lib/cloudinary/video_helper.rb
-- lib/tasks/cloudinary.rake
+- 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
@@ -253,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service