cloudinary 1.9.1 → 1.10.0

data/spec/utils_spec.rb

@@ -3,7 +3,9 @@ require 'cloudinary'
 
 describe Cloudinary::Utils do
 
+
   before :each do
+    Cloudinary.reset_config
     Cloudinary.config do |config|
       # config.cloud_name = "demo"
       config.secure_distribution = nil
@@ -450,6 +452,12 @@ describe Cloudinary::Utils do
             .and empty_options
   end
 
+  it "should support blur effect with ocr gravity" do
+    expect(["test", { :effect => ["blur_region", 5000], :gravity => "ocr_text" }])
+      .to produce_url("#{upload_path}/e_blur_region:5000,g_ocr_text/test")
+            .and empty_options
+  end
+
   it "should support keyframe_interval" do
     expect(["test", { :keyframe_interval => 10 }])
       .to produce_url("#{upload_path}/ki_10/test")
@@ -565,7 +573,8 @@ describe Cloudinary::Utils do
           ["text with font family and size parameters", { :text => text_layer, :font_family => "Arial", :font_size => "18" }, "text:Arial_18:#{text_encoded}"],
           ["text with text style parameter", { :text => text_layer, :font_family => "Arial", :font_size => "18", :font_weight => "bold", :font_style => "italic", :letter_spacing => 4, :line_spacing => 2 }, "text:Arial_18_bold_italic_letter_spacing_4_line_spacing_2:#{text_encoded}"],
           ["subtitles", { :resource_type => "subtitles", :public_id => "subtitles.srt" }, "subtitles:subtitles.srt"],
-          ["subtitles with font family and size", { :resource_type => "subtitles", :public_id => "subtitles.srt", :font_family => "Arial", :font_size => "40" }, "subtitles:Arial_40:subtitles.srt"]
+          ["subtitles with font family and size", { :resource_type => "subtitles", :public_id => "subtitles.srt", :font_family => "Arial", :font_size => "40" }, "subtitles:Arial_40:subtitles.srt"],
+          ["image of type fetch", { :public_id => "http://res.cloudinary.com/demo/image/upload/ci", :type => "fetch" }, "fetch:aHR0cDovL3Jlcy5jbG91ZGluYXJ5LmNvbS9kZW1vL2ltYWdlL3VwbG9hZC9jaQ=="]
         ]
         layers_options.each do |name, options, result|
           it "should support #{name}" do
@@ -617,8 +626,8 @@ describe Cloudinary::Utils do
   end
 
   it "should support extenal cname with cdn_subdomain on" do
-    expect(["test", { :cname => "hello.com", :cdn_subdomain => true }])
-      .to produce_url("http://a2.hello.com/#{cloud_name}/image/upload/test")
+    expect(["test", { :cname => "hello.com", :private_cdn => true, :cdn_subdomain => true}])
+      .to produce_url("http://a2.hello.com/image/upload/test")
             .and empty_options
   end
 
@@ -807,6 +816,12 @@ describe Cloudinary::Utils do
                                            { effect: "sepia" }]])
           .to produce_url("#{upload_path}/if_w_lt_200,c_fill,h_120,w_80/if_w_gt_400,c_fit,h_150,w_150/e_sepia/sample")
       end
+      it "should allow multiple tags condition" do
+        expect(["sample", transformation: [{ if: "!tag1:tag2:tag3!_in_tags", crop: "fill", height: 120, width: 80 },
+                                           { if: "else", crop: "fit", width: 150, height: 150 },
+                                           { effect: "sepia" }]])
+          .to produce_url("#{upload_path}/if_!tag1:tag2:tag3!_in_tags,c_fill,h_120,w_80/if_else,c_fit,h_150,w_150/e_sepia/sample")
+      end
 
       describe "including spaces and operators" do
         it "should translate operators" do
@@ -903,4 +918,32 @@ describe Cloudinary::Utils do
                   .or eq("symbol_key=string_value|string_key=symbol_value")
     end
   end
+
+  describe "customFunction" do
+    custom_function_wasm = {
+      :function_type => 'wasm',
+      :source => 'blur.wasm'
+    }
+    custom_function_wasm_str = 'wasm:blur.wasm'
+
+    custom_function_remote = {
+      :function_type => 'remote',
+      :source => 'https://df34ra4a.execute-api.us-west-2.amazonaws.com/default/cloudinaryFunction'
+    }
+    custom_function_remote_str = 'remote:aHR0cHM6Ly9kZjM0cmE0YS5leGVjdXRlLWFwaS51cy13ZXN0LTIuYW1hem9uYXdzLmNvbS9kZWZhdWx0L2Nsb3VkaW5hcnlGdW5jdGlvbg=='
+
+    it 'should accept a string value' do
+      actual = Cloudinary::Utils.generate_transformation_string :custom_function => custom_function_wasm_str
+      expect( actual).to eq("fn_#{custom_function_wasm_str}")
+    end
+    it 'should accept a hash of options' do
+      actual = Cloudinary::Utils.generate_transformation_string :custom_function => custom_function_wasm
+      expect( actual).to eq("fn_#{custom_function_wasm_str}")
+    end
+    it 'should base64 encoded URL for a remote function' do
+      actual = Cloudinary::Utils.generate_transformation_string :custom_function => custom_function_remote
+      expect( actual).to eq("fn_#{custom_function_remote_str}")
+
+    end
+  end
 end

data/spec/video_tag_spec.rb

@@ -14,14 +14,16 @@ if ::Rails::VERSION::MAJOR < 4
   end
 end
 describe CloudinaryHelper do
+
   before :all do
     # Test the helper in the context it runs in in production
     ActionView::Base.send :include, CloudinaryHelper
 
   end
   before(:each) do
+    Cloudinary.reset_config
     Cloudinary.config do |config|
-      config.cloud_name          = "test123"
+      config.cloud_name          = DUMMY_CLOUD
       config.secure_distribution = nil
       config.private_cdn         = false
       config.secure              = false
@@ -35,11 +37,11 @@ describe CloudinaryHelper do
   let(:helper) {
     ActionView::Base.new
   }
-  let(:root_path) { "http://res.cloudinary.com/test123" }
+  let(:root_path) { "http://res.cloudinary.com/#{DUMMY_CLOUD}" }
   let(:upload_path) { "#{root_path}/video/upload" }
 
   describe 'cl_video_tag' do
-    let(:basic_options) { { :cloud_name => "test123"} }
+    let(:basic_options) { { :cloud_name => DUMMY_CLOUD} }
     let(:options) { basic_options }
     let(:test_tag) { TestTag.new helper.cl_video_tag("movie", options) }
     context "when options include video tag attributes" do
@@ -170,7 +172,7 @@ describe CloudinaryHelper do
         let(:fallback) { "<span id=\"spanid\">Cannot display video</span>" }
         let(:options) { basic_options.merge(:fallback_content => fallback) }
         it "should include fallback content in the tag" do
-          expect(test_tag.children).to include(TestTag.new(fallback))
+          expect(test_tag.children.map(&:to_html)).to include(TestTag.new(fallback).element.to_html)
         end
       end
 
@@ -184,7 +186,7 @@ describe CloudinaryHelper do
           TestTag.new(html)
         end
         it 'should treat the block return value as fallback content' do
-          expect(test_tag.children).to include("Cannot display video!")
+          expect(test_tag.children.map(&:to_html)).to include("Cannot display video!")
         end
       end
       describe "dimensions" do

data/spec/video_url_spec.rb

@@ -6,9 +6,11 @@ require 'cloudinary/helper'
 require 'action_view/test_case'
 
 describe Cloudinary::Utils do
+
   before(:each) do
+    Cloudinary.reset_config
     Cloudinary.config do |config|
-      config.cloud_name          = "test123"
+      config.cloud_name          = DUMMY_CLOUD
       config.secure_distribution = nil
       config.private_cdn         = false
       config.secure              = false
@@ -18,7 +20,7 @@ describe Cloudinary::Utils do
       config.api_secret          = "b"
     end
   end
-  let(:root_path) { "http://res.cloudinary.com/test123" }
+  let(:root_path) { "http://res.cloudinary.com/#{DUMMY_CLOUD}" }
   let(:upload_path) { "#{root_path}/video/upload" }
 
   describe "cloudinary_url" do

data/tools/update_version

@@ -0,0 +1,202 @@
+#!/usr/bin/env bash
+
+# Update version number and prepare for publishing the new version
+
+set -e
+
+# Empty to run the rest of the line and "echo" for a dry run
+CMD_PREFIX=
+
+# Add a quote if this is a dry run
+QUOTE=
+
+NEW_VERSION=
+
+function echo_err
+{
+    echo "$@" 1>&2;
+}
+
+function usage
+{
+      echo "Usage: $0 [parameters]"
+      echo "      -v | --version <version> set a new version"
+      echo "      -c | --current show current version"
+      echo "      -d | --dry-run print the commands without executing them"
+      echo "      -h | --help print this information and exit"
+      echo
+      echo "For example: $0 -v 1.2.3"
+}
+
+function process_arguments
+{
+    while [ "$1" != "" ]; do
+        case $1 in
+            -v | --version )
+                shift
+                NEW_VERSION=${1:-}
+                if ! [[ "${NEW_VERSION}" =~ [0-9]+\.[0-9]+\.[0-9]+(\-.+)? ]]; then
+                  echo_err "You must supply a new version after -v or --version"
+                  echo_err "For example:"
+                  echo_err "  1.2.3"
+                  echo_err "  1.2.3-rc1"
+                  echo_err ""
+                  usage; return 1
+                fi
+                ;;
+            -c | --current )
+                echo `current_version`
+                exit
+                ;;
+            -d | --dry-run )
+                CMD_PREFIX=echo
+                echo "Dry Run"
+                echo ""
+                ;;
+            -h | --help )
+                usage; return 0
+                ;;
+            * )
+              usage; return 1
+        esac
+        shift || true
+    done
+}
+
+# Intentionally make pushd silent
+function pushd
+{
+    command pushd "$@" > /dev/null
+}
+
+# Intentionally make popd silent
+function popd
+{
+    command popd "$@" > /dev/null
+}
+
+# Check if one version is less than or equal than other
+# Example:
+# ver_lte 1.2.3 1.2.3 && echo "yes" || echo "no" # yes
+# ver_lte 1.2.3 1.2.4 && echo "yes" || echo "no" # yes
+# ver_lte 1.2.4 1.2.3 && echo "yes" || echo "no" # no
+function ver_lte
+{
+    [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
+}
+
+# Extract the last entry or entry for a given version
+# The function is not currently used in this file.
+# Examples:
+#   changelog_last_entry
+#   changelog_last_entry 1.10.0
+#
+function changelog_last_entry
+{
+    sed -e "1,/^${1}/d" -e '/^=/d' -e '/^$/d' -e '/^[0-9]/,$d' CHANGELOG.md
+}
+
+function verify_dependencies
+{
+    # Test if the gnu grep is installed
+    if ! grep --version | grep -q GNU
+    then
+        echo_err "GNU grep is required for this script"
+        echo_err "You can install it using the following command:"
+        echo_err ""
+        echo_err "brew install grep --with-default-names"
+        return 1
+    fi
+
+    if [[ -z "$(type -t git-changelog)" ]]
+    then
+        echo_err "git-extras packages is not installed."
+        echo_err "You can install it using the following command:"
+        echo_err ""
+        echo_err "brew install git-extras"
+        return 1
+    fi
+}
+
+# Replace old string only if it is present in the file, otherwise return 1
+function safe_replace
+{
+    local old=$1
+    local new=$2
+    local file=$3
+
+    grep -q "${old}" "${file}" || { echo_err "${old} was not found in ${file}"; return 1; }
+
+    ${CMD_PREFIX} sed -E -i '.bak' "${QUOTE}s/${old}/${new}/${QUOTE}" "${file}"
+}
+
+function current_version
+{
+    grep -oiP '(?<=VERSION = ")([0-9.]+)(?=")' lib/cloudinary/version.rb
+}
+
+function update_version
+{
+    if [ -z "${NEW_VERSION}" ]; then
+        usage; return 1
+    fi
+
+    # Enter git root
+    pushd $(git rev-parse --show-toplevel)
+    local current_version=$(current_version)
+
+    if [ -z "${current_version}" ]; then
+        echo_err "Failed getting current version, please check directory structure and/or contact developer"
+        return 1
+    fi
+
+    # Use literal dot character in regular expression
+    local current_version_re=${current_version//./\\.}
+
+    echo "# Current version is: ${current_version}"
+    echo "# New version is:     ${NEW_VERSION}"
+
+    ver_lte "${NEW_VERSION}" "${current_version}" && { echo_err "New version is not greater than current version"; return 1; }
+
+    # Add a quote if this is a dry run
+    QUOTE=${CMD_PREFIX:+"'"}
+
+    safe_replace "VERSION = \"${current_version_re}\""\
+                 "VERSION = \"${NEW_VERSION}\""\
+                  lib/cloudinary/version.rb\
+                  || return 1
+
+    ${CMD_PREFIX} git changelog -t ${NEW_VERSION} || true
+
+    echo ""
+    echo "# After editing CHANGELOG.md, optionally review changes and issue these commands:"
+    echo git add lib/cloudinary/version.rb CHANGELOG.md
+    echo git commit -m \"Version ${NEW_VERSION}\"
+    echo sed -e "'1,/^${NEW_VERSION//./\\.}/d'" \
+             -e "'/^=/d'" \
+             -e "'/^$/d'" \
+             -e "'/^[0-9]/,\$d'" \
+             CHANGELOG.md \
+         \| git tag -a "'${NEW_VERSION}'" --file=-
+
+    # Don't run those commands on dry run
+    [ -n "${CMD_PREFIX}" ] && { popd; return 0; }
+
+    echo ""
+    read -p "Run the above commands automatically? (y/N): " confirm && [[ ${confirm} == [yY] || ${confirm} == [yY][eE][sS] ]] || { popd; return 0; }
+
+    git add lib/cloudinary/version.rb CHANGELOG.md
+    git commit -m "Version ${NEW_VERSION}"
+    sed -e "1,/^${NEW_VERSION//./\\.}/d" \
+        -e "/^=/d" \
+        -e "/^$/d" \
+        -e "/^[0-9]/,\$d" \
+        CHANGELOG.md \
+    | git tag -a "${NEW_VERSION}" --file=-
+
+    popd
+}
+
+verify_dependencies
+process_arguments $*
+update_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,120 +10,162 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 description: Client library for easily using the Cloudinary service
 email:
 - nadav.soferman@cloudinary.com
@@ -133,9 +175,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -146,6 +188,11 @@ files:
 - lib/cloudinary/api.rb
 - lib/cloudinary/auth_token.rb
 - lib/cloudinary/blob.rb
+- lib/cloudinary/cache.rb
+- lib/cloudinary/cache/breakpoints_cache.rb
+- lib/cloudinary/cache/key_value_cache_adapter.rb
+- lib/cloudinary/cache/rails_cache_adapter.rb
+- lib/cloudinary/cache/storage/rails_cache_storage.rb
 - lib/cloudinary/carrier_wave.rb
 - lib/cloudinary/carrier_wave/error.rb
 - lib/cloudinary/carrier_wave/preloaded.rb
@@ -162,6 +209,7 @@ files:
 - lib/cloudinary/ostruct2.rb
 - lib/cloudinary/preloaded_file.rb
 - lib/cloudinary/railtie.rb
+- lib/cloudinary/responsive.rb
 - lib/cloudinary/search.rb
 - lib/cloudinary/static.rb
 - lib/cloudinary/uploader.rb
@@ -173,6 +221,7 @@ files:
 - 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
@@ -180,6 +229,7 @@ files:
 - spec/data/sync_static/app/assets/stylesheets/1.css
 - spec/docx.docx
 - spec/favicon.ico
+- spec/image_spec.rb
 - spec/logo.png
 - spec/rake_spec.rb
 - spec/sample_asset_file.tsv
@@ -194,6 +244,7 @@ files:
 - spec/utils_spec.rb
 - spec/video_tag_spec.rb
 - spec/video_url_spec.rb
+- tools/update_version
 - vendor/assets/html/cloudinary_cors.html
 - vendor/assets/javascripts/cloudinary/canvas-to-blob.min.js
 - vendor/assets/javascripts/cloudinary/index.js
@@ -216,17 +267,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cloudinary
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
@@ -235,6 +286,7 @@ test_files:
 - 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
@@ -242,6 +294,7 @@ test_files:
 - spec/data/sync_static/app/assets/stylesheets/1.css
 - spec/docx.docx
 - spec/favicon.ico
+- spec/image_spec.rb
 - spec/logo.png
 - spec/rake_spec.rb
 - spec/sample_asset_file.tsv