fog 0.3.13 → 0.3.14

data/lib/fog/google.rb

@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module Google
 

data/lib/fog/google/models/storage/directory.rb

@@ -14,6 +14,14 @@ module Fog
 
         attribute :creation_date, :aliases => 'CreationDate'
 
+        def acl=(new_acl)
+          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+          unless valid_acls.include?(new_acl)
+            raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
+          end
+          @acl = new_acl
+        end
+
         def destroy
           requires :key
           connection.delete_bucket(key)
@@ -34,6 +42,9 @@ module Fog
         def save
           requires :key
           options = {}
+          if @acl
+            options['x-amz-acl'] = @acl
+          end
           if @location
             options['LocationConstraint'] = @location
           end

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

@@ -17,6 +17,14 @@ module Fog
         attribute :size,            :aliases => 'Size'
         attribute :storage_class,   :aliases => 'StorageClass'
 
+        def acl=(new_acl)
+          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+          unless valid_acls.include?(new_acl)
+            raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
+          end
+          @acl = new_acl
+        end
+
         def body
           @body ||= if last_modified && (file = collection.get(identity))
             file.body
@@ -31,17 +39,9 @@ module Fog
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          data = connection.copy_object(directory.key, @key, target_directory_key, target_file_key).body
+          connection.copy_object(directory.key, @key, target_directory_key, target_file_key)
           target_directory = connection.directories.new(:key => target_directory_key)
-          target_file = target_directory.files.new(attributes.merge!(:key => target_file_key))
-          copy_data = {}
-          for key, value in data
-            if ['ETag', 'LastModified'].include?(key)
-              copy_data[key] = value
-            end
-          end
-          target_file.merge_attributes(copy_data)
-          target_file
+          target_directory.files.get(target_file_key)
         end
 
         def destroy
@@ -65,6 +65,15 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
+          if options != {}
+            Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
+          end
+          if @acl
+            options['x-amz-acl'] ||= @acl
+          end
+          if content_type
+            options['Content-Type'] = content_type
+          end
           data = connection.put_object(directory.key, @key, @body, options)
           @etag = data.headers['ETag']
           true

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

@@ -8,17 +8,18 @@ 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
         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 +28,7 @@ DATA
           request({
             :expects    => 200,
             :body       => data,
-            :headers    => {},
+            :headers    => options,
             :idempotent => true,
             :host       => "#{bucket_name}.#{@host}",
             :method     => 'PUT'

data/lib/fog/google/storage.rb

@@ -79,6 +79,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @data = self.class.data[@google_storage_access_key_id]
         end
@@ -111,6 +112,7 @@ module Fog
         # ==== Returns
         # * Storage object with connection to google.
         def initialize(options={})
+          require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]
           @hmac = Fog::HMAC.new('sha1', @google_storage_secret_access_key)

data/lib/fog/linode/compute.rb

@@ -41,6 +41,7 @@ module Fog
       class Real
 
         def initialize(options={})
+          require 'json'
           @linode_api_key = options[:linode_api_key]
           @host   = options[:host]    || "api.linode.com"
           @port   = options[:port]    || 443

data/lib/fog/new_servers.rb

@@ -1,3 +1,6 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module NewServers
 

data/lib/fog/rackspace.rb

@@ -4,6 +4,7 @@ module Fog
     extend Fog::Provider
 
     service_path 'fog/rackspace'
+    service 'cdn'
     service 'compute'
     service 'files'
     service 'servers'

data/lib/fog/rackspace/bin.rb

@@ -4,6 +4,8 @@ class Rackspace < Fog::Bin
     def [](service)
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
+        when :cdn
+          Fog::Rackspace::CDN.new
         when :compute
           Fog::Rackspace::Compute.new
         when :files
@@ -26,7 +28,7 @@ class Rackspace < Fog::Bin
     end
 
     def services
-      [:compute, :storage]
+      [:cdn, :compute, :storage]
     end
 
   end

data/lib/fog/rackspace/cdn.rb

@@ -0,0 +1,81 @@
+module Fog
+  module Rackspace
+    class CDN < Fog::Service
+
+      requires :rackspace_api_key, :rackspace_username
+
+      model_path 'fog/rackspace/models/cdn'
+
+      request_path 'fog/rackspace/requests/cdn'
+      request :get_cdn_containers
+      request :head_cdn_container
+      request :put_cdn_container
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {}
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @rackspace_username = options[:rackspace_username]
+          @data = self.class.data[@rackspace_username]
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'json'
+          credentials = Fog::Rackspace.authenticate(options)
+          @auth_token = credentials['X-Auth-Token']
+
+          uri = URI.parse(credentials['X-CDN-Management-Url'])
+          @host   = uri.host
+          @path   = uri.path
+          @port   = uri.port
+          @scheme = uri.scheme
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        end
+
+        def reload
+          @cdn_connection.reset
+        end
+
+        def request(params, parse_json = true)
+          begin
+            response = @connection.request(params.merge!({
+              :headers  => {
+                'Content-Type' => 'application/json',
+                'X-Auth-Token' => @auth_token
+              }.merge!(params[:headers] || {}),
+              :host     => @host,
+              :path     => "#{@path}/#{params[:path]}",
+            }))
+          rescue Excon::Errors::Error => error
+            raise case error
+            when Excon::Errors::NotFound
+              Fog::Rackspace::Storage::NotFound.slurp(error)
+            else
+              error
+            end
+          end
+          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
+            response.body = JSON.parse(response.body)
+          end
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/compute.rb

@@ -63,6 +63,7 @@ module Fog
       class Real
 
         def initialize(options={})
+          require 'json'
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
           uri = URI.parse(credentials['X-Server-Management-Url'])

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

@@ -28,7 +28,7 @@ module Fog
 
         def destroy
           requires :directory, :key
-          connection.delete_object(directory.name, @key)
+          connection.delete_object(directory.key, @key)
           true
         end
 
@@ -43,7 +43,7 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
-          data = connection.put_object(directory.name, @key, @body, options)
+          data = connection.put_object(directory.key, @key, @body, options)
           @etag = data.headers['ETag']
           true
         end

data/lib/fog/rackspace/requests/{storage → cdn}/get_cdn_containers.rb

@@ -16,7 +16,7 @@ module Fog
         #   * body<~Array>:
         #     * container<~String>: Name of container
         def get_cdn_containers(options = {})
-          response = cdn_request(
+          response = request(
             :expects  => [200, 204],
             :method   => 'GET',
             :path     => '',

data/lib/fog/rackspace/requests/{storage → cdn}/head_cdn_container.rb

@@ -18,7 +18,7 @@ module Fog
         #     * 'X-User-Agent-ACL'<~String> - ?
         #     * 'X-Referrer-ACL'<~String> - ?
         def head_cdn_container(container)
-          response = cdn_request(
+          response = request(
             :expects  => 204,
             :method   => 'HEAD',
             :path     => container,

data/lib/fog/rackspace/requests/{storage → cdn}/put_cdn_container.rb

@@ -15,7 +15,7 @@ module Fog
         #   * 'X-User-Agent-ACL'<~String> - ?
         #   * 'X-Referrer-ACL'<~String> - ?
         def put_cdn_container(name, options = {})
-          response = cdn_request(
+          response = request(
             :expects  => [201, 202],
             :headers  => options,
             :method   => 'PUT',

data/lib/fog/rackspace/requests/storage/delete_container.rb

@@ -9,7 +9,7 @@ module Fog
         # * name<~String> - Name of container to delete
         #
         def delete_container(name)
-          response = storage_request(
+          response = request(
             :expects  => 204,
             :method   => 'DELETE',
             :path     => CGI.escape(name)

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

@@ -10,7 +10,7 @@ module Fog
         # * object<~String> - Name of object to delete
         #
         def delete_object(container, object)
-          response = storage_request(
+          response = request(
             :expects  => 204,
             :method   => 'DELETE',
             :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"

data/lib/fog/rackspace/requests/storage/get_container.rb

@@ -29,7 +29,7 @@ module Fog
         #       * 'last_modified'<~String> - Last modified timestamp
         #       * 'name'<~String> - Name of object
         def get_container(container, options = {})
-          response = storage_request(
+          response = request(
             :expects  => 200,
             :method   => 'GET',
             :path     => container,

data/lib/fog/rackspace/requests/storage/get_containers.rb

@@ -18,7 +18,7 @@ module Fog
         #       * 'count'<~Integer>: - Number of items in container
         #       * 'name'<~String>: - Name of container
         def get_containers(options = {})
-          response = storage_request(
+          response = request(
             :expects  => [200, 204],
             :method   => 'GET',
             :path     => '',

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

@@ -10,7 +10,7 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         def get_object(container, object, &block)
-          response = storage_request({
+          response = request({
             :block    => block,
             :expects  => 200,
             :method   => 'GET',

data/lib/fog/rackspace/requests/storage/head_container.rb

@@ -14,7 +14,7 @@ module Fog
         #     * 'X-Container-Object-Count'<~String> - Count of containers
         #     * 'X-Container-Bytes-Used'<~String>   - Bytes used
         def head_container(container)
-          response = storage_request(
+          response = request(
             :expects  => 204,
             :method   => 'HEAD',
             :path     => container,

data/lib/fog/rackspace/requests/storage/head_containers.rb

@@ -11,7 +11,7 @@ module Fog
         #     * 'X-Account-Container-Count'<~String> - Count of containers
         #     * 'X-Account-Bytes-Used'<~String> - Bytes used
         def head_containers
-          response = storage_request(
+          response = request(
             :expects  => 204,
             :method   => 'HEAD',
             :path     => '',

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

@@ -10,7 +10,7 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         def head_object(container, object)
-          response = storage_request({
+          response = request({
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"

data/lib/fog/rackspace/requests/storage/put_container.rb

@@ -9,7 +9,7 @@ module Fog
         # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
         def put_container(name)
-          response = storage_request(
+          response = request(
             :expects  => [201, 202],
             :method   => 'PUT',
             :path     => CGI.escape(name)

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

@@ -11,7 +11,7 @@ module Fog
         def put_object(container, object, data, options = {})
           data = parse_data(data)
           headers = data[:headers].merge!(options)
-          response = storage_request(
+          response = request(
             :body     => data[:body],
             :expects  => 201,
             :headers  => headers,

data/lib/fog/rackspace/storage.rb

@@ -14,14 +14,11 @@ module Fog
       request :delete_container
       request :delete_object
       request :get_container
-      request :get_cdn_containers
       request :get_containers
       request :get_object
-      request :head_cdn_container
       request :head_container
       request :head_containers
       request :head_object
-      request :put_cdn_container
       request :put_container
       request :put_object
 
@@ -66,6 +63,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'mime/types'
           @rackspace_username = options[:rackspace_username]
           @data = self.class.data[@rackspace_username]
         end
@@ -76,64 +74,32 @@ module Fog
         include Utils
 
         def initialize(options={})
+          require 'mime/types'
+          require 'json'
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
 
-          if(credentials['X-CDN-Management-Url'])
-            cdn_uri = URI.parse(credentials['X-CDN-Management-Url'])
-            @cdn_host   = cdn_uri.host
-            @cdn_path   = cdn_uri.path
-            @cdn_port   = cdn_uri.port
-            @cdn_scheme = cdn_uri.scheme
-            @cdn_connection = Fog::Connection.new("#{@cdn_scheme}://#{@cdn_host}:#{@cdn_port}", options[:persistent])
-          end
-
-          storage_uri = URI.parse(credentials['X-Storage-Url'])
-          @storage_host   = storage_uri.host
-          @storage_path   = storage_uri.path
-          @storage_port   = storage_uri.port
-          @storage_scheme = storage_uri.scheme
-          @storage_connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}", options[:persistent])
+          uri = URI.parse(credentials['X-Storage-Url'])
+          @host   = uri.host
+          @path   = uri.path
+          @port   = uri.port
+          @scheme = uri.scheme
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
         def reload
-          @cdn_connection.reset
           @storage_connection.reset
         end
 
-        def cdn_request(params, parse_json = true)
-          begin
-            response = @cdn_connection.request(params.merge!({
-              :headers  => {
-                'Content-Type' => 'application/json',
-                'X-Auth-Token' => @auth_token
-              }.merge!(params[:headers] || {}),
-              :host     => @cdn_host,
-              :path     => "#{@cdn_path}/#{params[:path]}",
-            }))
-          rescue Excon::Errors::Error => error
-            raise case error
-            when Excon::Errors::NotFound
-              Fog::Rackspace::Storage::NotFound.slurp(error)
-            else
-              error
-            end
-          end
-          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
-            response.body = JSON.parse(response.body)
-          end
-          response
-        end
-
-        def storage_request(params, parse_json = true, &block)
+        def request(params, parse_json = true, &block)
           begin
-            response = @storage_connection.request(params.merge!({
+            response = @connection.request(params.merge!({
               :headers  => {
                 'Content-Type' => 'application/json',
                 'X-Auth-Token' => @auth_token
               }.merge!(params[:headers] || {}),
-              :host     => @storage_host,
-              :path     => "#{@storage_path}/#{params[:path]}",
+              :host     => @host,
+              :path     => "#{@path}/#{params[:path]}",
             }), &block)
           rescue Excon::Errors::Error => error
             raise case error