fog 0.3.23 → 0.3.24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.23)
+    fog (0.3.24)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.16)

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.3.23'
-  s.date              = '2010-11-19'
+  s.version           = '0.3.24'
+  s.date              = '2010-11-22'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -274,6 +274,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/storage/put_bucket_logging.rb
     lib/fog/aws/requests/storage/put_bucket_versioning.rb
     lib/fog/aws/requests/storage/put_object.rb
+    lib/fog/aws/requests/storage/put_object_acl.rb
     lib/fog/aws/requests/storage/put_object_url.rb
     lib/fog/aws/requests/storage/put_request_payment.rb
     lib/fog/aws/requests/storage/upload_part.rb

data/lib/fog.rb

@@ -18,7 +18,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.23'
+    VERSION = '0.3.24'
   end
 
   module Mock

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

@@ -0,0 +1,93 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+
+        # Change access control list for an S3 object
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to modify
+        # * object_name<~String> - name of object to get access control list for
+        # * acl<~Hash>:
+        #   * Owner<~Hash>:
+        #     * ID<~String>: id of owner
+        #     * DisplayName<~String>: display name of owner
+        #   * AccessControlList<~Array>:
+        #     * Grantee<~Hash>:
+        #         * 'DisplayName'<~String> - Display name of grantee
+        #         * 'ID'<~String> - Id of grantee
+        #       or
+        #         * 'EmailAddress'<~String> - Email address of grantee
+        #       or
+        #         * 'URI'<~String> - URI of group to grant access for
+        #     * Permission<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        # * options<~Hash>:
+        #   * 'versionId'<~String> - specify a particular version to retrieve
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html
+
+        def put_object_acl(bucket_name, object_name, acl, options = {})
+          query = {'acl' => nil}
+          if version_id = options.delete('versionId')
+            query['versionId'] = version_id
+          end
+
+          data =
+<<-DATA
+<AccessControlPolicy>
+  <Owner>
+    <ID>#{acl['Owner']['ID']}</ID>
+    <DisplayName>#{acl['Owner']['DisplayName']}</DisplayName>
+  </Owner>
+  <AccessControlList>
+DATA
+
+          acl['AccessControlList'].each do |grant|
+            data << "    <Grant>"
+            type = case grant['Grantee'].keys.sort
+            when ['DisplayName', 'ID']
+              'CanonicalUser'
+            when ['EmailAddress']
+              'AmazonCustomerByEmail'
+            when ['URI']
+              'Group'
+            end
+            data << "      <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"#{type}\">"
+            for key, value in grant['Grantee']
+              data << "        <#{key}>#{value}</#{key}>"
+            end
+            data << "      </Grantee>"
+            data << "      <Permission>#{grant['Permission']}</Permission>"
+            data << "    </Grant>"
+          end
+
+          data <<
+<<-DATA
+  </AccessControlList>
+</AccessControlPolicy>
+DATA
+
+          request({
+            :body     => data,
+            :expects  => 200,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :path       => CGI.escape(object_name),
+            :query    => query
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def put_object_acl(bucket_name, object_name, options, acl)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/storage.rb

@@ -38,6 +38,7 @@ module Fog
       request :put_bucket_logging
       request :put_bucket_versioning
       request :put_object
+      request :put_object_acl
       request :put_object_url
       request :put_request_payment
       request :upload_part

data/lib/fog/core/credentials.rb

@@ -30,24 +30,26 @@ module Fog
           yml = <<-YML
 
 :#{credential}:
-  :aws_access_key_id:     INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :bluebox_api_key:       INTENTIONALLY_LEFT_BLANK
-  :bluebox_customer_id:   INTENTIONALLY_LEFT_BLANK
-  :brightbox_client_id:   INTENTIONALLY_LEFT_BLANK
-  :brightbox_secret:      INTENTIONALLY_LEFT_BLANK
-  :go_grid_api_key:       INTENTIONALLY_LEFT_BLANK
-  :go_grid_shared_secret: INTENTIONALLY_LEFT_BLANK
-  :local_root:            INTENTIONALLY_LEFT_BLANK
-  :new_servers_password:  INTENTIONALLY_LEFT_BLANK
-  :new_servers_username:  INTENTIONALLY_LEFT_BLANK
-  :public_key_path:       INTENTIONALLY_LEFT_BLANK
-  :private_key_path:      INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
-  :rackspace_username:    INTENTIONALLY_LEFT_BLANK
-  :slicehost_password:    INTENTIONALLY_LEFT_BLANK
-  :terremark_username:    INTENTIONALLY_LEFT_BLANK
-  :terremark_password:    INTENTIONALLY_LEFT_BLANK
+  :aws_access_key_id:                INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key:            INTENTIONALLY_LEFT_BLANK
+  :bluebox_api_key:                  INTENTIONALLY_LEFT_BLANK
+  :bluebox_customer_id:              INTENTIONALLY_LEFT_BLANK
+  :brightbox_client_id:              INTENTIONALLY_LEFT_BLANK
+  :brightbox_secret:                 INTENTIONALLY_LEFT_BLANK
+  :go_grid_api_key:                  INTENTIONALLY_LEFT_BLANK
+  :go_grid_shared_secret:            INTENTIONALLY_LEFT_BLANK
+  :google_storage_access_key_id:     INTENTIONALLY_LEFT_BLANK
+  :google_storage_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :local_root:                       INTENTIONALLY_LEFT_BLANK
+  :new_servers_password:             INTENTIONALLY_LEFT_BLANK
+  :new_servers_username:             INTENTIONALLY_LEFT_BLANK
+  :public_key_path:                  INTENTIONALLY_LEFT_BLANK
+  :private_key_path:                 INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key:                INTENTIONALLY_LEFT_BLANK
+  :rackspace_username:               INTENTIONALLY_LEFT_BLANK
+  :slicehost_password:               INTENTIONALLY_LEFT_BLANK
+  :terremark_username:               INTENTIONALLY_LEFT_BLANK
+  :terremark_password:               INTENTIONALLY_LEFT_BLANK
 YML
           print(yml)
           raise(ArgumentError.new("Missing Credentials"))

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

@@ -45,7 +45,11 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           file = ::File.new(path, 'w')
-          file.write(body)
+          if body.is_a?(String)
+            file.write(body)
+          else
+            file.write(body.read)
+          end
           file.close
           merge_attributes(
             :content_length => ::File.size(path),

data/tests/helper.rb

@@ -1,12 +1,16 @@
+__DIR__ = File.dirname(__FILE__)
+__LIB_DIR__ = File.join(__DIR__, '../lib')
+
+[ __DIR__, __LIB_DIR__ ].each do |directory|
+  $LOAD_PATH.unshift directory unless
+    $LOAD_PATH.include?(directory) ||
+    $LOAD_PATH.include?(File.expand_path(directory))
+end
+
 require 'fog'
 require 'fog/core/bin'
-Fog.bin = true
-
-__DIR__ = File.dirname(__FILE__)
 
-$LOAD_PATH.unshift __DIR__ unless
-  $LOAD_PATH.include?(__DIR__) ||
-  $LOAD_PATH.include?(File.expand_path(__DIR__))
+Fog.bin = true
 
 require 'tests/helpers/collection_tests'
 require 'tests/helpers/model_tests'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 23
-  version: 0.3.23
+  - 24
+  version: 0.3.24
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -08:00
+date: 2010-11-22 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -383,6 +383,7 @@ files:
 - lib/fog/aws/requests/storage/put_bucket_logging.rb
 - lib/fog/aws/requests/storage/put_bucket_versioning.rb
 - lib/fog/aws/requests/storage/put_object.rb
+- lib/fog/aws/requests/storage/put_object_acl.rb
 - lib/fog/aws/requests/storage/put_object_url.rb
 - lib/fog/aws/requests/storage/put_request_payment.rb
 - lib/fog/aws/requests/storage/upload_part.rb