Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge github.com:rackspace/ruby-cloudfiles

Conflicts:
	CHANGELOG
	Gemfile
	lib/cloudfiles/container.rb
	lib/cloudfiles/storage_object.rb
	lib/cloudfiles/version.rb
  • Loading branch information...
commit 9d4f8283ef12d89f2dda533cac396e891680e7b3 2 parents 54323e7 + a5d21a8
Conrad Weidenkeller authored
5 CHANGELOG
View
@@ -5,6 +5,11 @@
each ReST call in its own function
================================================================================
+1.4.18 (2011/09/07)
+================================================================================
+ o Added Streaming URL support
+
+================================================================================
1.4.17 (2011/05/27)
================================================================================
o Added Manifest support for Large Objects
2  Gemfile
View
@@ -4,4 +4,4 @@ gemspec
group :development do
gem 'rake'
-end
+end
4 lib/cloudfiles/container.rb
View
@@ -145,6 +145,10 @@ def cdn_url
def cdn_ssl_url
self.cdn_metadata[:cdn_ssl_url]
end
+ # CDN Streaming container URL (if container is public)
+ def cdn_ssl_url
+ self.cdn_metadata[:cdn_streaming_url]
+ end
# CDN Streaming container URL (if container is public)
def cdn_ssl_url
11 lib/cloudfiles/storage_object.rb
View
@@ -336,6 +336,17 @@ def public_url
def public_ssl_url
self.container.public? ? self.container.cdn_ssl_url + "/#{CloudFiles.escape @name, '/'}" : nil
end
+
+ # If the parent container is public (CDN-enabled), returns the SSL CDN URL to this object. Otherwise, return nil
+ #
+ # public_object.public_streaming_url
+ # => "https://c61.stream.rackcdn.com/myfile.jpg"
+ #
+ # private_object.public_streaming_url
+ # => nil
+ def public_streaming_url
+ self.container.public? ? self.container.cdn_streaming_url + "/#{CloudFiles.escape @name, '/'}" : nil
+ end
# Copy this object to a new location (optionally in a new container)
#
Please sign in to comment.
Something went wrong with that request. Please try again.