cloudinary 1.0.61 → 1.0.62

data/README.md

@@ -53,19 +53,19 @@ Accessing an uploaded image with the `sample` public ID through a CDN:
 
     http://res.cloudinary.com/demo/image/upload/sample.jpg
 
-![Sample](https://cloudinary-a.akamaihd.net/demo/image/upload/w_0.4/sample.jpg "Sample")
+![Sample](https://res.cloudinary.com/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://cloudinary-a.akamaihd.net/demo/image/upload/w_150,h_100,c_fill/sample.jpg "Sample 150x100")
+![Sample 150x100](https://res.cloudinary.com/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://cloudinary-a.akamaihd.net/demo/image/upload/w_150,h_100,c_fill,r_20/sample.png "Sample 150x150 Rounded PNG")
+![Sample 150x150 Rounded PNG](https://res.cloudinary.com/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).
 
@@ -73,7 +73,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://cloudinary-a.akamaihd.net/demo/image/facebook/c_thumb,g_face,h_90,w_120/billclinton.jpg "Facebook 90x200")
+![Facebook 90x120](https://res.cloudinary.com/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

@@ -23,7 +23,8 @@ module Cloudinary
   autoload :CarrierWave, "cloudinary/carrier_wave"  
   
   CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net"
-  AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net"
+  AKAMAI_SHARED_CDN = "res.cloudinary.com"
+  OLD_AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net"
   SHARED_CDN = AKAMAI_SHARED_CDN  
     
   FORMAT_ALIASES = {

data/lib/cloudinary/utils.rb

@@ -137,19 +137,22 @@ class Cloudinary::Utils
       source = "#{source}.#{format}"
     end
 
-    if cloud_name.start_with?("/")
+    if cloud_name.start_with?("/") # For development
       prefix = "/res" + cloud_name
-    else
-      secure_distribution ||= Cloudinary::SHARED_CDN
-            
-      if secure
+    else 
+      shared_domain = !private_cdn
+      if secure        
+        if secure_distribution.nil? || secure_distribution == Cloudinary::OLD_AKAMAI_SHARED_CDN
+          secure_distribution = private_cdn ? "#{cloud_name}-res.cloudinary.com" : Cloudinary::SHARED_CDN
+        end
+        shared_domain ||= secure_distribution == Cloudinary::SHARED_CDN
         prefix = "https://#{secure_distribution}"
       else
         subdomain = cdn_subdomain ? "a#{(Zlib::crc32(source) % 5) + 1}." : ""
         host = cname.blank? ? "#{private_cdn ? "#{cloud_name}-" : ""}res.cloudinary.com" : cname
         prefix = "http://#{subdomain}#{host}"
-      end    
-      prefix += "/#{cloud_name}" if !private_cdn || (secure && secure_distribution == Cloudinary::AKAMAI_SHARED_CDN)
+      end
+      prefix += "/#{cloud_name}" if shared_domain
     end
     
     if shorten && resource_type.to_s == "image" && type.to_s == "upload"

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.61"
+  VERSION = "1.0.62"
 end

data/spec/utils_spec.rb

@@ -32,7 +32,7 @@ describe Cloudinary::Utils do
     options = {:secure=>true}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
+    result.should == "https://res.cloudinary.com/test123/image/upload/test" 
   end
 
   it "should allow overriding secure distribution if secure=true" do    
@@ -54,7 +54,7 @@ describe Cloudinary::Utils 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" 
+    result.should == "https://test123-res.cloudinary.com/image/upload/test" 
   end
 
   it "should not add cloud_name if secure private_cdn and secure non akamai secure_distribution" do
@@ -316,7 +316,7 @@ describe Cloudinary::Utils do
     options = {:ssl_detected=>true}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
+    result.should == "https://res.cloudinary.com/test123/image/upload/test" 
   end 
 
   it "should use secure if given over ssl_detected and configuration" do    
@@ -332,7 +332,7 @@ describe Cloudinary::Utils do
     Cloudinary.config.secure = true
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "https://cloudinary-a.akamaihd.net/test123/image/upload/test" 
+    result.should == "https://res.cloudinary.com/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.61
+  version: 1.0.62
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client