cloudinary 1.0.46 → 1.0.47

data/README.md

@@ -34,7 +34,7 @@ Rails 3.x: edit your `Gemfile` and run `bundle install`:
 
 Rails 2.x environment.rb:
 
-    $ config.gem 'carrierwave', :version => '~> 0.4.1'
+    $ config.gem 'carrierwave', :version => '~> 0.4.10'
     $ config.gem 'cloudinary'
 
 
@@ -50,19 +50,19 @@ Accessing an uploaded image with the `sample` public ID through a CDN:
 
     http://res.cloudinary.com/demo/image/upload/sample.jpg
 
-![Sample](https://d3jpl91pxevbkh.cloudfront.net/demo/image/upload/w_0.4/sample.jpg "Sample")
+![Sample](https://cloudinary-a.akamaihd.net/demo/image/upload/w_0.4/sample.jpg "Sample")
 
 Generating a 150x100 version of the `sample` image and downloading it through a CDN:
 
     http://res.cloudinary.com/demo/image/upload/w_150,h_100,c_fill/sample.jpg
 
-![Sample 150x100](https://d3jpl91pxevbkh.cloudfront.net/demo/image/upload/w_150,h_100,c_fill/sample.jpg "Sample 150x100")
+![Sample 150x100](https://cloudinary-a.akamaihd.net/demo/image/upload/w_150,h_100,c_fill/sample.jpg "Sample 150x100")
 
 Converting to a 150x100 PNG with rounded corners of 20 pixels: 
 
     http://res.cloudinary.com/demo/image/upload/w_150,h_100,c_fill,r_20/sample.png
 
-![Sample 150x150 Rounded PNG](https://d3jpl91pxevbkh.cloudfront.net/demo/image/upload/w_150,h_100,c_fill,r_20/sample.png "Sample 150x150 Rounded PNG")
+![Sample 150x150 Rounded PNG](https://cloudinary-a.akamaihd.net/demo/image/upload/w_150,h_100,c_fill,r_20/sample.png "Sample 150x150 Rounded PNG")
 
 For plenty more transformation options, see our [image transformations documentation](http://cloudinary.com/documentation/image_transformations).
 
@@ -70,7 +70,7 @@ Generating a 120x90 thumbnail based on automatic face detection of the Facebook
  
     http://res.cloudinary.com/demo/image/facebook/c_thumb,g_face,h_90,w_120/billclinton.jpg
     
-![Facebook 90x120](https://d3jpl91pxevbkh.cloudfront.net/demo/image/facebook/c_thumb,g_face,h_90,w_120/billclinton.jpg "Facebook 90x200")
+![Facebook 90x120](https://cloudinary-a.akamaihd.net/demo/image/facebook/c_thumb,g_face,h_90,w_120/billclinton.jpg "Facebook 90x200")
 
 For more details, see our documentation for embedding [Facebook](http://cloudinary.com/documentation/facebook_profile_pictures) and [Twitter](http://cloudinary.com/documentation/twitter_profile_pictures) profile pictures. 
 

data/lib/cloudinary.rb

@@ -5,21 +5,26 @@ require "yaml"
 require "uri"
 require "cloudinary/version"
 require "cloudinary/exceptions"
-require "cloudinary/utils"
-require "cloudinary/uploader"
-require "cloudinary/api"
-require "cloudinary/downloader"
-require "cloudinary/blob" 
-require "cloudinary/preloaded_file"
-require "cloudinary/static"
 require "cloudinary/missing"
-require "cloudinary/carrier_wave" if defined?(::CarrierWave)
 require "cloudinary/helper" if defined?(::ActionView::Base)
 require "cloudinary/controller" if defined?(::ActionController::Base)
 require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
 require "cloudinary/engine" if defined?(Rails) && defined?(Rails::Engine)
 
-module Cloudinary  
+module Cloudinary
+  autoload :Utils, 'cloudinary/utils'
+  autoload :Uploader, 'cloudinary/uploader'
+  autoload :Api, "cloudinary/api"
+  autoload :Downloader, "cloudinary/downloader"
+  autoload :Blob, "cloudinary/blob"
+  autoload :PreloadedFile, "cloudinary/preloaded_file"
+  autoload :Static, "cloudinary/static"  
+  autoload :CarrierWave, "cloudinary/carrier_wave"  
+  
+  CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net"
+  AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net"
+  SHARED_CDN = AKAMAI_SHARED_CDN  
+    
   FORMAT_ALIASES = {
     "jpeg" => "jpg",
     "jpe" => "jpg",

data/lib/cloudinary/utils.rb

@@ -4,7 +4,8 @@ require 'zlib'
 require 'aws_cf_signer'
 
 class Cloudinary::Utils
-  SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net"
+  # @deprecated Use Cloudinary::SHARED_CDN
+  SHARED_CDN = Cloudinary::SHARED_CDN  
   
   # Warning: options are being destructively updated!
   def self.generate_transformation_string(options={})
@@ -91,15 +92,16 @@ class Cloudinary::Utils
     resource_type = options.delete(:resource_type) || "image"
     version = options.delete(:version)
     format = options.delete(:format)
-    cloud_name = options.delete(:cloud_name) || Cloudinary.config.cloud_name || raise(CloudinaryException, "Must supply cloud_name in tag or in configuration")    
+    cloud_name = config_option_consume(options, :cloud_name) || raise(CloudinaryException, "Must supply cloud_name in tag or in configuration")
+            
     secure = options.delete(:secure)
     ssl_detected = options.delete(:ssl_detected)
     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
+    private_cdn = config_option_consume(options, :private_cdn) 
+    secure_distribution = config_option_consume(options, :secure_distribution) 
+    cname = config_option_consume(options, :cname) 
+    force_remote = options.delete(:force_remote)
+    cdn_subdomain = config_option_consume(options, :cdn_subdomain) 
     
     original_source = source
     return original_source if source.blank?
@@ -137,14 +139,8 @@ class Cloudinary::Utils
     if cloud_name.start_with?("/")
       prefix = "/res" + cloud_name
     else
-      if secure && secure_distribution.nil?
-        if private_cdn
-          raise CloudinaryException, "secure_distribution not defined"
-        else
-          secure_distribution = SHARED_CDN 
-        end
-      end
-      
+      secure_distribution ||= Cloudinary::SHARED_CDN
+            
       if secure
         prefix = "https://#{secure_distribution}"
       else
@@ -152,7 +148,7 @@ class Cloudinary::Utils
         host = cname.blank? ? "#{private_cdn ? "#{cloud_name}-" : ""}res.cloudinary.com" : cname
         prefix = "http://#{subdomain}#{host}"
       end    
-      prefix += "/#{cloud_name}" if !private_cdn
+      prefix += "/#{cloud_name}" if !private_cdn || (secure && secure_distribution == Cloudinary::AKAMAI_SHARED_CDN)
     end
     
     source = prefix + "/" + [resource_type, 
@@ -271,4 +267,9 @@ class Cloudinary::Utils
   def self.resource_type_for_format(format)
     self.supported_image_format?(format) ? 'image' : 'raw'
   end
+  
+  def self.config_option_consume(options, option_name, default_value = nil)    
+    return options.delete(option_name) if options.include?(option_name)
+    return Cloudinary.config.send(option_name) || default_value    
+  end
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.46"
+  VERSION = "1.0.47"
 end

data/spec/utils_spec.rb

@@ -9,6 +9,8 @@ describe Cloudinary::Utils do
       config.secure_distribution = nil
       config.private_cdn = false
       config.secure = false
+      config.cname = nil
+      config.cdn_subdomains = false
     end
   end
   
@@ -28,7 +30,7 @@ describe Cloudinary::Utils do
     options = {:secure=>true}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
+    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
   end
 
   it "should allow overriding secure distribution if secure=true" do    
@@ -46,9 +48,40 @@ describe Cloudinary::Utils do
     result.should == "https://config.secure.distribution.com/test123/image/upload/test" 
   end
 
-  it "should raise exception if secure is given with private_cdn and no secure_distribution" do
-    Cloudinary.config.private_cdn = true    
-    lambda {Cloudinary::Utils.cloudinary_url("test", :secure=>true)}.should raise_error
+  it "should default to akamai if secure is given with private_cdn and no secure_distribution" do
+    options = {:secure=>true, :private_cdn=>true}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
+  end
+
+  it "should not add cloud_name if secure private_cdn and secure non akamai secure_distribution" do
+    options = {:secure=>true, :private_cdn=>true, :secure_distribution=>"something.cloudfront.net"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "https://something.cloudfront.net/image/upload/test" 
+  end
+
+  it "should allow overriding private_cdn if private_cdn=true" do
+    result = Cloudinary::Utils.cloudinary_url("test", :private_cdn => true)
+    result.should == "http://test123-res.cloudinary.com/image/upload/test"
+  end
+
+  it "should allow overriding private_cdn if private_cdn=false" do
+    Cloudinary.config.private_cdn = true
+    result = Cloudinary::Utils.cloudinary_url("test", :private_cdn => false)
+    result.should == "http://res.cloudinary.com/test123/image/upload/test"
+  end
+
+  it "should allow overriding cname if cname=example.com" do
+    result = Cloudinary::Utils.cloudinary_url("test", :cname => "example.com")
+    result.should == "http://example.com/test123/image/upload/test"
+  end
+
+  it "should allow overriding cname if cname=false" do
+    Cloudinary.config.cname = "example.com"
+    result = Cloudinary::Utils.cloudinary_url("test", :cname => nil)
+    result.should == "http://res.cloudinary.com/test123/image/upload/test"
   end
 
   it "should use format from options" do    
@@ -270,7 +303,7 @@ describe Cloudinary::Utils do
     options = {:ssl_detected=>true}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
+    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
   end 
 
   it "should use secure if given over ssl_detected and configuration" do    
@@ -286,7 +319,7 @@ describe Cloudinary::Utils do
     Cloudinary.config.secure = true
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
+    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
   end 
 
   it "should support extenal cname" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.46
+  version: 1.0.47
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client