fog 0.3.13 → 0.3.14

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

@@ -14,6 +14,10 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Payer'<~String> - Specifies who pays for download and requests
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentGET.html
+
         def get_request_payment(bucket_name)
           request({
             :expects  => 200,
@@ -28,7 +32,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_request_payment(bucket_name)
           response = Excon::Response.new

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

@@ -16,6 +16,10 @@ module Fog
         #     * 'Owner'<~Hash>:
         #       * 'DisplayName'<~String> - Display name of bucket owner
         #       * 'ID'<~String> - Id of bucket owner
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTServiceGET.html
+
         def get_service
           request({
             :expects  => 200,
@@ -30,7 +34,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_service
           response = Excon::Response.new

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

@@ -24,6 +24,10 @@ module Fog
         #     * 'Content-Type'<~String> - MIME type of object
         #     * 'ETag'<~String> - Etag of object
         #     * 'Last-Modified'<~String> - Last modified timestamp for object
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html
+
         def head_object(bucket_name, object_name, options={})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
@@ -50,7 +54,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def head_object(bucket_name, object_name, options = {})
           response = get_object(bucket_name, object_name, options)

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

@@ -22,8 +22,9 @@ module Fog
         #   * x-amz-security-token - devpay security token
         #   * x-amz-meta-... - meta data tags
         #
-        # See also: http://docs.amazonwebservices.com/AmazonS3/latest/dev/HTTPPOSTForms.html
-        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/HTTPPOSTForms.html
+
         def post_object_hidden_fields(options = {})
           if options['policy']
             options['policy'] = options['policy'].to_json
@@ -37,7 +38,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def post_object_hidden_fields(options = {})
           Fog::Mock.not_implemented

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

@@ -8,17 +8,22 @@ module Fog
         # ==== Parameters
         # * bucket_name<~String> - name of bucket to create
         # * options<~Hash> - config arguments for bucket.  Defaults to {}.
-        #   * :location_constraint<~Symbol> - sets the location for the bucket
+        #   * 'LocationConstraint'<~Symbol> - sets the location for the bucket
+        #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * status<~Integer> - 200
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html
+
         def put_bucket(bucket_name, options = {})
-          if options['LocationConstraint']
+          if location_constraint = options.delete('LocationConstraint')
             data =
 <<-DATA
   <CreateBucketConfiguration>
-    <LocationConstraint>#{options['LocationConstraint']}</LocationConstraint>
+    <LocationConstraint>#{location_constraint}</LocationConstraint>
   </CreateBucketConfiguration>
 DATA
           else
@@ -27,7 +32,7 @@ DATA
           request({
             :expects    => 200,
             :body       => data,
-            :headers    => {},
+            :headers    => options,
             :idempotent => true,
             :host       => "#{bucket_name}.#{@host}",
             :method     => 'PUT'
@@ -36,7 +41,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket(bucket_name, options = {})
           response = Excon::Response.new
@@ -51,7 +56,7 @@ DATA
           if options['LocationConstraint']
             bucket['LocationConstraint'] = options['LocationConstraint']
           else
-            bucket['LocationConstraint'] = ''
+            bucket['LocationConstraint'] = nil
           end
           unless @data[:buckets][bucket_name]
             @data[:buckets][bucket_name] = bucket

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

@@ -20,6 +20,10 @@ module Fog
         #       or
         #         * 'URI'<~String> - URI of group to grant access for
         #     * Permission<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTacl.html
+
         def put_bucket_acl(bucket_name, acl)
           data =
 <<-DATA
@@ -68,7 +72,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket_acl(bucket_name, acl)
           Fog::Mock.not_implemented

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

@@ -20,6 +20,10 @@ module Fog
         #       or
         #         * 'URI'<~String> - URI of group to grant access for
         #     * Permission<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlogging.html
+
         def put_bucket_logging(bucket_name, logging_status)
           if logging_status['LoggingEnabled'].empty?
             data =
@@ -75,7 +79,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket_logging(bucket_name, logging_status)
           Fog::Mock.not_implemented

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

@@ -8,6 +8,10 @@ module Fog
         # ==== Parameters
         # * bucket_name<~String> - name of bucket to modify
         # * status<~String> - Status to change to in ['Enabled', 'Suspended']
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTVersioningStatus.html
+
         def put_bucket_versioning(bucket_name, status)
           data =
 <<-DATA
@@ -28,7 +32,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_bucket_versioning(bucket_name, status)
           Fog::Mock.not_implemented

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

@@ -23,6 +23,10 @@ module Fog
         # * response<~Excon::Response>:
         #   * headers<~Hash>:
         #     * 'ETag'<~String> - etag of new object
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
+
         def put_object(bucket_name, object_name, data, options = {})
           data = parse_data(data)
           headers = data[:headers].merge!(options)
@@ -39,7 +43,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_object(bucket_name, object_name, data, options = {})
           data = parse_data(data)

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

@@ -14,6 +14,9 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
         def put_object_url(bucket_name, object_name, expires)
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
@@ -31,7 +34,7 @@ module Fog
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_object_url(bucket_name, object_name, expires)
           unless bucket_name

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

@@ -8,6 +8,10 @@ module Fog
         # ==== Parameters
         # * bucket_name<~String> - name of bucket to modify
         # * payer<~String> - valid values are BucketOwner or Requester
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html
+
         def put_request_payment(bucket_name, payer)
           data =
 <<-DATA
@@ -27,7 +31,7 @@ DATA
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def put_request_payment(bucket_name, payer)
           response = Excon::Response.new

data/lib/fog/aws/storage.rb

@@ -91,6 +91,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'mime/types'
           @aws_access_key_id = options[:aws_access_key_id]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
@@ -136,6 +137,7 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
+          require 'mime/types'
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)

data/lib/fog/bluebox/compute.rb

@@ -47,6 +47,7 @@ module Fog
       class Real
 
         def initialize(options={})
+          require 'json'
           @bluebox_api_key      = options[:bluebox_api_key]
           @bluebox_customer_id  = options[:bluebox_customer_id]
           @host   = options[:bluebox_host]    || "boxpanel.blueboxgrp.com"

data/lib/fog/core.rb

@@ -1,11 +1,13 @@
 require 'fog/core/attributes'
 require 'fog/core/collection'
+require 'fog/core/compute'
 require 'fog/core/connection'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
 require 'fog/core/model'
-require 'fog/core/parser'
+# require 'fog/core/parser'
 require 'fog/core/provider'
 require 'fog/core/service'
-require 'fog/core/ssh'
+require 'fog/core/ssh'
+require 'fog/core/storage'

data/lib/fog/core/attributes.rb

@@ -118,11 +118,13 @@ module Fog
       end
 
       def attributes
-        attributes = {}
-        for attribute in self.class.attributes
-          attributes[attribute] = send("#{attribute}")
+        @attributes ||= begin
+          attributes = {}
+          for attribute in self.class.attributes
+            attributes[attribute] = send("#{attribute}")
+          end
+          attributes
         end
-        attributes
       end
 
       def identity
@@ -138,8 +140,10 @@ module Fog
           unless self.class.ignored_attributes.include?(key)
             if aliased_key = self.class.aliases[key]
               send("#{aliased_key}=", value)
-            else
+            elsif (methods | private_methods ).include?("#{key}=")
               send("#{key}=", value)
+            else
+              attributes[key] = value
             end
           end
         end

data/lib/fog/core/compute.rb

@@ -0,0 +1,33 @@
+module Fog
+  class Storage
+
+    def self.new(attributes)
+      case attributes.delete(:provider)
+      when 'AWS'
+        require 'fog/aws'
+        Fog::AWS::Compute.new(attributes)
+      when 'Bluebox'
+        require 'fog/bluebox'
+        Fog::Bluebox::Compute.new(attributes)
+      when 'GoGrid'
+        require 'fog/go_grid'
+        Fog::GoGrid::Compute.new(attributes)
+      when 'Linode'
+        require 'fog/linode'
+        Fog::Linode::Compute.new(attributes)
+      when 'NewServers'
+        require 'fog/new_servers'
+        Fog::NewServers::Compute.new(attributes)
+      when 'Rackspace'
+        require 'fog/rackspace'
+        Fog::Rackspace::Compute.new(attributes)
+      when 'Slicehost'
+        require 'fog/slicehost'
+        Fog::Slicehost::Compute.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+      end
+    end
+
+  end
+end

data/lib/fog/core/credentials.rb

@@ -15,7 +15,6 @@ module Fog
       ENV["FOG_RC"] || '~/.fog'
     end
 
-    remove_method :credentials
     def credentials
       @credentials ||= begin
         path = File.expand_path(config_path)

data/lib/fog/core/model.rb

@@ -4,11 +4,7 @@ module Fog
     extend Fog::Attributes::ClassMethods
     include Fog::Attributes::InstanceMethods
 
-    attr_accessor :connection
-
-    def collection
-      @collection
-    end
+    attr_accessor :collection, :connection
 
     def initialize(new_attributes = {})
       merge_attributes(new_attributes)
@@ -28,6 +24,7 @@ module Fog
     end
 
     def reload
+      requires :identity
       if data = collection.get(identity)
         new_attributes = data.attributes
         merge_attributes(new_attributes)
@@ -47,11 +44,5 @@ module Fog
       end
     end
 
-    private
-
-    def collection=(new_collection)
-      @collection = new_collection
-    end
-
   end
 end

data/lib/fog/core/ssh.rb

@@ -39,6 +39,7 @@ module Fog
     class Real
 
       def initialize(address, username, options)
+        require 'net/ssh'
         @address  = address
         @username = username
         @options  = options.merge(:paranoid => false)

data/lib/fog/core/storage.rb

@@ -0,0 +1,24 @@
+module Fog
+  class Storage
+
+    def self.new(attributes)
+      case provider = attributes.delete(:provider)
+      when 'AWS'
+        require 'fog/aws'
+        Fog::AWS::Storage.new(attributes)
+      when 'Google'
+        require 'fog/google'
+        Fog::Google::Storage.new(attributes)
+      when 'Local'
+        require 'fog/local'
+        Fog::Local::Storage.new(attributes)
+      when 'Rackspace'
+        require 'fog/rackspace'
+        Fog::Rackspace::Storage.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+      end
+    end
+
+  end
+end

data/lib/fog/go_grid/compute.rb

@@ -48,6 +48,8 @@ module Fog
       class Real
 
         def initialize(options={})
+          require 'digest/md5'
+          require 'json'
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
           @host   = options[:host]    || "api.gogrid.com"