cloudinary 1.9.1 → 1.20.0

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.9.1"
+  VERSION = "1.20.0"
 end

data/lib/cloudinary/video_helper.rb

@@ -3,12 +3,33 @@ module CloudinaryHelper
   DEFAULT_POSTER_OPTIONS = { :format => 'jpg', :resource_type => 'video' }
   DEFAULT_SOURCE_TYPES   = %w(webm mp4 ogv)
   DEFAULT_VIDEO_OPTIONS  = { :resource_type => 'video' }
+  DEFAULT_SOURCES        = [
+    {
+      :type            => "mp4",
+      :codecs          => "hev1",
+      :transformations => { :video_codec => "h265" }
+    },
+    {
+      :type            => "webm",
+      :codecs          => "vp9",
+      :transformations => { :video_codec => "vp9" }
+    },
+    {
+      :type            => "mp4",
+      :transformations => { :video_codec => "auto" }
+    },
+    {
+      :type            => "webm",
+      :transformations => { :video_codec => "auto" }
+    }
+  ]
 
   # Creates an HTML video tag for the provided +source+
   #
   # ==== Options
   # * <tt>:source_types</tt> - Specify which source type the tag should include. defaults to webm, mp4 and ogv.
   # * <tt>:source_transformation</tt> - specific transformations to use for a specific source type.
+  # * <tt>:sources</tt> - list of sources (overrides :source_types when present)
   # * <tt>:poster</tt> - override default thumbnail:
   #   * url: provide an ad hoc url
   #   * options: with specific poster transformations and/or Cloudinary +:public_id+
@@ -20,6 +41,17 @@ module CloudinaryHelper
   #   cl_video_tag("mymovie.webm", :source_types => [:webm, :mp4], :poster => {:effect => 'sepia'}) do
   #     content_tag( :span, "Cannot present video!")
   #   end
+  #   cl_video_tag("mymovie", :sources => [
+  #     {
+  #       :type => "mp4",
+  #       :codecs => "hev1",
+  #       :transformations => { :video_codec => "h265" }
+  #     },
+  #     {
+  #       :type => "webm",
+  #       :transformations => { :video_codec => "auto" }
+  #     }
+  #   ])
   def cl_video_tag(source, options = {}, &block)
     source = strip_known_ext(source)
     video_attributes = [:autoplay,:controls,:loop,:muted,:poster, :preload]
@@ -48,30 +80,12 @@ module CloudinaryHelper
       video_options[:poster] = cl_video_thumbnail_path(source, options)
     end
 
-    source_transformation = options.delete(:source_transformation) || {}
-    source_types = Array(options.delete(:source_types))
-    fallback     = (capture(&block) if block_given?) || options.delete(:fallback_content)
+    fallback = (capture(&block) if block_given?) || options.delete(:fallback_content)
 
-    if source_types.size > 1
-      cloudinary_tag(source, options) do |_source, tag_options|
-        content_tag('video', tag_options.merge(video_options)) do
-          source_tags = source_types.map do |type|
-            transformation = source_transformation[type.to_sym] || {}
-            cloudinary_tag("#{source}.#{type}", options.merge(transformation)) do |url, _tag_options|
-              mime_type = "video/#{(type == 'ogv' ? 'ogg' : type)}"
-              tag("source", :src => url, :type => mime_type)
-            end
-          end
-          source_tags.push(fallback.html_safe) unless fallback.blank?
-          safe_join(source_tags)
-        end
-      end
+    if options[:sources]
+      video_tag_from_sources(source, options, video_options, fallback)
     else
-      transformation      = source_transformation[source_types.first.to_sym] || {}
-      video_options[:src] = cl_video_path("#{source}.#{source_types.first.to_sym}", transformation.merge(options))
-      cloudinary_tag(source, options) do |_source, tag_options|
-        content_tag('video', fallback, tag_options.merge(video_options))
-      end
+      video_tag_from_source_types(source, options, video_options, fallback)
     end
   end
 
@@ -96,6 +110,66 @@ module CloudinaryHelper
     name.sub(/\.(#{DEFAULT_SOURCE_TYPES.join("|")})$/, '')
   end
 
+  private
+
+  def video_tag_from_source_types(source_name, options, video_options, fallback)
+    source_transformation = options.delete(:source_transformation) || {}
+    source_types = Array(options.delete(:source_types))
+
+    if source_types.size > 1
+      sources = source_types.map do |type|
+        {
+          :type => type,
+          :transformations => source_transformation[type.to_sym] || {}
+        }
+      end
+
+      generate_tag_from_sources(:source_name => source_name,
+                                :sources => sources,
+                                :options => options,
+                                :video_options => video_options,
+                                :fallback => fallback)
+    else
+      transformation      = source_transformation[source_types.first.to_sym] || {}
+      video_options[:src] = cl_video_path("#{source_name}.#{source_types.first.to_sym}", transformation.merge(options))
+      cloudinary_tag(source_name, options) do |_source, tag_options|
+        content_tag('video', fallback, tag_options.merge(video_options))
+      end
+    end
+  end
+
+  def video_tag_from_sources(source_name, options, video_options, fallback)
+    sources = options.delete(:sources)
+
+    generate_tag_from_sources(:source_name => source_name,
+                              :sources => sources,
+                              :options => options,
+                              :video_options => video_options,
+                              :fallback => fallback)
+  end
+
+  def generate_tag_from_sources(params)
+    source_name, sources, options, video_options, fallback = params.values_at(:source_name, :sources, :options, :video_options, :fallback)
+
+    cloudinary_tag(source_name, options) do |_source, tag_options|
+      content_tag('video', tag_options.merge(video_options)) do
+        source_tags = sources.map do |source|
+          type = source[:type]
+          transformation = source[:transformations] || {}
+          cloudinary_tag("#{source_name}.#{type}", options.merge(transformation)) do |url, _tag_options|
+            mime_type = "video/#{(type == 'ogv' ? 'ogg' : type)}"
+            if source[:codecs]
+              codecs = source[:codecs].is_a?(Array) ? source[:codecs].join(", ") : source[:codecs]
+              mime_type = "#{mime_type}; codecs=#{codecs}"
+            end
+            tag("source", :src => url, :type => mime_type)
+          end
+        end
+        source_tags.push(fallback.html_safe) unless fallback.blank?
+        safe_join(source_tags)
+      end
+    end
+  end
 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/tools/allocate_test_cloud.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+API_ENDPOINT="https://sub-account-testing.cloudinary.com/create_sub_account"
+
+SDK_NAME="${1}"
+
+CLOUD_DETAILS=$(curl -sS -d "{\"prefix\" : \"${SDK_NAME}\"}" "${API_ENDPOINT}")
+
+echo "${CLOUD_DETAILS}" | ruby -e "require 'json'; c=JSON.parse(ARGF.read)['payload']; puts 'cloudinary://' + c['cloudApiKey'] + ':'+ c['cloudApiSecret'] + '@' + c['cloudName']"

data/tools/get_test_cloud.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+RUBY_VER=$(ruby -v | head -n 1 | cut -d ' ' -f 2);
+SDK_VER=$(grep -oiP '(?<=VERSION = ")([a-zA-Z0-9\-.]+)(?=")' lib/cloudinary/version.rb)
+
+
+bash "${DIR}"/allocate_test_cloud.sh "Ruby ${RUBY_VER} SDK ${SDK_VER}"

data/tools/update_version

@@ -0,0 +1,220 @@
+#!/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=
+
+UPDATE_ONLY=false
+
+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 "      -u | --update-only only update the version"
+      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 ""
+                ;;
+            -u | --update-only )
+                UPDATE_ONLY=true
+                echo "Only update version"
+                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 [[ "${UPDATE_ONLY}" = true ]]; then
+      return 0;
+    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 -i.bak -e "${QUOTE}s/${old}/${new}/${QUOTE}" -- "${file}"  && rm -- "${file}.bak"
+}
+
+function current_version
+{
+    grep -oiP '(?<=VERSION = ")([a-zA-Z0-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
+
+    if [[ "${UPDATE_ONLY}" = true ]]; then
+      popd;
+      return 0;
+    fi
+
+    ${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
+}
+
+process_arguments "$@"
+verify_dependencies
+update_version