cloudfiles 1.5.0 → 1.5.0.1

data/CHANGELOG

@@ -1,5 +1,10 @@
 ================================================================================
-1.5.0 (2011/10/31
+1.5.0.1 (2011/12/05
+================================================================================
+o Fixed small bug with encoding or URI's
+
+================================================================================
+1.5.0 (2011/10/31)
 ================================================================================
  o The underlying http wrapper now uses client.rb a simple abstraction to manage
    each ReST call in its own function

data/cloudfiles.gemspec

@@ -3,7 +3,6 @@ require File.expand_path('../lib/cloudfiles/version', __FILE__)
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
   s.version = CloudFiles::VERSION
-
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["H. Wade Minter", "Rackspace Hosting"]
   s.description = %q{A Ruby version of the Rackspace Cloud Files API.}
@@ -41,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.rackspacecloud.com/cloud_hosting_products/files}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.5.0.1}
   s.summary = %q{A Ruby API into Rackspace Cloud Files}
   s.test_files = [
     "test/cf-testunit.rb",

data/lib/client.rb

@@ -34,16 +34,13 @@ end
 class ChunkedConnectionWrapper
   def initialize(data, chunk_size)
     @size = chunk_size
-    if data.respond_to? :read
-      @file = data
-    end
+    @file = data
   end
   
   def read(foo)
-    if @file
-      @file.read(@size)
-    end
+    @file.read(@size)
   end
+
   def eof!
     @file.eof!
   end
@@ -509,8 +506,9 @@ public
   end
 
   def self.put_object(url, token=nil, container=nil, name=nil, contents=nil,
-                 content_length=nil, etag=nil, chunk_size=65536,
+                 content_length=nil, etag=nil, chunk_size=nil,
                  content_type=nil, headers={}, http_conn=nil, proxy=nil)
+    chunk_size ||= 65536
     if not http_conn
       http_conn = http_connection(url)
     end
@@ -617,4 +615,4 @@ public
   def delete_object(container, name, headers={})
     _retry(nil, :delete_object, [container, name, headers])
   end
-end
+end

data/lib/cloudfiles.rb

@@ -49,11 +49,8 @@ module CloudFiles
     (str.respond_to?(:lines) ? str.lines : str).to_a.map { |x| x.chomp }
   end
 
-  # CGI.escape, but without special treatment on spaces
-  def self.escape(str,extra_exclude_chars = '')
-    str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do
-      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-    end
+  def self.escape(str)
+    URI.encode(str)
   end
 end
 

data/lib/cloudfiles/storage_object.rb

@@ -17,7 +17,7 @@ module CloudFiles
       @containername = container.name
       @name = objectname
       @make_path = make_path
-      @storagepath = "#{CloudFiles.escape @containername}/#{CloudFiles.escape @name, '/'}"
+      @storagepath = "#{CloudFiles.escape @containername}/#{escaped_name}"
 
       if force_exists
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" unless container.object_exists?(objectname)
@@ -35,7 +35,7 @@ module CloudFiles
     def object_metadata
       @object_metadata ||= (
         begin
-          response = SwiftClient.head_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name))
+          response = SwiftClient.head_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name)
         rescue ClientException => e
           raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" unless (e.status.to_s =~ /^20/)
         end
@@ -57,6 +57,10 @@ module CloudFiles
       )
     end
 
+    def escaped_name
+      @escaped_name ||= escape_name @name
+    end
+
     # Size of the object (in bytes)
     def bytes
       self.object_metadata[:bytes]
@@ -95,7 +99,7 @@ module CloudFiles
         headers['Range'] = range
       end
       begin
-        response = SwiftClient.get_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name))
+        response = SwiftClient.get_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name)
         response[1]
       rescue ClientException => e
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" unless (e.status.to_s =~ /^20/)
@@ -122,7 +126,7 @@ module CloudFiles
         headers['Range'] = range
       end
       begin
-        SwiftClient.get_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name), nil, nil, &block)
+        SwiftClient.get_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name, nil, nil, &block)
       end
     end
 
@@ -146,7 +150,7 @@ module CloudFiles
       headers = {}
       metadatahash.each{ |key, value| headers['X-Object-Meta-' + key.to_s.capitalize] = value.to_s }
       begin
-        SwiftClient.post_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name), headers)
+        SwiftClient.post_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name, headers)
         true
       rescue ClientException => e
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" if (e.status.to_s == "404")
@@ -174,7 +178,7 @@ module CloudFiles
     def set_manifest(manifest)
       headers = {'X-Object-Manifest' => manifest}
       begin
-        SwiftClient.post_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name), headers)
+        SwiftClient.post_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name, headers)
         true
       rescue ClientException => e
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" if (response.code == "404")
@@ -217,7 +221,7 @@ module CloudFiles
       # If we're taking data from standard input, send that IO object to cfreq
       data = $stdin if (data.nil? && $stdin.tty? == false)
       begin
-        response = SwiftClient.put_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name), data, nil, nil, nil, nil, headers)
+        response = SwiftClient.put_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name, data, nil, nil, nil, nil, headers)
       rescue ClientException => e
         code = e.status.to_s
         raise CloudFiles::Exception::InvalidResponse, "Invalid content-length header sent" if (code == "412")
@@ -250,7 +254,7 @@ module CloudFiles
       headers = {}
       headers = {"X-Purge-Email" => email} if email
       begin
-        SwiftClient.delete_object(self.container.connection.cdnurl, self.container.connection.authtoken, self.container.escaped_name, (CloudFiles.escape self.name), nil, headers)
+        SwiftClient.delete_object(self.container.connection.cdnurl, self.container.connection.authtoken, self.container.escaped_name, escaped_name, nil, headers)
         true
       rescue ClientException => e
         raise CloudFiles::Exception::Connection, "Error Unable to Purge Object: #{@name}" unless (e.status.to_s =~ /^20.$/)
@@ -308,7 +312,6 @@ module CloudFiles
     def save_to_filename(filename)
       File.open(filename, 'wb+') do |f|
         self.data_stream do |chunk|
-          puts chunk.length
           f.write chunk
         end
       end
@@ -323,7 +326,7 @@ module CloudFiles
     #   private_object.public_url
     #   => nil
     def public_url
-      self.container.public? ? self.container.cdn_url + "/#{CloudFiles.escape @name, '/'}" : nil
+      self.container.public? ? self.container.cdn_url + "/#{escaped_name}" : nil
     end
 
     # If the parent container is public (CDN-enabled), returns the SSL CDN URL to this object.  Otherwise, return nil
@@ -334,7 +337,7 @@ module CloudFiles
     #   private_object.public_ssl_url
     #   => nil
     def public_ssl_url
-      self.container.public? ? self.container.cdn_ssl_url + "/#{CloudFiles.escape @name, '/'}" : nil
+      self.container.public? ? self.container.cdn_ssl_url + "/#{escaped_name}" : nil
     end
 
     # If the parent container is public (CDN-enabled), returns the SSL CDN URL to this object.  Otherwise, return nil
@@ -345,7 +348,7 @@ module CloudFiles
     #   private_object.public_streaming_url
     #   => nil
     def public_streaming_url
-      self.container.public? ? self.container.cdn_streaming_url + "/#{CloudFiles.escape @name, '/'}" : nil
+      self.container.public? ? self.container.cdn_streaming_url + "/#{escaped_name}" : nil
     end
     
     # Copy this object to a new location (optionally in a new container)
@@ -371,9 +374,9 @@ module CloudFiles
       new_name.sub!(/^\//,'')
       headers = {'X-Copy-From' => "#{self.container.name}/#{self.name}", 'Content-Type' => self.content_type.sub(/;.+/, '')}.merge(new_headers)
       # , 'Content-Type' => self.content_type
-      new_path = "#{CloudFiles.escape new_container}/#{CloudFiles.escape new_name, '/'}"
+      new_path = "#{CloudFiles.escape new_container}/#{escape_name new_name}"
       begin
-        response = SwiftClient.put_object(self.container.connection.storageurl, self.container.connection.authtoken, (CloudFiles.escape new_container), (CloudFiles.escape new_name), nil, nil, nil, nil, nil, headers)
+        response = SwiftClient.put_object(self.container.connection.storageurl, self.container.connection.authtoken, (CloudFiles.escape new_container), escape_name(new_name), nil, nil, nil, nil, nil, headers)
         return CloudFiles::Container.new(self.container.connection, new_container).object(new_name)
       rescue ClientException => e
         code = e.status.to_s
@@ -392,11 +395,14 @@ module CloudFiles
       return new_object
     end
       
-
     def to_s # :nodoc:
       @name
     end
 
+    def escape_name(name)
+      CloudFiles.escape name
+    end
+
     private
 
       def cdn_available?

data/lib/cloudfiles/version.rb

@@ -1,3 +1,3 @@
 module CloudFiles
-  VERSION = '1.5.0'
+  VERSION = '1.5.0.1'
 end

data/test/cloudfiles_client_test.rb

@@ -34,7 +34,9 @@ class SwiftClientTest < Test::Unit::TestCase
   def test_query
     query = Query.new("foo=bar&baz=quu")
     query.add("chunky", "bacon")
-    assert_equal "chunky=bacon&baz=quu&foo=bar", query.to_s
+    assert_match /chunky=bacon/, query.to_s
+    assert_match /foo=bar/, query.to_s
+    assert_match /baz=quu/, query.to_s
     assert query.has_key? "chunky"
     query.delete("chunky")
     assert_equal false, query.has_key?("chunky")
@@ -559,10 +561,8 @@ class SwiftClientTest < Test::Unit::TestCase
     conn.stubs(:head).returns(response)
     SwiftClient.expects(:http_connection).returns([@parsed, conn])
     
-    assert_nothing_raised do
-      headers = SwiftClient.head_object(@url, @token, 'test_container', 'test_object')
-      assert response.header, headers
-    end
+    headers = SwiftClient.head_object(@url, @token, 'test_container', 'test_object')
+    assert_equal response.header, headers
   end
   
   def test_head_object_fails
@@ -794,4 +794,4 @@ class SwiftClientTest < Test::Unit::TestCase
       sc.delete_object('test_container', 'test_object')
     end
   end
-end
+end

data/test/cloudfiles_container_test.rb

@@ -95,7 +95,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
     CloudFiles::Container.any_instance.stubs(:post_with_headers).returns(nil)
     @container = CloudFiles::Container.new(connection, 'test_container')
     assert_nothing_raised do
-      @container.make_public(123)
+      @container.make_public(:ttl => 123)
     end
   end
   

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfiles
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 117
+  prerelease: false
   segments: 
   - 1
   - 5
   - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.0.1
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 -05:00
+date: 2011-12-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby API into Rackspace Cloud Files