fog 0.8.1 → 0.8.2

data/lib/fog/storage/models/rackspace/file.rb

@@ -60,11 +60,7 @@ module Fog
           options['Content-Type'] = content_type if content_type
           data = connection.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)
-          if body.is_a?(String)
-            self.content_length = body.size
-          else
-            self.content_length = ::File.size(body.path)
-          end
+          self.content_length = Fog::Storage.get_body_size(body)
           true
         end
 

data/lib/fog/storage/rackspace.rb

@@ -45,6 +45,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -56,12 +60,14 @@ module Fog
           require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
-          @data = self.class.data[@rackspace_username]
+        end
+
+        def data
+          self.class.data[@rackspace_username]
         end
 
         def reset_data
           self.class.data.delete(@rackspace_username)
-          @data = self.class.data[@rackspace_username]
         end
 
       end

data/lib/fog/storage/requests/aws/copy_object.rb

@@ -47,9 +47,9 @@ module Fog
 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           response = Excon::Response.new
-          source_bucket = @data[:buckets][source_bucket_name]
+          source_bucket = self.data[:buckets][source_bucket_name]
           source_object = source_bucket && source_bucket[:objects][source_object_name]
-          target_bucket = @data[:buckets][target_bucket_name]
+          target_bucket = self.data[:buckets][target_bucket_name]
 
           if source_object && target_bucket
             response.status = 200

data/lib/fog/storage/requests/aws/delete_bucket.rb

@@ -30,14 +30,14 @@ module Fog
 
         def delete_bucket(bucket_name)
           response = Excon::Response.new
-          if @data[:buckets][bucket_name].nil?
+          if self.data[:buckets][bucket_name].nil?
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 204}, response))
-          elsif @data[:buckets][bucket_name] && !@data[:buckets][bucket_name][:objects].empty?
+          elsif self.data[:buckets][bucket_name] && !self.data[:buckets][bucket_name][:objects].empty?
             response.status = 409
             raise(Excon::Errors.status_error({:expects => 204}, response))
           else
-            @data[:buckets].delete(bucket_name)
+            self.data[:buckets].delete(bucket_name)
             response.status = 204
           end
           response

data/lib/fog/storage/requests/aws/delete_object.rb

@@ -33,7 +33,7 @@ module Fog
 
         def delete_object(bucket_name, object_name)
           response = Excon::Response.new
-          if bucket = @data[:buckets][bucket_name]
+          if bucket = self.data[:buckets][bucket_name]
             response.status = 204
             bucket[:objects].delete(object_name)
           else

data/lib/fog/storage/requests/aws/get_bucket.rb

@@ -67,7 +67,7 @@ module Fog
             Fog::Mock.not_implemented
           end
           response = Excon::Response.new
-          if bucket = @data[:buckets][bucket_name]
+          if bucket = self.data[:buckets][bucket_name]
             contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
                 (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
                 (options['marker'] && object['Key'] <= options['marker'])

data/lib/fog/storage/requests/aws/get_bucket_acl.rb

@@ -50,7 +50,7 @@ module Fog
 
         def get_bucket_acl(bucket_name)
           response = Excon::Response.new
-          if acl = @data[:acls][:bucket][bucket_name]
+          if acl = self.data[:acls][:bucket][bucket_name]
             response.status = 200
             response.body = acl
           else

data/lib/fog/storage/requests/aws/get_bucket_location.rb

@@ -36,7 +36,7 @@ module Fog
 
         def get_bucket_location(bucket_name)
           response = Excon::Response.new
-          if bucket = @data[:buckets][bucket_name]
+          if bucket = self.data[:buckets][bucket_name]
             response.status = 200
             response.body = {'LocationConstraint' => bucket['LocationConstraint'] }
           else

data/lib/fog/storage/requests/aws/get_object.rb

@@ -65,7 +65,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           response = Excon::Response.new
-          if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
+          if (bucket = self.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
             elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])

data/lib/fog/storage/requests/aws/get_object_acl.rb

@@ -61,7 +61,7 @@ module Fog
 
         def get_object_acl(bucket_name, object_name)
           response = Excon::Response.new
-          if acl = @data[:acls][:object][bucket_name] && @data[:acls][:object][bucket_name][object_name]
+          if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200
             response.body = acl
           else

data/lib/fog/storage/requests/aws/get_request_payment.rb

@@ -36,7 +36,7 @@ module Fog
 
         def get_request_payment(bucket_name)
           response = Excon::Response.new
-          if bucket = @data[:buckets][bucket_name]
+          if bucket = self.data[:buckets][bucket_name]
             response.status = 200
             response.body = { 'Payer' => bucket['Payer'] }
           else

data/lib/fog/storage/requests/aws/get_service.rb

@@ -39,7 +39,7 @@ module Fog
         def get_service
           response = Excon::Response.new
           response.headers['Status'] = 200
-          buckets = @data[:buckets].values.map do |bucket|
+          buckets = self.data[:buckets].values.map do |bucket|
             bucket.reject do |key, value|
               !['CreationDate', 'Name'].include?(key)
             end

data/lib/fog/storage/requests/aws/put_bucket.rb

@@ -48,7 +48,7 @@ DATA
           if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
             raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
           else
-            @data[:acls][:bucket][bucket_name] = self.class.acls(acl)
+            self.data[:acls][:bucket][bucket_name] = self.class.acls(acl)
           end
 
           response = Excon::Response.new
@@ -65,8 +65,8 @@ DATA
           else
             bucket['LocationConstraint'] = nil
           end
-          unless @data[:buckets][bucket_name]
-            @data[:buckets][bucket_name] = bucket
+          unless self.data[:buckets][bucket_name]
+            self.data[:buckets][bucket_name] = bucket
           end
           response
         end

data/lib/fog/storage/requests/aws/put_object.rb

@@ -52,8 +52,8 @@ module Fog
           if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
             raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
           else
-            @data[:acls][:object][bucket_name] ||= {}
-            @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
+            self.data[:acls][:object][bucket_name] ||= {}
+            self.data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
 
           data = Fog::Storage.parse_data(data)
@@ -61,7 +61,7 @@ module Fog
             data[:body] = data[:body].read
           end
           response = Excon::Response.new
-          if (bucket = @data[:buckets][bucket_name])
+          if (bucket = self.data[:buckets][bucket_name])
             response.status = 200
             object = {
               :body             => data[:body],

data/lib/fog/storage/requests/aws/put_request_payment.rb

@@ -35,7 +35,7 @@ DATA
 
         def put_request_payment(bucket_name, payer)
           response = Excon::Response.new
-          if bucket = @data[:buckets][bucket_name]
+          if bucket = self.data[:buckets][bucket_name]
             response.status = 200
             bucket['Payer'] = payer
           else

data/lib/fog/storage/requests/google/copy_object.rb

@@ -43,9 +43,9 @@ module Fog
 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           response = Excon::Response.new
-          source_bucket = @data[:buckets][source_bucket_name]
+          source_bucket = self.data[:buckets][source_bucket_name]
           source_object = source_bucket && source_bucket[:objects][source_object_name]
-          target_bucket = @data[:buckets][target_bucket_name]
+          target_bucket = self.data[:buckets][target_bucket_name]
 
           if source_object && target_bucket
             response.status = 200

data/lib/fog/storage/requests/google/delete_bucket.rb

@@ -26,14 +26,14 @@ module Fog
 
         def delete_bucket(bucket_name)
           response = Excon::Response.new
-          if @data[:buckets][bucket_name].nil?
+          if self.data[:buckets][bucket_name].nil?
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 204}, response))
-          elsif @data[:buckets][bucket_name] && !@data[:buckets][bucket_name][:objects].empty?
+          elsif self.data[:buckets][bucket_name] && !self.data[:buckets][bucket_name][:objects].empty?
             response.status = 409
             raise(Excon::Errors.status_error({:expects => 204}, response))
           else
-            @data[:buckets].delete(bucket_name)
+            self.data[:buckets].delete(bucket_name)
             response.status = 204
           end
           response

data/lib/fog/storage/requests/google/delete_object.rb

@@ -29,7 +29,7 @@ module Fog
 
         def delete_object(bucket_name, object_name)
           response = Excon::Response.new
-          if bucket = @data[:buckets][bucket_name]
+          if bucket = self.data[:buckets][bucket_name]
             if object = bucket[:objects][object_name]
               response.status = 204
               bucket[:objects].delete(object_name)

data/lib/fog/storage/requests/google/get_bucket.rb

@@ -64,7 +64,7 @@ module Fog
           response = Excon::Response.new
           name = /(\w+\.?)*/.match(bucket_name)
           if bucket_name == name.to_s
-            if bucket = @data[:buckets][bucket_name]
+            if bucket = self.data[:buckets][bucket_name]
               contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
                   (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
                   (options['marker'] && object['Key'] <= options['marker'])

data/lib/fog/storage/requests/google/get_bucket_acl.rb

@@ -47,7 +47,7 @@ module Fog
 
         def get_bucket_acl(bucket_name)
           response = Excon::Response.new
-          if acl = @data[:acls][:bucket][bucket_name]
+          if acl = self.data[:acls][:bucket][bucket_name]
             response.status = 200
             response.body = acl
           else

data/lib/fog/storage/requests/google/get_object.rb

@@ -62,7 +62,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           response = Excon::Response.new
-          if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
+          if (bucket = self.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
             elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])

data/lib/fog/storage/requests/google/get_object_acl.rb

@@ -58,7 +58,7 @@ module Fog
 
         def get_object_acl(bucket_name, object_name)
           response = Excon::Response.new
-          if acl = @data[:acls][:object][bucket_name] && @data[:acls][:object][bucket_name][object_name]
+          if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200
             response.body = acl
           else

data/lib/fog/storage/requests/google/get_service.rb

@@ -35,14 +35,14 @@ module Fog
         def get_service
           response = Excon::Response.new
           response.headers['Status'] = 200
-          buckets = @data[:buckets].values.map do |bucket|
+          buckets = self.data[:buckets].values.map do |bucket|
             bucket.reject do |key, value|
               !['CreationDate', 'Name'].include?(key)
             end
           end
           response.body = {
             'Buckets' => buckets,
-            'Owner'   => { 'DisplayName' => 'owner', 'ID' => 'some_id'}
+            'Owner'   => { 'ID' => 'some_id'}
           }
           response
         end

data/lib/fog/storage/requests/google/put_bucket.rb

@@ -44,7 +44,7 @@ DATA
           if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
             raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
           else
-            @data[:acls][:bucket][bucket_name] = self.class.acls(options[acl])
+            self.data[:acls][:bucket][bucket_name] = self.class.acls(options[acl])
           end
           response = Excon::Response.new
           response.status = 200
@@ -60,8 +60,8 @@ DATA
           else
             bucket['LocationConstraint'] = ''
           end
-          if @data[:buckets][bucket_name].nil?
-            @data[:buckets][bucket_name] = bucket
+          if self.data[:buckets][bucket_name].nil?
+            self.data[:buckets][bucket_name] = bucket
           else
             response.status = 409
             raise(Excon::Errors.status_error({:expects => 200}, response))

data/lib/fog/storage/requests/google/put_object.rb

@@ -46,8 +46,8 @@ module Fog
           if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
             raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
           else
-            @data[:acls][:object][bucket_name] ||= {}
-            @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
+            self.data[:acls][:object][bucket_name] ||= {}
+            self.data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
 
           data = Fog::Storage.parse_data(data)
@@ -55,7 +55,7 @@ module Fog
             data[:body] = data[:body].read
           end
           response = Excon::Response.new
-          if (bucket = @data[:buckets][bucket_name])
+          if (bucket = self.data[:buckets][bucket_name])
             response.status = 200
             object = {
               :body             => data[:body],

data/lib/fog/terremark/requests/shared/get_network.rb

@@ -28,7 +28,7 @@ module Fog
         def get_network(network_id)
           network_id = network_id.to_i
           response = Excon::Response.new
-          if network = @data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:id] == network_id }
+          if network = self.data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:id] == network_id }
 
             body = { "links" => [],
                      "type" => "application/vnd.vmware.vcloud.network+xml",

data/lib/fog/terremark/requests/shared/get_organization.rb

@@ -36,7 +36,7 @@ module Fog
           organization_id = organization_id.to_i
           response = Excon::Response.new
 
-          if org = @data[:organizations].detect { |org| org[:info][:id] == organization_id }
+          if org = self.data[:organizations].detect { |org| org[:info][:id] == organization_id }
 
             body = { "name" => org[:info][:name],
                      "href" => "#{@base_url}/org/#{org[:info][:id]}",

data/lib/fog/terremark/requests/shared/get_organizations.rb

@@ -31,7 +31,7 @@ module Fog
 
         def get_organizations
           response = Excon::Response.new
-          org_list = @data[:organizations].map do |organization|
+          org_list = self.data[:organizations].map do |organization|
             { "name" => organization[:info][:name],
               "href" => "#{@base_url}/org/#{organization[:info][:id]}",
               "type" => "application/vnd.vmware.vcloud.org+xml"

data/lib/fog/terremark/requests/shared/get_public_ips.rb

@@ -35,7 +35,7 @@ module Fog
           vdc_id = vdc_id.to_i
           response = Excon::Response.new
 
-          if vdc = @data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id }
+          if vdc = self.data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id }
             body = { "PublicIpAddresses" => [] }
             vdc[:public_ips].each do |ip|
               ip = { "name" => ip[:name],

data/lib/fog/terremark/requests/shared/get_vdc.rb

@@ -37,7 +37,7 @@ module Fog
           vdc_id = vdc_id.to_i
           response = Excon::Response.new
 
-          if vdc = @data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id }
+          if vdc = self.data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id }
 
             body = { "name" => vdc[:name],
                      "href" => "#{@base_url}/vdc/#{vdc[:id]}",

data/lib/fog/terremark/shared.rb

@@ -208,6 +208,10 @@ module Fog
               end
             end'
           self.class.instance_eval '
+            def self.reset
+              @data = nil
+            end
+
             def self.reset_data(keys=data.keys)
               for key in [*keys]
                 data.delete(key)

data/lib/fog/terremark/vcloud.rb

@@ -106,8 +106,18 @@ module Fog
          @base_url = Fog::Terremark::Vcloud::Defaults::SCHEME + "://" +
                      Fog::Terremark::Vcloud::Defaults::HOST +
                      Fog::Terremark::Vcloud::Defaults::PATH
-         @data = self.class.data[:terremark_vcloud_username]
+
+         @terremark_username = options[:terremark_vcloud_username]
+       end
+
+       def data
+         self.class.data[@terremark_username]
        end
+
+       def reset_data
+         self.class.data.delete(@terremark_username)
+       end
+
      end
 
    end

data/spec/ecloud/bin_spec.rb

@@ -1,19 +1,25 @@
 require 'ecloud/spec_helper'
 
 describe 'Ecloud' do
-  it { Ecloud.should be_available }
 
-  it { Ecloud.should have_at_least(1).services }
+  it do
+    pending unless Ecloud.available?
+    Ecloud.should have_at_least(1).services
+  end
 
   describe "when indexing it like an array" do
+
+
     describe "with a service that exists" do
       it "should return something when indexed with a configured service" do
+        pending unless Ecloud.available?
         Ecloud[:compute].should_not be_nil
       end
     end
 
     describe "with a service that does not exist" do
       it "should raise an ArgumentError" do
+        pending unless Ecloud.available?
         lambda {Ecloud[:foozle]}.should raise_error(ArgumentError)
       end
     end