fog 0.7.0 → 0.7.1

data/.gitignore

@@ -1,3 +1,4 @@
+*~
 *.gem
 *.rbc
 *.sw?
@@ -6,7 +7,7 @@
 _site/*
 coverage
 doc/*
+Gemfile.lock
 rdoc
 pkg
 spec/credentials.yml
-*~

data/changelog.txt

@@ -1,3 +1,14 @@
+0.7.1 03/21/2011
+================
+
+[aws|storage] normalize headers. thanks pweldon
+
+[mock] fix reset_data to not be called in Mock#initialize
+
+[rackspace] add support for using servicenet. thanks minter
+
+[storage] provide for non file/string files. thanks pweldon
+
 0.7.0 03/14/2011
 ================
 

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.7.0'
-  s.date              = '2011-03-18'
+  s.version           = '0.7.1'
+  s.date              = '2011-03-21'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,8 +43,8 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '>=0.5.5')
-  s.add_dependency('formatador', '>=0.1.1')
+  s.add_dependency('excon', '>=0.5.7')
+  s.add_dependency('formatador', '>=0.1.2')
   s.add_dependency('json')
   s.add_dependency('mime-types')
   s.add_dependency('net-ssh', '>=2.0.23')
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '1.3.1')
-  s.add_development_dependency('shindo', '0.3.3')
+  s.add_development_dependency('shindo', '0.3.4')
   s.add_development_dependency('virtualbox', '0.8.3')
 
   s.files = `git ls-files`.split("\n")

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 
 end

data/lib/fog/aws/simpledb.rb

@@ -4,7 +4,7 @@ module Fog
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :nil_string, :path, :port, :scheme, :persistent
-      
+
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes
       request :create_domain
@@ -28,7 +28,7 @@ module Fog
 
         def initialize(options={})
           @aws_access_key_id = options[:aws_access_key_id]
-          reset_data
+          @data = self.class.data[@aws_access_key_id]
         end
 
         def reset_data
@@ -43,7 +43,7 @@ module Fog
         # Initialize connection to SimpleDB
         #
         # ==== Notes
-        # options parameter must include values for :aws_access_key_id and 
+        # options parameter must include values for :aws_access_key_id and
         # :aws_secret_access_key in order to create a connection
         #
         # ==== Examples
@@ -164,7 +164,7 @@ module Fog
           response = @connection.request({
             :body       => body,
             :expects    => 200,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8' },
             :host       => @host,
             :idempotent => idempotent,
             :method     => 'POST',

data/lib/fog/cdn/aws.rb

@@ -39,7 +39,7 @@ module Fog
           require 'mime/types'
           @aws_access_key_id  = options[:aws_access_key_id]
           @region             = options[:region]
-          reset_data
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def reset_data

data/lib/fog/cdn/rackspace.rb

@@ -31,7 +31,7 @@ module Fog
           end
 
           @rackspace_username = options[:rackspace_username]
-          reset_data
+          @data = self.class.data[@rackspace_username]
         end
 
         def reset_data

data/lib/fog/compute/aws.rb

@@ -137,7 +137,7 @@ module Fog
           @aws_access_key_id = options[:aws_access_key_id]
           @region = options[:region] || 'us-east-1'
 
-          reset_data
+          @data = self.class.data[@region][@aws_access_key_id]
           @owner_id = @data[:owner_id]
         end
 

data/lib/fog/compute/bluebox.rb

@@ -42,7 +42,7 @@ module Fog
           end
 
           @bluebox_api_key = options[:bluebox_api_key]
-          reset_data
+          @data = self.class.data[@bluebox_api_key]
         end
 
         def reset_data

data/lib/fog/compute/go_grid.rb

@@ -46,7 +46,7 @@ module Fog
 
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
-          reset_data
+          @data = self.class.data[@go_grid_api_key]
         end
 
         def reset_data

data/lib/fog/compute/linode.rb

@@ -40,7 +40,7 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
-          reset_data
+          @data = self.class.data[@linode_api_key]
         end
 
         def reset_data

data/lib/fog/compute/new_servers.rb

@@ -34,7 +34,7 @@ module Fog
           end
 
           @new_server_username = options[:new_servers_username]
-          reset_data
+          @data = self.class.data[@new_server_username]
         end
 
         def reset_data

data/lib/fog/compute/rackspace.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :persistent
+      recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
       recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/rackspace'
@@ -62,7 +62,7 @@ module Fog
           end
 
           @rackspace_username = options[:rackspace_username]
-          reset_data
+          @data = self.class.data[@rackspace_username]
         end
 
         def reset_data
@@ -86,7 +86,9 @@ module Fog
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_servicenet = options[:rackspace_servicenet]
           authenticate
+          Excon.ssl_verify_peer = false if options[:rackspace_servicenet] == true
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
@@ -137,7 +139,7 @@ module Fog
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
           uri = URI.parse(credentials['X-Server-Management-Url'])
-          @host   = uri.host
+          @host   = @rackspace_servicenet == true ? "snet-#{uri.host}" : uri.host
           @path   = uri.path
           @port   = uri.port
           @scheme = uri.scheme

data/lib/fog/compute/slicehost.rb

@@ -43,7 +43,7 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
-          reset_data
+          @data = self.class.data[@slicehost_password]
         end
 
         def reset_data

data/lib/fog/compute/voxel.rb

@@ -50,7 +50,7 @@ module Fog
 
         def initialize(options={})
           @voxel_api_key = options[:voxel_api_key]
-          reset_data
+          @data = self.class.data[@voxel_api_key]
         end
 
         def reset_data

data/lib/fog/core/credentials.rb

@@ -84,6 +84,7 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :private_key_path:
   :rackspace_api_key:
   :rackspace_username:
+  :rackspace_servicenet:
   :slicehost_password:
   :terremark_username:
   :terremark_password:

data/lib/fog/dns/aws.rb

@@ -44,7 +44,7 @@ module Fog
           require 'mime/types'
           @aws_access_key_id  = options[:aws_access_key_id]
           @region             = options[:region]
-          reset_data
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def reset_data

data/lib/fog/dns/bluebox.rb

@@ -40,7 +40,7 @@ module Fog
 
           @bluebox_customer_id = options[:bluebox_customer_id]
           @bluebox_api_key = options[:bluebox_api_key]
-          reset_data
+          @data = self.class.data[@bluebox_customer_id]
         end
 
         def reset_data

data/lib/fog/dns/linode.rb

@@ -39,7 +39,7 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
-          reset_data
+          @data = self.class.data[@linode_api_key]
         end
 
         def reset_data

data/lib/fog/dns/slicehost.rb

@@ -39,7 +39,7 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
-          reset_data
+          @data = self.class.data[@slicehost_password]
         end
 
         def reset_data

data/lib/fog/dns/zerigo.rb

@@ -46,7 +46,7 @@ module Fog
 
           @zerigo_email = options[:zerigo_email]
           @zerigo_token = options[:zerigo_token]
-          reset_data
+          @data = self.class.data[@zerigo_email]
         end
 
         def reset_data

data/lib/fog/storage.rb

@@ -21,26 +21,37 @@ module Fog
       end
     end
 
+    def self.get_body_size(body)
+      case
+      when body.respond_to?(:bytesize)
+        body.bytesize
+      when body.respond_to?(:size)
+        body.size
+      when body.respond_to?(:stat)
+        body.stat.size
+      else
+        0
+      end
+    end
+    
     def self.parse_data(data)
       metadata = {
         :body => nil,
         :headers => {}
       }
-
-      if data.is_a?(String)
-        metadata[:body] = data
-        metadata[:headers]['Content-Length'] = metadata[:body].size
-      else
+      
+      metadata[:body] = data
+      metadata[:headers]['Content-Length'] = get_body_size(data)
+      
+      if data.respond_to?(:path)
         filename = ::File.basename(data.path)
         unless (mime_types = MIME::Types.of(filename)).empty?
           metadata[:headers]['Content-Type'] = mime_types.first.content_type
         end
-        metadata[:body] = data
-        metadata[:headers]['Content-Length'] = ::File.size(data.path)
       end
       # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
       metadata
     end
-
+    
   end
-end
+end

data/lib/fog/storage/aws.rb

@@ -175,7 +175,7 @@ module Fog
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
           @region = options[:region]
-          reset_data
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def reset_data

data/lib/fog/storage/google.rb

@@ -129,7 +129,7 @@ module Fog
 
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
-          reset_data
+          @data = self.class.data[@google_storage_access_key_id]
         end
 
         def reset_data

data/lib/fog/storage/local.rb

@@ -31,7 +31,7 @@ module Fog
           end
 
           @local_root = ::File.expand_path(options[:local_root])
-          reset_data
+          @data = self.class.data[@local_root]
         end
 
         def local_root

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

@@ -117,12 +117,10 @@ module Fog
           options['x-amz-storage-class'] = storage_class if storage_class
 
           data = connection.put_object(directory.key, key, body, options)
+          data.headers.delete('Content-Length')
+          data.headers['ETag'].gsub!('"','')
           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/models/aws/files.rb

@@ -46,6 +46,7 @@ module Fog
             :body => data.body,
             :key  => key
           })
+          normalise_headers(file_data)
           new(file_data)
         rescue Excon::Errors::NotFound
           nil
@@ -62,6 +63,7 @@ module Fog
           file_data = data.headers.merge({
             :key => key
           })
+          normalise_headers(file_data)
           new(file_data)
         rescue Excon::Errors::NotFound
           nil
@@ -72,6 +74,11 @@ module Fog
           super({ :directory => directory }.merge!(attributes))
         end
 
+        def normalise_headers(headers)
+          headers['Last-Modified'] = Time.parse(headers['Last-Modified'])
+          headers['ETag'].gsub!('"','')
+        end
+
       end
 
     end

data/lib/fog/storage/rackspace.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :persistent
+      recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
       recognizes :provider # remove post deprecation
 
       model_path 'fog/storage/models/rackspace'
@@ -56,7 +56,7 @@ module Fog
           require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
-          reset_data
+          @data = self.class.data[@rackspace_username]
         end
 
         def reset_data
@@ -85,10 +85,11 @@ module Fog
           @auth_token = credentials['X-Auth-Token']
 
           uri = URI.parse(credentials['X-Storage-Url'])
-          @host   = uri.host
+          @host   = options[:rackspace_servicenet] == true ? "snet-#{uri.host}" : uri.host
           @path   = uri.path
           @port   = uri.port
           @scheme = uri.scheme
+          Excon.ssl_verify_peer = false if options[:rackspace_servicenet] == true
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -06:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,12 +38,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 5
         segments: 
         - 0
         - 5
-        - 5
-        version: 0.5.5
+        - 7
+        version: 0.5.7
   name: excon
   prerelease: false
   version_requirements: *id002
@@ -54,12 +54,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.2
   name: formatador
   prerelease: false
   version_requirements: *id003
@@ -174,12 +174,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 0
         - 3
-        - 3
-        version: 0.3.3
+        - 4
+        version: 0.3.4
   name: shindo
   prerelease: false
   version_requirements: *id011
@@ -212,7 +212,6 @@ files:
 - .document
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - benchs/fog_vs.rb

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fog (0.7.0)
-      builder
-      excon (>= 0.5.5)
-      formatador (>= 0.1.1)
-      json
-      mime-types
-      net-ssh (>= 2.0.23)
-      nokogiri (>= 1.4.4)
-      ruby-hmac
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    excon (0.5.6)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    formatador (0.1.1)
-    json (1.5.1)
-    mime-types (1.16)
-    net-ssh (2.1.0)
-    nokogiri (1.4.4)
-    rake (0.8.7)
-    rspec (1.3.1)
-    ruby-hmac (0.4.0)
-    shindo (0.3.3)
-      formatador (>= 0.1.1)
-    virtualbox (0.8.3)
-      ffi (~> 0.6.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fog!
-  rake
-  rspec (= 1.3.1)
-  shindo (= 0.3.3)
-  virtualbox (= 0.8.3)