fog 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.1)
+    fog (0.3.2)
       builder
       excon (>= 0.2.1)
       formatador (>= 0.0.15)

data/README.rdoc

@@ -95,6 +95,7 @@ Play around and use the console to explore or check out the {getting started gui
 You should try out the (varying) support fog has for:
 * {AWS}[http://aws.amazon.com] [{EC2}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {S3}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
 * {Blue Box Group}[http://www.blueboxgrp.com] [{Blocks}[http://www.blueboxgrp.com/blocks]]
+* {Google}[http://www.google.com] [{Storage}[http://code.google.com/apis/storage]]
 * {Rackspace}[http://www.rackspace.com] [{Files}[http://www.rackspacecloud.com/cloud_hosting_products/files], {Servers}[http://www.rackspacecloud.com/cloud_hosting_products/servers]]
 * {Slicehost}[http://www.slicehost.com]
 * {Terremark}[http://www.terremark.com] [{vCloud Express}[http://vcloudexpress.terremark.com]]

data/fog.gemspec

@@ -7,7 +7,7 @@ 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.3.1'
+  s.version           = '0.3.2'
   s.date              = '2010-09-24'
   s.rubyforge_project = 'fog'
 
@@ -263,6 +263,36 @@ Gem::Specification.new do |s|
     lib/fog/go_grid/requests/compute/grid_server_get.rb
     lib/fog/go_grid/requests/compute/grid_server_list.rb
     lib/fog/go_grid/requests/compute/grid_server_power.rb
+    lib/fog/google.rb
+    lib/fog/google/bin.rb
+    lib/fog/google/models/storage/directories.rb
+    lib/fog/google/models/storage/directory.rb
+    lib/fog/google/models/storage/file.rb
+    lib/fog/google/models/storage/files.rb
+    lib/fog/google/parsers/storage/access_control_list.rb
+    lib/fog/google/parsers/storage/copy_object.rb
+    lib/fog/google/parsers/storage/get_bucket.rb
+    lib/fog/google/parsers/storage/get_bucket_logging.rb
+    lib/fog/google/parsers/storage/get_bucket_object_versions.rb
+    lib/fog/google/parsers/storage/get_bucket_versioning.rb
+    lib/fog/google/parsers/storage/get_request_payment.rb
+    lib/fog/google/parsers/storage/get_service.rb
+    lib/fog/google/requests/storage/copy_object.rb
+    lib/fog/google/requests/storage/delete_bucket.rb
+    lib/fog/google/requests/storage/delete_object.rb
+    lib/fog/google/requests/storage/get_bucket.rb
+    lib/fog/google/requests/storage/get_bucket_acl.rb
+    lib/fog/google/requests/storage/get_object.rb
+    lib/fog/google/requests/storage/get_object_acl.rb
+    lib/fog/google/requests/storage/get_object_torrent.rb
+    lib/fog/google/requests/storage/get_object_url.rb
+    lib/fog/google/requests/storage/get_service.rb
+    lib/fog/google/requests/storage/head_object.rb
+    lib/fog/google/requests/storage/put_bucket.rb
+    lib/fog/google/requests/storage/put_bucket_acl.rb
+    lib/fog/google/requests/storage/put_object.rb
+    lib/fog/google/requests/storage/put_object_url.rb
+    lib/fog/google/storage.rb
     lib/fog/hmac.rb
     lib/fog/linode.rb
     lib/fog/linode/bin.rb
@@ -544,6 +574,19 @@ Gem::Specification.new do |s|
     spec/bluebox/models/compute/server_spec.rb
     spec/bluebox/models/compute/servers_spec.rb
     spec/compact_progress_bar_formatter.rb
+    spec/google/models/storage/directories_spec.rb
+    spec/google/models/storage/directory_spec.rb
+    spec/google/models/storage/file_spec.rb
+    spec/google/models/storage/files_spec.rb
+    spec/google/requests/storage/copy_object_spec.rb
+    spec/google/requests/storage/delete_bucket_spec.rb
+    spec/google/requests/storage/delete_object_spec.rb
+    spec/google/requests/storage/get_bucket_spec.rb
+    spec/google/requests/storage/get_object_spec.rb
+    spec/google/requests/storage/get_service_spec.rb
+    spec/google/requests/storage/head_object_spec.rb
+    spec/google/requests/storage/put_bucket_spec.rb
+    spec/google/requests/storage/put_object_spec.rb
     spec/lorem.txt
     spec/rackspace/models/compute/flavors_spec.rb
     spec/rackspace/models/compute/server_spec.rb

data/lib/fog.rb

@@ -32,7 +32,7 @@ require 'fog/ssh'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 
   module Mock
@@ -94,3 +94,4 @@ require 'fog/rackspace'
 require 'fog/slicehost'
 require 'fog/terremark'
 require 'fog/vcloud'
+require 'fog/google'

data/lib/fog/bin.rb

@@ -8,6 +8,7 @@ module Fog
         ::AWS,
         ::Bluebox,
         ::GoGrid,
+        ::Google,
         ::Linode,
         ::Local,
         ::NewServers,
@@ -68,6 +69,7 @@ end
 require 'fog/aws/bin'
 require 'fog/bluebox/bin'
 require 'fog/go_grid/bin'
+require 'fog/google/bin'
 require 'fog/linode/bin'
 require 'fog/local/bin'
 require 'fog/new_servers/bin'

data/lib/fog/google.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Google
+
+    extend Fog::Provider
+
+    service_path 'fog/google'
+    service 'storage'
+
+    class Mock
+
+      def self.etag
+        hex(32)
+      end
+
+      def self.hex(length)
+        max = ('f' * length).to_i(16)
+        rand(max).to_s(16)
+      end
+
+    end
+  end
+end

data/lib/fog/google/bin.rb

@@ -0,0 +1,20 @@
+class Google < Fog::Bin
+  class << self
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :storage
+          Fog::Google::Storage.new
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      [:storage]
+    end
+
+  end
+
+end

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

@@ -0,0 +1,43 @@
+require 'fog/collection'
+require 'fog/google/models/storage/directory'
+
+module Fog
+  module Google
+    class Storage
+
+      class Directories < Fog::Collection
+
+        model Fog::Google::Storage::Directory
+
+        def all
+         data = connection.get_service.body['Buckets']
+         load(data)
+        end
+
+        def get(key, options = {})
+          remap_attributes(options, {
+            :delimiter  => 'delimiter',
+            :marker     => 'marker',
+            :max_keys   => 'max-keys',
+            :prefix     => 'prefix'
+          })
+          data = connection.get_bucket(key, options).body
+          directory = new(:key => data['Name'])
+          options = {}
+          for k, v in data
+            if ['Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(k)
+              options[k] = v
+            end
+          end
+          directory.files.merge_attributes(options)
+          directory.files.load(data['Contents'])
+          directory
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require 'fog/model'
+require 'fog/google/models/storage/files'
+
+module Fog
+  module Google
+    class Storage
+
+      class Directory < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:name, :key)
+        deprecate(:name=, :key=)
+
+        identity  :key,           :aliases => ['Name', 'name']
+
+        attribute :creation_date, :aliases => 'CreationDate'
+
+        def destroy
+          requires :key
+          connection.delete_bucket(key)
+          true
+        rescue Excon::Errors::NotFound
+          false
+        end
+
+        def files
+          @files ||= begin
+            Fog::Google::Storage::Files.new(
+              :directory    => self,
+              :connection   => connection
+            )
+          end
+        end
+
+        def save
+          requires :key
+          options = {}
+          if @location
+            options['LocationConstraint'] = @location
+          end
+          connection.put_bucket(key, options)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+require 'fog/model'
+
+module Fog
+  module Google
+    class Storage
+
+      class File < Fog::Model
+
+        identity  :key,             :aliases => 'Key'
+
+        attr_accessor :body
+        attribute :content_length,  :aliases => 'Content-Length'
+        attribute :content_type,    :aliases => 'Content-Type'
+        attribute :etag,            :aliases => ['Etag', 'ETag']
+        attribute :last_modified,   :aliases => ['Last-Modified', 'LastModified']
+        attribute :owner,           :aliases => 'Owner'
+        attribute :size,            :aliases => 'Size'
+        attribute :storage_class,   :aliases => 'StorageClass'
+
+        def body
+          @body ||= if last_modified && (file = collection.get(identity))
+            file.body
+          else
+            ''
+          end
+        end
+
+        def directory
+          @directory
+        end
+
+        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
+          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
+        end
+
+        def destroy
+          requires :directory, :key
+          begin
+            connection.delete_object(directory.key, @key)
+          rescue Excon::Errors::NotFound
+          end
+          true
+        end
+
+        def owner=(new_owner)
+          if new_owner
+            @owner = {
+              :display_name => new_owner['DisplayName'],
+              :id           => new_owner['ID']
+            }
+          end
+        end
+
+        def save(options = {})
+          requires :body, :directory, :key
+          data = connection.put_object(directory.key, @key, @body, options)
+          @etag = data.headers['ETag']
+          true
+        end
+
+        def url(expires)
+          requires :key
+          collection.get_url(key, expires)
+        end
+
+        private
+
+        def directory=(new_directory)
+          @directory = new_directory
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+require 'fog/collection'
+require 'fog/google/models/storage/file'
+
+module Fog
+  module Google
+    class Storage
+
+      class Files < Fog::Collection
+
+        attribute :delimiter,     :aliases => 'Delimiter'
+        attribute :directory
+        attribute :is_truncated,  :aliases => 'IsTruncated'
+        attribute :marker,        :aliases => 'Marker'
+        attribute :max_keys,      :aliases => ['MaxKeys', 'max-keys']
+        attribute :prefix,        :aliases => 'Prefix'
+
+        model Fog::Google::Storage::File
+
+        def all(options = {})
+          requires :directory
+          options = {
+            'delimiter'   => @delimiter,
+            'marker'      => @marker,
+            'max-keys'    => @max_keys,
+            'prefix'      => @prefix
+          }.merge!(options)
+          options = options.reject {|key,value| value.nil? || value.to_s.empty?}
+          merge_attributes(options)
+          parent = directory.collection.get(
+            directory.key,
+            options
+          )
+          if parent
+            merge_attributes(parent.files.attributes)
+            load(parent.files.map {|file| file.attributes})
+          else
+            nil
+          end
+        end
+
+        def get(key, options = {}, &block)
+          requires :directory
+          data = connection.get_object(directory.key, key, options, &block)
+          file_data = {
+            :body => data.body,
+            :key  => key
+          }
+          for key, value in data.headers
+            if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
+              file_data[key] = value
+            end
+          end
+          new(file_data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def get_url(key, expires)
+          requires :directory
+          connection.get_object_url(directory.key, key, expires)
+        end
+
+        def head(key, options = {})
+          requires :directory
+          data = connection.head_object(directory.key, key, options)
+          file_data = {
+            :key => key
+          }
+          for key, value in data.headers
+            if ['Content-Length', 'Content-Type', 'ETag', 'Last-Modified'].include?(key)
+              file_data[key] = value
+            end
+          end
+          new(file_data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+        def new(attributes = {})
+          requires :directory
+          super({ :directory => directory }.merge!(attributes))
+        end
+
+        private
+
+        def directory=(new_directory)
+          @directory = new_directory
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/parsers/storage/access_control_list.rb

@@ -0,0 +1,46 @@
+module Fog
+  module Parsers
+    module Google
+      module Storage
+
+        class AccessControlList < Fog::Parsers::Base
+
+          def reset
+            @in_access_control_list = false
+            @grant = { 'Grantee' => {} }
+            @response = { 'Owner' => {}, 'AccessControlList' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if name == 'AccessControlList'
+              @in_access_control_list = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'AccessControlList'
+              @in_access_control_list = false
+            when 'Grant'
+              @response['AccessControlList'] << @grant
+              @grant = { 'Grantee' => {} }
+            when 'DisplayName', 'ID'
+              if @in_access_control_list
+                @grant['Grantee'][name] = @value
+              else
+                @response['Owner'][name] = @value
+              end
+            when 'Permission'
+              @grant[name] = @value
+            when 'URI'
+              @grant['Grantee'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end