cloudfiles 1.5.0.1 → 1.5.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTM2NDk2NjY5ZWIwMDQzNzFiOWY4N2JlNDNlZGFmYTlkMzJiZDRlOQ==
+  data.tar.gz: !binary |-
+    MTZkODJjMzA4NmNkMDRlNzc4NGExYjA4MDdjNzNlNDI4MDgwNTk4Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDk4MjY4OWI4ZDFlNThiN2NiMWM4MmM0OGM1N2RmZDYyMzI5MDJmZTdjYWRi
+    YjkwMmYxNzc1MmZiM2YyOWMwY2QzOTFhMjM2NzkzOWZhMzhlNjJkMjdkOWZm
+    NjhlNDNiMTAyODAyNjk0ZDQwNDdhNWE4YzEwNTFmZTNkZWJmNjA=
+  data.tar.gz: !binary |-
+    NWU4NzVmMzQ3M2M2YjA2OGQ5ODcwMjBjMDU4ODNmNzdhNjUxZGJkODRlMWZi
+    MTNmZWE3NzQ5OGQxODVmNDVmZmI4MmNlOWE2MGVjNjU2OGMyNWVhNDBmMmEy
+    Y2Y2N2JkMzlhZmFkM2E1ZDcwMGUwMmM3NjI4MmE4NjljNTg0MDU=

data/README.rdoc

@@ -1,3 +1,5 @@
+= New projects should use {fog}[http://github.com/fog/fog].
+
 = Rackspace Cloud Files
 
 == Description
@@ -40,6 +42,9 @@ See the class definitions for documentation on specific methods and operations.
   # Or, if you want to access the United Kingdom cloud installations, there's a handy constant:
   cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY", :auth_url => CloudFiles::AUTH_UK)
 
+  # Or, if you want to access CloudFiles from within the Rackspace network
+  cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY", :snet => true)
+
   # Get a listing of all containers under this account
   cf.containers
   => ["backup", "Books", "cftest", "test", "video", "webpics"]

data/cloudfiles.gemspec

@@ -7,6 +7,14 @@ Gem::Specification.new do |s|
   s.authors = ["H. Wade Minter", "Rackspace Hosting"]
   s.description = %q{A Ruby version of the Rackspace Cloud Files API.}
   s.email = %q{minter@lunenburg.org}
+  s.post_install_message = %Q{
+**** PLEASE NOTE **********************************************************************************************
+
+  #{s.name} has been deprecated. Please consider using fog (http://github.com/fog/fog) for all new projects. 
+  
+***************************************************************************************************************
+
+} if s.respond_to? :post_install_message
   s.extra_rdoc_files = [
     "README.rdoc",
      "TODO"
@@ -40,7 +48,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.1}
+  s.rubygems_version = %q{1.5.0.2}
   s.summary = %q{A Ruby API into Rackspace Cloud Files}
   s.test_files = [
     "test/cf-testunit.rb",

data/lib/cloudfiles.rb

@@ -28,6 +28,7 @@ module CloudFiles
   require 'cgi'
   require 'uri'
   require 'digest/md5'
+  require 'date'
   require 'time'
   require 'rubygems'
 

data/lib/cloudfiles/container.rb

@@ -60,17 +60,17 @@ module CloudFiles
           begin
             response = SwiftClient.head_container(self.connection.cdnurl, self.connection.authtoken, escaped_name)
             cdn_enabled = ((response["x-cdn-enabled"] || "").downcase == "true") ? true : false
-            {
-              :cdn_enabled => cdn_enabled,
-              :cdn_ttl => cdn_enabled ? response["x-ttl"].to_i : nil,
-              :cdn_url => cdn_enabled ? response["x-cdn-uri"] : nil,
-              :cdn_ssl_url => cdn_enabled ? response["x-cdn-ssl-uri"] : nil,
-              :cdn_streaming_url => cdn_enabled ? response["x-cdn-streaming-uri"] : nil,
-              :cdn_log => (cdn_enabled and response["x-log-retention"] == "True") ? true : false
-            }
           rescue ClientException => e
-            raise CloudFiles::Exception::NoSuchContainer, "Container #{@name} does not exist" unless (e.status.to_s =~ /^20/)
+            cdn_enabled = false
           end
+          {
+            :cdn_enabled => cdn_enabled,
+            :cdn_ttl => cdn_enabled ? response["x-ttl"].to_i : nil,
+            :cdn_url => cdn_enabled ? response["x-cdn-uri"] : nil,
+            :cdn_ssl_url => cdn_enabled ? response["x-cdn-ssl-uri"] : nil,
+            :cdn_streaming_url => cdn_enabled ? response["x-cdn-streaming-uri"] : nil,
+            :cdn_log => (cdn_enabled and response["x-log-retention"] == "True") ? true : false
+          }
         )
       else
         @cdn_metadata = {}

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}/#{escaped_name}"
+      @storagepath = "#{CloudFiles.escape @containername}/#{@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, escaped_name)
+          response = SwiftClient.head_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, @name)
         rescue ClientException => e
           raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" unless (e.status.to_s =~ /^20/)
         end
@@ -99,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, escaped_name)
+        response = SwiftClient.get_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, @name)
         response[1]
       rescue ClientException => e
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" unless (e.status.to_s =~ /^20/)
@@ -126,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, escaped_name, nil, nil, &block)
+        SwiftClient.get_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, @name, nil, nil, &block)
       end
     end
 
@@ -150,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, escaped_name, headers)
+        SwiftClient.post_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, @name, headers)
         true
       rescue ClientException => e
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" if (e.status.to_s == "404")
@@ -178,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, escaped_name, headers)
+        SwiftClient.post_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, @name, headers)
         true
       rescue ClientException => e
         raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" if (response.code == "404")
@@ -221,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, escaped_name, data, nil, nil, nil, nil, headers)
+        response = SwiftClient.put_object(self.container.connection.storageurl, self.container.connection.authtoken, self.container.escaped_name, @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")
@@ -254,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, escaped_name, nil, headers)
+        SwiftClient.delete_object(self.container.connection.cdnurl, self.container.connection.authtoken, self.container.escaped_name, @name, nil, headers)
         true
       rescue ClientException => e
         raise CloudFiles::Exception::Connection, "Error Unable to Purge Object: #{@name}" unless (e.status.to_s =~ /^20.$/)
@@ -372,15 +372,13 @@ module CloudFiles
       new_headers = options[:headers] || {}
       raise CloudFiles::Exception::Syntax, "The :headers option must be a hash" unless new_headers.is_a?(Hash)
       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}/#{escape_name new_name}"
+      headers = {'X-Copy-From' => "#{self.container.name}/#{CloudFiles.escape self.name}", 'Content-Type' => self.content_type.sub(/;.+/, '')}.merge(new_headers)
       begin
-        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)
+        response = SwiftClient.put_object(self.container.connection.storageurl, self.container.connection.authtoken, (CloudFiles.escape new_container), 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
-        raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code =~ /^20/)
+        raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{code}" unless (code =~ /^20/)
       end
     end
     

data/lib/cloudfiles/version.rb

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

metadata

@@ -1,65 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cloudfiles
-version: !ruby/object:Gem::Version 
-  hash: 117
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 0
-  - 1
-  version: 1.5.0.1
+version: !ruby/object:Gem::Version
+  version: 1.5.0.2
 platform: ruby
-authors: 
+authors:
 - H. Wade Minter
 - Rackspace Hosting
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: A Ruby version of the Rackspace Cloud Files API.
 email: minter@lunenburg.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - TODO
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - CONTRIBUTORS
@@ -84,41 +71,33 @@ files:
 - test/cloudfiles_storage_object_test.rb
 - test/cloudfiles_client_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://www.rackspacecloud.com/cloud_hosting_products/files
 licenses: []
-
-post_install_message: 
-rdoc_options: 
+metadata: {}
+post_install_message: ! "\n**** PLEASE NOTE **********************************************************************************************\n\n
+  \ cloudfiles has been deprecated. Please consider using fog (http://github.com/fog/fog)
+  for all new projects. \n  \n***************************************************************************************************************\n\n"
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: A Ruby API into Rackspace Cloud Files
-test_files: 
+test_files:
 - test/cf-testunit.rb
 - test/cloudfiles_authentication_test.rb
 - test/cloudfiles_connection_test.rb