cloudinary 1.0.82 → 1.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6cbd0bda5b871cca87e23ee5b64e551c68c17f
-  data.tar.gz: ebd64c74b999914e26ece99aa312b1e40a91dcec
+  metadata.gz: 1503a8d15da201782bf75d145eb7a0f5461f6d4d
+  data.tar.gz: 3fae9211b099c7f6da88f4e6b0523b3addc6790f
 SHA512:
-  metadata.gz: 1166188baf03ded5949a7f55c13d778e2a78aeeb731999a21978ce4bef2dc420a10b58e7e4eae2ad45b776f37535d6c20f493f147004c5e504f24d5116578c05
-  data.tar.gz: dafa9aede45cb6b996fb718adb7d438e3212b070722ec6930d3db53a2dabf528c8582fc9521946bb6ad74f5dde5b1dd32d28de519f938a4a5c0a01530b4ed042
+  metadata.gz: a90e9c764e5e4b7144f83a3b0efe29056e8b6e55d4609eff20861c0d528b4d38b8262ba20dd36c5ea57ec15896f5ac2ed8620eaae517db921805b6dfced9aa1c
+  data.tar.gz: 1c2c516dff172308801556d908dedb2d181a7e5084f3581f0d4012372d97569d5f7d2a3558ad0eed281f48f40917dd5742a64118f842c1d519c1cd35815e1962

data/.gitignore

@@ -1,8 +1,59 @@
-pkg
-.project
-.rvmrc
-assets/
-vendor/assets/
+*.gem
+*.rbc
+/.config
+capybara-*.html
+.rspec
+log/
+db/*.sqlite3
+db/*.sqlite3-journal
+/public/system
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/spec/tmp
+/test/version_tmp/
+tmp/
+**.orig
+rerun.txt
+pickle-email-*.html
+
+## Specific to RubyMotion:
+config/initializers/secret_token.rb
+config/secrets.yml
+
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
 Gemfile.lock
-.DS_Store
-*.tmproj
+.ruby-version*
+.ruby-gemset*
+.rvmrc*
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+vendor/assets/bower_components
+*.bowerrc
+bower.json
+
+# Ignore pow environment settings
+.powenv
+
+cloudinary.yml

data/CHANGELOG

@@ -1,3 +1,16 @@
+= Version 1.0.83 - 2015-03-22
+  * Added Video Support
+    * `cl_video_tag` creates an HTML video tag with optionally inner `source` tags
+    * `cl_video_path` provides a url to the video resource
+    * `cl_video_thumbnail_tag` creates an `img` tag with a video thumbnail and
+    * `cl_video_thumbnail_path` provides a url to the video resource's thumbnail
+  * Added `:zoom` transformation parameter
+  * Applied Pull Requests:
+    * Fix image closing tags #144
+    * Fix callback path. #138
+  * Update Cloudinary's jQuery plugin to v1.0.22.
+  * Update .gitignore file
+
 = Version 1.0.82 - 2015-02-05
   * Solve problem with CarrierWave integration to newer versions on the mongoid and carrierwave-mongoid gems.
   * Enable root path for shared CDN: 

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
-
+ruby RUBY_VERSION
 # Specify your gem's dependencies in cloudinary.gemspec
 gemspec

data/cloudinary.gemspec

@@ -20,8 +20,18 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rest-client"
   s.add_dependency "aws_cf_signer"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "actionpack"
+  s.add_development_dependency "rspec", '>=2.11'
+  s.add_development_dependency "rspec-rails"
+
+  if RUBY_VERSION > "1.9"
+    s.add_dependency "rest-client"
+    s.add_development_dependency "actionpack"
+    s.add_development_dependency "simplecov"
+  else
+    s.add_dependency "i18n", "<0.7.0"
+    s.add_dependency "rest-client", "<=1.6.8"
+    s.add_development_dependency "actionpack", "~>3.2.0"
+  end
+
 end

data/lib/cloudinary/active_support/core_ext/hash/keys.rb

@@ -0,0 +1,166 @@
+class Hash
+  # Returns a new hash with all keys converted using the block operation.
+  #
+  #  hash = { name: 'Rob', age: '28' }
+  #
+  #  hash.transform_keys{ |key| key.to_s.upcase }
+  #  # => {"NAME"=>"Rob", "AGE"=>"28"}
+  def transform_keys
+    return enum_for(:transform_keys) unless block_given?
+    result = self.class.new
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end
+
+  # Destructively convert all keys using the block operations.
+  # Same as transform_keys but modifies +self+.
+  def transform_keys!
+    return enum_for(:transform_keys!) unless block_given?
+    keys.each do |key|
+      self[yield(key)] = delete(key)
+    end
+    self
+  end
+
+  # Returns a new hash with all keys converted to strings.
+  #
+  #   hash = { name: 'Rob', age: '28' }
+  #
+  #   hash.stringify_keys
+  #   # => {"name"=>"Rob", "age"=>"28"}
+  def stringify_keys
+    transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings. Same as
+  # +stringify_keys+, but modifies +self+.
+  def stringify_keys!
+    transform_keys!{ |key| key.to_s }
+  end
+
+  # Returns a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  #
+  #   hash = { 'name' => 'Rob', 'age' => '28' }
+  #
+  #   hash.symbolize_keys
+  #   # => {:name=>"Rob", :age=>"28"}
+  def symbolize_keys
+    transform_keys{ |key| key.to_sym rescue key }
+  end
+  alias_method :to_options,  :symbolize_keys
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. Same as +symbolize_keys+, but modifies +self+.
+  def symbolize_keys!
+    transform_keys!{ |key| key.to_sym rescue key }
+  end
+  alias_method :to_options!, :symbolize_keys!
+
+  # Validate all keys in a hash match <tt>*valid_keys</tt>, raising
+  # ArgumentError on a mismatch.
+  #
+  # Note that keys are treated differently than HashWithIndifferentAccess,
+  # meaning that string and symbol keys will not match.
+  #
+  #   { name: 'Rob', years: '28' }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key: :years. Valid keys are: :name, :age"
+  #   { name: 'Rob', age: '28' }.assert_valid_keys('name', 'age') # => raises "ArgumentError: Unknown key: :name. Valid keys are: 'name', 'age'"
+  #   { name: 'Rob', age: '28' }.assert_valid_keys(:name, :age)   # => passes, raises nothing
+  def assert_valid_keys(*valid_keys)
+    valid_keys.flatten!
+    each_key do |k|
+      unless valid_keys.include?(k)
+        raise ArgumentError.new("Unknown key: #{k.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}")
+      end
+    end
+  end
+
+  # Returns a new hash with all keys converted by the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #  hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #  hash.deep_transform_keys{ |key| key.to_s.upcase }
+  #  # => {"PERSON"=>{"NAME"=>"Rob", "AGE"=>"28"}}
+  def deep_transform_keys(&block)
+    _deep_transform_keys_in_object(self, &block)
+  end
+
+  # Destructively convert all keys by using the block operation.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_transform_keys!(&block)
+    _deep_transform_keys_in_object!(self, &block)
+  end
+
+  # Returns a new hash with all keys converted to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  #
+  #   hash = { person: { name: 'Rob', age: '28' } }
+  #
+  #   hash.deep_stringify_keys
+  #   # => {"person"=>{"name"=>"Rob", "age"=>"28"}}
+  def deep_stringify_keys
+    deep_transform_keys{ |key| key.to_s }
+  end
+
+  # Destructively convert all keys to strings.
+  # This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_stringify_keys!
+    deep_transform_keys!{ |key| key.to_s }
+  end
+
+  # Returns a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+. This includes the keys from the root hash
+  # and from all nested hashes and arrays.
+  #
+  #   hash = { 'person' => { 'name' => 'Rob', 'age' => '28' } }
+  #
+  #   hash.deep_symbolize_keys
+  #   # => {:person=>{:name=>"Rob", :age=>"28"}}
+  def deep_symbolize_keys
+    deep_transform_keys{ |key| key.to_sym rescue key }
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. This includes the keys from the root hash and from all
+  # nested hashes and arrays.
+  def deep_symbolize_keys!
+    deep_transform_keys!{ |key| key.to_sym rescue key }
+  end
+
+  private
+    # support methods for deep transforming nested hashes and arrays
+    def _deep_transform_keys_in_object(object, &block)
+      case object
+      when Hash
+        object.each_with_object({}) do |(key, value), result|
+          result[yield(key)] = _deep_transform_keys_in_object(value, &block)
+        end
+      when Array
+        object.map {|e| _deep_transform_keys_in_object(e, &block) }
+      else
+        object
+      end
+    end
+
+    def _deep_transform_keys_in_object!(object, &block)
+      case object
+      when Hash
+        object.keys.each do |key|
+          value = object.delete(key)
+          object[yield(key)] = _deep_transform_keys_in_object!(value, &block)
+        end
+        object
+      when Array
+        object.map! {|e| _deep_transform_keys_in_object!(e, &block)}
+      else
+        object
+      end
+    end
+end

data/lib/cloudinary/active_support/core_ext/hash/readme.md

@@ -0,0 +1 @@
+Files in this folder are taken from Rails 4.

data/lib/cloudinary/api.rb

@@ -187,11 +187,12 @@ class Cloudinary::Api
     cloud_name = options[:cloud_name] || Cloudinary.config.cloud_name || raise("Must supply cloud_name")
     api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
     api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+    timeout = options[:timeout] || Cloudinary.config.timeout || 60
     api_url = [cloudinary, "v1_1", cloud_name, uri].join("/")
     # Add authentication
     api_url.sub!(%r(^(https?://)), "\\1#{api_key}:#{api_secret}@")
     
-    RestClient::Request.execute(:method => method, :url => api_url, :payload => params.reject{|k, v| v.nil? || v==""}, :timeout=>60, :headers => {"User-Agent" => Cloudinary::USER_AGENT}) do
+    RestClient::Request.execute(:method => method, :url => api_url, :payload => params.reject{|k, v| v.nil? || v==""}, :timeout=> timeout, :headers => {"User-Agent" => Cloudinary::USER_AGENT}) do
       |response, request, tmpresult|
       return Response.new(response) if response.code == 200
       exception_class = case response.code

data/lib/cloudinary/carrier_wave/preloaded.rb

@@ -1,7 +1,7 @@
 # Copyright Cloudinary
 # Support for store in CarrierWave files that were preloaded to cloudinary (e.g., by javascript)
 # Field value must be in the format:  "image/upload/v<version>/<public_id>.<format>#<signature>"
-# Where signature is the cloduinary API signature on the public_id and version.
+# Where signature is the cloudinary API signature on the public_id and version.
 module Cloudinary::CarrierWave
   PRELOADED_CLOUDINARY_PATH = Cloudinary::PreloadedFile::PRELOADED_CLOUDINARY_PATH
   STORED_CLOUDINARY_PATH = /^([^\/]+)\/([^\/]+)\/v(\d+)\/([^#]+)$/

data/lib/cloudinary/helper.rb

@@ -1,4 +1,6 @@
 require 'digest/md5'
+require 'cloudinary/video_helper'
+
 module CloudinaryHelper
   CL_BLANK = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
 
@@ -25,34 +27,46 @@ module CloudinaryHelper
   #
   # See documentation for more details and options: http://cloudinary.com/documentation/rails_image_manipulation
   def cl_image_tag(source, options = {})
-    options = options.clone
-    source = cloudinary_url_internal(source, options)
-    options[:width] = options.delete(:html_width) if options.include?(:html_width)
-    options[:height] = options.delete(:html_height) if options.include?(:html_height)
-    options[:size] = options.delete(:html_size) if options.include?(:html_size)
-    options[:border] = options.delete(:html_border) if options.include?(:html_border)
-    responsive_placeholder = Cloudinary::Utils.config_option_consume(options, :responsive_placeholder)
-    hidpi = options.delete(:hidpi)
-    responsive = options.delete(:responsive)
+    cloudinary_tag source, options do |source, options|
+      if source
+        image_tag_without_cloudinary(source, options)
+      else
+        tag 'img', options
+      end
+    end
+
+  end
+
+  def cloudinary_tag(source, options = {})
+    tag_options = options.clone
+    tag_options[:width] = tag_options.delete(:html_width) if tag_options.include?(:html_width)
+    tag_options[:height] = tag_options.delete(:html_height) if tag_options.include?(:html_height)
+    tag_options[:size] = tag_options.delete(:html_size) if tag_options.include?(:html_size)
+    tag_options[:border] = tag_options.delete(:html_border) if tag_options.include?(:html_border)
+    source = cloudinary_url_internal(source, tag_options)
+
+    responsive_placeholder = Cloudinary::Utils.config_option_consume(tag_options, :responsive_placeholder)
+    hidpi = tag_options.delete(:hidpi)
+    responsive = tag_options.delete(:responsive)
     if hidpi || responsive
-      options["data-src"] = source
+      tag_options["data-src"] = source
       source = nil
       extra_class = responsive ? "cld-responsive" : "cld-hidpi"
-      options[:class] = [options[:class], extra_class].compact.join(" ")
+      tag_options[:class] = [tag_options[:class], extra_class].compact.join(" ")
       responsive_placeholder = CL_BLANK if responsive_placeholder == "blank"
-      options[:src] = responsive_placeholder
+      tag_options[:src] = responsive_placeholder
     end
-    if source
-      image_tag_without_cloudinary(source, options)
+    if block_given?
+      yield(source,tag_options)
     else
-      content_tag 'img', nil, options
+      tag('div', tag_options)
     end
   end
 
   def cl_blank
     CL_BLANK
   end
-  
+
   # Works similarly to cl_image_tag, however just generates the URL of the image
   def cl_image_path(source, options = {})
     options = options.clone
@@ -177,7 +191,7 @@ module CloudinaryHelper
   def cl_image_upload(object_name, method, options={})
     cl_image_upload_tag("#{object_name}[#{method}]", options)
   end
-
+  alias_method :cl_upload, :cl_image_upload
   def cl_unsigned_image_upload(object_name, method, upload_preset, options={})
     cl_unsigned_image_upload_tag("#{object_name}[#{method}]", upload_preset, options)
   end
@@ -212,6 +226,7 @@ module CloudinaryHelper
     ).reject{|k,v| v.blank?}
     content_tag("input", nil, tag_options)
   end
+  alias_method :cl_upload_tag, :cl_image_upload_tag
 
   def cl_unsigned_image_upload_tag(field, upload_preset, options={})
     cl_image_upload_tag(field, options.merge(:unsigned => true, :upload_preset => upload_preset))
@@ -236,8 +251,8 @@ module CloudinaryHelper
         include ActionView::Helpers::AssetTagHelper
       end
       if defined?(Rails::version) && !Rails.version.start_with?('2') && Cloudinary.config.enhance_image_tag
-        alias_method_chain :image_tag, :cloudinary
-        alias_method_chain :image_path, :cloudinary
+        alias_method_chain :image_tag, :cloudinary # defines image_tag_without_cloudinary
+        alias_method_chain :image_path, :cloudinary # defines image_path_without_cloudinary
       else
         alias_method :image_tag_without_cloudinary, :image_tag
         alias_method :image_path_without_cloudinary, :image_path
@@ -263,7 +278,9 @@ module CloudinaryHelper
 
   def build_callback_url(options)
     callback_path = options.delete(:callback_cors) || Cloudinary.config.callback_cors || "/cloudinary_cors.html"
-    if !callback_path.match(/^https?:\/\//)
+    if callback_path.match(/^https?:\/\//)
+      callback_path
+    else
       callback_url = request.scheme + "://"
       callback_url << request.host
       if request.scheme == "https" && request.port != 443 ||
@@ -272,7 +289,6 @@ module CloudinaryHelper
       end
       callback_url << callback_path
     end
-    callback_url
   end
 end
 
@@ -280,6 +296,7 @@ module Cloudinary::FormBuilder
   def cl_image_upload(method, options={})
     @template.cl_image_upload(@object_name, method, objectify_options(options))
   end
+  alias_method :cl_upload, :cl_image_upload
   def cl_unsigned_image_upload(method, upload_preset, options={})
     @template.cl_unsigned_image_upload(@object_name, method, upload_preset, objectify_options(options))
   end

data/lib/cloudinary/missing.rb

@@ -1,20 +1,21 @@
-if !nil.respond_to?(:blank?)
+unless nil.respond_to?(:blank?)
   class Object
     def blank?
       respond_to?(:empty?) ? empty? : !self
     end
 
-    if not defined? Object::present?
-      # An object is present if it's not blank.
-      #
-      # @return [true, false]
-      def present?
-        !blank?
-      end
-    end
+    # An object is present if it's not blank.
+    #
+    # @return [true, false]
+    def present?
+      !blank?
+    end unless Object.instance_methods.include? :present?
 
+    def presence
+      self if present?
+    end  unless Object.instance_methods.include? :presence
   end
-  
+
   class NilClass #:nodoc:
     def blank?
       true