cloudinary 1.0.30 → 1.0.31

data/lib/cloudinary/uploader.rb

@@ -4,6 +4,16 @@ require 'json'
 
 class Cloudinary::Uploader
   
+  def self.build_eager(eager)
+    return nil if eager.nil?
+    Cloudinary::Utils.build_array(eager).map do
+      |transformation, format|
+      transformation = transformation.clone
+      format = transformation.delete(:format) || format
+      [Cloudinary::Utils.generate_transformation_string(transformation), format].compact.join("/")
+    end.join("|")
+  end
+  
   def self.build_upload_params(options)
     params = {:timestamp=>Time.now.to_i,
               :transformation => Cloudinary::Utils.generate_transformation_string(options),
@@ -13,15 +23,8 @@ class Cloudinary::Uploader
               :type=>options[:type],
               :backup=>options[:backup],
               :invalidate=>options[:invalidate],
+              :eager=>build_eager(options[:eager]),
               :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
-    if options[:eager]
-      params[:eager] = Cloudinary::Utils.build_array(options[:eager]).map do
-        |transformation, format|
-        transformation = transformation.clone
-        format = transformation.delete(:format) || format
-        [Cloudinary::Utils.generate_transformation_string(transformation), format].compact.join("/")
-      end.join("|")
-    end
     params    
   end
    
@@ -47,6 +50,18 @@ class Cloudinary::Uploader
       }
     end              
   end
+
+  def self.explicit(public_id, options={})
+    call_api("explicit", options) do    
+      {
+        :timestamp=>Time.now.to_i,
+        :type=>options[:type],
+        :public_id=> public_id,
+        :callback=> options[:callback],
+        :eagar=>build_eager(options[:eager]),
+      }
+    end              
+  end
     
   TEXT_PARAMS = [:public_id, :font_family, :font_size, :font_color, :text_align, :font_weight, :font_style, :background, :opacity, :text_decoration]  
   def self.text(text, options={})

data/lib/cloudinary/utils.rb

@@ -76,7 +76,9 @@ class Cloudinary::Utils
     secure = ssl_detected || Cloudinary.config.secure if secure.nil?
     private_cdn = options.delete(:private_cdn) || Cloudinary.config.private_cdn    
     secure_distribution = options.delete(:secure_distribution) || Cloudinary.config.secure_distribution
+    cname = options.delete(:cname) || Cloudinary.config.cname
     force_remote = options.delete(:force_remote)  
+    cdn_subdomain = options.include?(:cdn_subdomain) ? options.delete(:cdn_subdomain) : Cloudinary.config.cdn_subdomain
     
     original_source = source
     return original_source if source.blank?
@@ -117,9 +119,9 @@ class Cloudinary::Utils
       if secure
         prefix = "https://#{secure_distribution}"
       else
-        cdn_subdomain = options.include?(:cdn_subdomain) ? options[:cdn_subdomain] : Cloudinary.config.cdn_subdomain
         subdomain = cdn_subdomain ? "a#{(Zlib::crc32(source) % 5) + 1}." : ""
-        prefix = "http://#{subdomain}#{private_cdn ? "#{cloud_name}-" : ""}res.cloudinary.com"
+        host = cname.blank? ? "#{private_cdn ? "#{cloud_name}-" : ""}res.cloudinary.com" : cname
+        prefix = "http://#{subdomain}#{host}"
       end    
       prefix += "/#{cloud_name}" if !private_cdn
     end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.30"
+  VERSION = "1.0.31"
 end

data/spec/utils_spec.rb

@@ -259,4 +259,18 @@ describe Cloudinary::Utils do
     options.should == {}
     result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
   end 
+
+  it "should support extenal cname" do
+    options = {:cname=>"hello.com"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://hello.com/test123/image/upload/test" 
+  end
+
+  it "should support extenal cname with cdn_subdomain on" do
+    options = {:cname=>"hello.com", :cdn_subdomain=>true}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://a2.hello.com/test123/image/upload/test" 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client