fog 0.3.21 → 0.3.22

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    fog (0.3.21)
+    fog (0.3.22)
       builder
       excon (>= 0.2.4)
-      formatador (>= 0.0.15)
+      formatador (>= 0.0.16)
       json
       mime-types
       net-ssh (~> 2.0.23)
@@ -16,7 +16,7 @@ GEM
   specs:
     builder (2.1.2)
     excon (0.2.4)
-    formatador (0.0.15)
+    formatador (0.0.16)
     gestalt (0.0.11)
       formatador (>= 0.0.12)
     json (1.4.6)
@@ -26,8 +26,8 @@ GEM
     rake (0.8.7)
     rspec (1.3.1)
     ruby-hmac (0.4.0)
-    shindo (0.1.9)
-      formatador (>= 0.0.14)
+    shindo (0.1.10)
+      formatador (>= 0.0.16)
       gestalt (>= 0.0.11)
 
 PLATFORMS
@@ -37,7 +37,7 @@ DEPENDENCIES
   builder
   excon (>= 0.2.4)
   fog!
-  formatador (>= 0.0.15)
+  formatador (>= 0.0.16)
   json
   mime-types
   net-ssh (~> 2.0.23)
@@ -45,4 +45,4 @@ DEPENDENCIES
   rake
   rspec (= 1.3.1)
   ruby-hmac
-  shindo (= 0.1.9)
+  shindo (= 0.1.10)

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.21'
-  s.date              = '2010-11-17'
+  s.version           = '0.3.22'
+  s.date              = '2010-11-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
   s.add_dependency('excon', '>=0.2.4')
-  s.add_dependency('formatador', '>=0.0.15')
+  s.add_dependency('formatador', '>=0.0.16')
   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.1.9')
+  s.add_development_dependency('shindo', '0.1.10')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

data/lib/fog.rb

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

data/lib/fog/aws/models/compute/server.rb

@@ -10,7 +10,7 @@ module Fog
 
         attr_accessor :architecture
         attribute :ami_launch_index,      :aliases => 'amiLaunchIndex'
-        attribute :availability_zone,     :aliases => 'availabilityZone'
+        attribute :availability_zone,     :aliases => ['availabilityZone', 'placement']
         attribute :block_device_mapping,  :aliases => 'blockDeviceMapping'
         attribute :client_token,          :aliases => 'clientToken'
         attribute :dns_name,              :aliases => 'dnsName'
@@ -51,6 +51,15 @@ module Fog
           connection.addresses(:server => self)
         end
 
+        remove_method :availability_zone=
+        def availability_zone=(new_availability_zone)
+          if new_availability_zone.is_a?(Hash)
+            @availability_zone = new_availability_zone['availabilityZone']
+          else
+            @availability_zone = new_availability_zone
+          end
+        end
+
         def console_output
           requires :id
 
@@ -96,14 +105,6 @@ module Fog
           end
         end
 
-        def placement=(new_placement)
-          if new_placement.is_a?(Hash)
-            @availability_zone = new_placement['availabilityZone']
-          else
-            @availability_zone = new_placement
-          end
-        end
-
         def private_key_path
           @private_key_path ||= Fog.credentials[:private_key_path]
           @private_key_path &&= File.expand_path(@private_key_path)

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

@@ -67,11 +67,18 @@ module Fog
           end
         end
 
+        def public=(new_public)
+          if new_public
+            @acl = 'public-read'
+          else
+            @acl = 'private'
+          end
+          new_public
+        end
+
         def public_url
           requires :directory, :key
-          if directory.public_url
-            "#{directory.public_url}/#{key}"
-          elsif connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
+          if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
             if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{directory.key}.s3.amazonaws.com/#{key}"
             else

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

@@ -49,7 +49,15 @@ module Fog
       class Mock # :nodoc:all
 
         def get_bucket_acl(bucket_name)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if acl = @data[:acls][:bucket][bucket_name]
+            response.status = 200
+            response.body = acl
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
         end
 
       end

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

@@ -60,7 +60,15 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object_acl(bucket_name, object_name)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if acl = @data[:acls][:object][bucket_name] && @data[:acls][:object][bucket_name][object_name]
+            response.status = 200
+            response.body = acl
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
         end
 
       end

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

@@ -44,6 +44,13 @@ DATA
       class Mock # :nodoc:all
 
         def put_bucket(bucket_name, options = {})
+          if options['x-amz-acl']
+            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
+              raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
+            else
+              @data[:acls][:bucket][bucket_name] = self.class.acls(options['x-amz-acl'])
+            end
+          end
           response = Excon::Response.new
           response.status = 200
           bucket = {

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

@@ -47,6 +47,14 @@ module Fog
       class Mock # :nodoc:all
 
         def put_object(bucket_name, object_name, data, options = {})
+          if options['x-amz-acl']
+            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
+              raise Excon::Errors::BadRequest.new('invalid x-amz-acl')
+            else
+              @data[:acls][:object][bucket_name] ||= {}
+              @data[:acls][:object][bucket_name][object_name] = self.class.acls(options['x-amz-acl'])
+            end
+          end
           data = parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read

data/lib/fog/aws/storage.rb

@@ -87,10 +87,56 @@ module Fog
       class Mock
         include Utils
 
+        def self.acls(type)
+          case type
+          when 'private'
+            @private ||= {
+              "AccessControlList" => [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Grantee" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+                }
+              ],
+              "Owner" => {"DisplayName" => "me", "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
+          when 'public-read'
+            @public_read ||= begin
+              public_read = self.acls('private').dup
+              public_read['AccessControlList'] << {
+                "Permission" => "READ",
+                "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
+              }
+              public_read
+            end
+          when 'public-read-write'
+            @public_read_write ||= begin
+              public_read_write = self.acls('public-read').dup
+              public_read_write['AccessControlList'] << {
+                "Permission" => "WRITE",
+                "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AllUsers"}
+              }
+              public_read_write
+            end
+          when 'authenticated-read'
+            @authenticated_read ||= begin
+              authenticated_read = self.acls('private').dup
+              authenticated_read['AccessControlList'] << {
+                "Permission" => "READ",
+                "Grantee" => {"URI" => "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"}
+              }
+              authenticated_read
+            end
+          end
+        end
+
         def self.data
           @data ||= Hash.new do |hash, region|
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
+                :acls => {
+                  :bucket => {},
+                  :object => {}
+                },
                 :buckets => {}
               }
             end

data/lib/fog/core/attributes.rb

@@ -142,7 +142,7 @@ module Fog
               attributes[aliased_key] = value
               send("#{aliased_key}=", value)
             elsif (public_methods | private_methods).detect {|method| ["#{key}=", :"#{key}="].include?(method)}
-              attributes[key] = value
+              attributes[key.to_sym] = value
               send("#{key}=", value)
             else
               attributes[key] = value

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

@@ -70,13 +70,20 @@ module Fog
           end
         end
 
+        def public=(new_public)
+          if new_public
+            @acl = 'public-read'
+          else
+            @acl = 'private'
+          end
+          new_public
+        end
+
         def public_url
           requires :directory, :key
-          if directory.public_url
-            "#{directory.public_url}/#{key}"
-          elsif connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+          if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
             if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-              "https://#{directory.key}.commondatastorage.googleapis/#{key}"
+              "https://#{directory.key}.commondatastorage.googleapis.com/#{key}"
             else
               "https://commondatastorage.googleapis.com/#{directory.key}/#{key}"
             end

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

@@ -46,7 +46,15 @@ module Fog
       class Mock
 
         def get_bucket_acl(bucket_name)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if acl = @data[:acls][:bucket][bucket_name]
+            response.status = 200
+            response.body = acl
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
         end
 
       end

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

@@ -57,7 +57,15 @@ module Fog
       class Mock
 
         def get_object_acl(bucket_name, object_name)
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+          if acl = @data[:acls][:object][bucket_name] && @data[:acls][:object][bucket_name][object_name]
+            response.status = 200
+            response.body = acl
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
         end
 
       end

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

@@ -40,6 +40,13 @@ DATA
       class Mock
 
         def put_bucket(bucket_name, options = {})
+          if options['x-goog-acl']
+            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
+              raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
+            else
+              @data[:acls][:bucket][bucket_name] = self.class.acls(options['x-goog-acl'])
+            end
+          end
           response = Excon::Response.new
           response.status = 200
           bucket = {

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

@@ -12,13 +12,14 @@ module Fog
         #     * ID<~String>: id of owner
         #     * DisplayName<~String>: display name of owner
         #   * AccessControlList<~Array>:
-        #     * Grantee<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of grantee
+        #     * scope<~Hash>:
+        #         * 'type'<~String> - 'UserById'
         #         * 'ID'<~String> - Id of grantee
         #       or
+        #         * 'type'<~String> - 'UserByEmail'
         #         * 'EmailAddress'<~String> - Email address of grantee
         #       or
-        #         * 'URI'<~String> - URI of group to grant access for
+        #         * 'type'<~String> - type of user to grant permission to
         #     * Permission<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
         def put_bucket_acl(bucket_name, acl)
           data =

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

@@ -42,6 +42,14 @@ module Fog
       class Mock
 
         def put_object(bucket_name, object_name, data, options = {})
+          if options['x-goog-acl']
+            unless ['private', 'public-read', 'public-read-write', 'authenticated-read']
+              raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
+            else
+              @data[:acls][:object][bucket_name] ||= {}
+              @data[:acls][:object][bucket_name][object_name] = self.class.acls(options['x-goog-acl'])
+            end
+          end
           data = parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read

data/lib/fog/google/storage.rb

@@ -64,9 +64,55 @@ module Fog
       class Mock
         include Utils
 
+        def self.acls(type)
+          case type
+          when 'private'
+            @private ||= {
+              "AccessControlList"=> [
+                {
+                  "Permission" => "FULL_CONTROL",
+                  "Scope" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0", "type" => "UserById"}
+                }
+              ],
+              "Owner" => {"ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"}
+            }
+          when 'public-read'
+            @public_read ||= begin
+              public_read = self.acls('private').dup
+              public_read['AccessControlList'] << {
+                "Permission" => "READ",
+                "Scope" => {"type" => "AllUsers"}
+              }
+              public_read
+            end
+          when 'public-read-write'
+            @public_read_write ||= begin
+              public_read_write = self.acls('private').dup
+              public_read_write['AccessControlList'] << {
+                "Permission" => "WRITE",
+                "Scope" => {"type" => "AllUsers"}
+              }
+              public_read_write
+            end
+          when 'authenticated-read'
+            @authenticated_read ||= begin
+              authenticated_read = self.acls('private').dup
+              authenticated_read['AccessControlList'] << {
+                "Permission" => "READ",
+                "Scope" => {"type" => "AllAuthenticatedUsers"}
+              }
+              authenticated_read
+            end
+          end
+        end
+
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {
+              :acls => {
+                :bucket => {},
+                :object => {}
+              },
               :buckets => {}
             }
           end

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

@@ -31,6 +31,10 @@ module Fog
           true
         end
 
+        def public=(new_public)
+          new_public
+        end
+
         def public_url
           nil
         end

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

@@ -41,6 +41,10 @@ module Fog
           end
         end
 
+        def public=(new_public)
+          new_public
+        end
+
         def public_url
           requires :directory, :key
           if @directory.public_url

data/tests/helpers/storage/file_tests.rb

@@ -1,14 +1,22 @@
 def file_tests(connection, params = {}, mocks_implemented = true)
 
-  params = {:key => 'fog_file_tests', :body => lorem_file}.merge!(params)
+  params = {:key => 'fog_file_tests', :body => lorem_file, :public => true}.merge!(params)
 
   if !Fog.mocking? || mocks_implemented
     @directory = connection.directories.create(:key => 'fogfilestests')
 
     model_tests(@directory.files, params, mocks_implemented) do
 
-      tests("#respond_to?(:public_url)").succeeds do
-        @instance.respond_to?(:public_url)
+      responds_to(:public_url)
+
+      tests("#public=(true)").succeeds do
+        pending if Fog.mocking? && !mocks_implemented
+        @instance.public=(true)
+      end
+
+      test("@instance.public_url.nil? || Excon.get(@instance.public_url).body == lorem_file.read") do
+        pending if Fog.mocking?
+        @instance.public_url.nil? || Excon.get(@instance.public_url).body == lorem_file.read
       end
 
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 21
-  version: 0.3.21
+  - 22
+  version: 0.3.22
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-11-18 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,8 +53,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 15
-        version: 0.0.15
+        - 16
+        version: 0.0.16
   requirement: *id003
   name: formatador
 - !ruby/object:Gem::Dependency 
@@ -158,8 +158,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 9
-        version: 0.1.9
+        - 10
+        version: 0.1.10
   requirement: *id011
   name: shindo
 description: The Ruby cloud computing library.