fog 0.3.17 → 0.3.18

data/lib/fog/brightbox/requests/compute/update_server.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+
+        def update_server(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          request(
+            :expects  => [200],
+            :method   => 'PUT',
+            :path     => "/1.0/servers/#{identifier}",
+            :headers  => {"Content-Type" => "application/json"},
+            :body     => options.to_json
+          )
+        end
+
+      end
+
+      class Mock
+
+        def update_server(identifier, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/update_user.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+
+        def update_user(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          request(
+            :expects  => [200],
+            :method   => 'PUT',
+            :path     => "/1.0/users/#{identifier}",
+            :headers  => {"Content-Type" => "application/json"},
+            :body     => options.to_json
+          )
+        end
+
+      end
+
+      class Mock
+
+        def update_user(identifier, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/core/attributes.rb

@@ -51,7 +51,7 @@ module Fog
         when :time
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              if new_#{name}.nil? || new_#{name}.is_a?(Time)
+              if new_#{name}.nil? || new_#{name} == "" || new_#{name}.is_a?(Time)
                 @#{name} = new_#{name}
               else
                 @#{name} = Time.parse(new_#{name})
@@ -73,8 +73,8 @@ module Fog
             class_eval <<-EOS, __FILE__, __LINE__
               def #{name}=(new_data)
                 if new_data.is_a?(Hash)
-                  if new_data[:#{squash}]
-                    @#{name} = new_data[:#{squash}]
+                  if new_data[:#{squash}] || new_data["#{squash}"]
+                    @#{name} = new_data[:#{squash}] || new_data["#{squash}"]
                   else
                     @#{name} = [ new_data ]
                   end

data/lib/fog/core/bin.rb

@@ -7,6 +7,7 @@ module Fog
       [
         ::AWS,
         ::Bluebox,
+        ::Brightbox,
         ::GoGrid,
         ::Google,
         ::Linode,
@@ -68,6 +69,7 @@ end
 
 require 'fog/aws/bin'
 require 'fog/bluebox/bin'
+require 'fog/brightbox/bin'
 require 'fog/go_grid/bin'
 require 'fog/google/bin'
 require 'fog/linode/bin'

data/lib/fog/core/compute.rb

@@ -1,5 +1,5 @@
 module Fog
-  class Storage
+  class Compute
 
     def self.new(attributes)
       case provider = attributes.delete(:provider)
@@ -9,6 +9,9 @@ module Fog
       when 'Bluebox'
         require 'fog/bluebox'
         Fog::Bluebox::Compute.new(attributes)
+      when 'Brightbox'
+        require 'fog/brightbox'
+        Fog::Brightbox::Compute.new(attributes)
       when 'GoGrid'
         require 'fog/go_grid'
         Fog::GoGrid::Compute.new(attributes)
@@ -25,7 +28,7 @@ module Fog
         require 'fog/slicehost'
         Fog::Slicehost::Compute.new(attributes)
       else
-        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+        raise ArgumentError.new("#{provider} is not a recognized compute provider")
       end
     end
 

data/lib/fog/core/credentials.rb

@@ -34,6 +34,8 @@ module Fog
   :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

data/lib/fog/core/service.rb

@@ -40,18 +40,7 @@ module Fog
           options = default_credentials.merge(options)
         end
 
-        missing = []
-        for requirement in requirements
-          missing << requirement unless options[requirement]
-        end
-        unless missing.empty?
-          if missing.length == 1
-            raise(ArgumentError, [missing.first, "is required for this service"].join(' '))
-          else
-            raise(ArgumentError, [missing[0...-1].join(", "), 'and', missing[-1], 'are required for this service'].join(' '))
-          end
-        end
-
+        validate_arguments(options)
         setup_requirements
 
         if Fog.mocking?
@@ -129,10 +118,33 @@ module Fog
         @requirements ||= []
       end
 
+      def recognizes(*args)
+        recognized.concat(args)
+      end
+
+      def recognized
+        @recognized ||= []
+      end
+
       def reset_data(keys=Mock.data.keys)
         Mock.reset_data(keys)
       end
 
+      def validate_arguments(options)
+        missing = requirements - options.keys
+        unless missing.empty?
+          raise ArgumentError, "Missing required arguments: #{missing.join(', ')}"
+        end
+
+        # FIXME: avoid failing for the services that don't have recognizes yet
+        unless recognizes.empty?
+          unrecognized = options.keys - requirements - recognized
+          unless unrecognized.empty?
+            raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}"
+          end
+        end
+      end
+
     end
 
   end

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

@@ -5,17 +5,24 @@ module Fog
     class Storage
 
       class File < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:size, :content_length)
+        deprecate(:size=, :content_length=)
 
         identity  :key,             :aliases => 'Key'
 
         attr_writer :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'
+        attribute :cache_control,       :aliases => 'Cache-Control'
+        attribute :content_disposition, :aliases => 'Content-Disposition'
+        attribute :content_encoding,    :aliases => 'Content-Encoding'
+        attribute :content_length,      :aliases => ['Content-Length', 'Size'], :type => :integer
+        attribute :content_md5,         :aliases => 'Content-MD5'
+        attribute :content_type,        :aliases => 'Content-Type'
+        attribute :etag,                :aliases => ['Etag', 'ETag']
+        attribute :expires,             :aliases => 'Expires'
+        attribute :last_modified,       :aliases => ['Last-Modified', 'LastModified'], :type => :time
+        attribute :owner,               :aliases => 'Owner'
+        attribute :storage_class,       :aliases => ['x-goog-storage-class', 'StorageClass']
 
         def acl=(new_acl)
           valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
@@ -83,14 +90,16 @@ module Fog
           if options != {}
             Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
           end
-          if @acl
-            options['x-goog-acl'] ||= @acl
-          end
-          if content_type
-            options['Content-Type'] = content_type
-          end
+          options['x-goog-acl'] ||= @acl if @acl
+          options['Cache-Control'] = cache_control if cache_control
+          options['Content-Disposition'] = content_disposition if content_disposition
+          options['Content-Encoding'] = content_encoding if content_encoding
+          options['Content-MD5'] = content_md5 if content_md5
+          options['Content-Type'] = content_type if content_type
+          options['Expires'] = expires if expires
+
           data = connection.put_object(directory.key, @key, @body, options)
-          @etag = data.headers['ETag']
+          merge_attributes(data.headers)
           true
         end
 

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

@@ -41,15 +41,10 @@ module Fog
         def get(key, options = {}, &block)
           requires :directory
           data = connection.get_object(directory.key, key, options, &block)
-          file_data = {
+          file_data = data.headers.merge({
             :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
@@ -63,14 +58,9 @@ module Fog
         def head(key, options = {})
           requires :directory
           data = connection.head_object(directory.key, key, options)
-          file_data = {
+          file_data = data.headers.merge({
             :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

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

@@ -85,7 +85,6 @@ module Fog
                 'Contents'    => truncated_contents,
                 'IsTruncated' => truncated_contents.size != contents.size,
                 'Marker'      => options['marker'],
-                'MaxKeys'     => max_keys,
                 'Name'        => bucket['Name'],
                 'Prefix'      => options['prefix']
               }

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

@@ -49,15 +49,22 @@ module Fog
           response = Excon::Response.new
           if (bucket = @data[:buckets][bucket_name])
             response.status = 200
-            bucket[:objects][object_name] = {
+            object = {
               :body           => data[:body],
+              'Content-Type'  => data[:headers]['Content-Type'],
               'ETag'          => Fog::Google::Mock.etag,
               'Key'           => object_name,
               'LastModified'  => Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000"),
               'Size'          => data[:headers]['Content-Length'],
               'StorageClass'  => 'STANDARD'
             }
-            bucket[:objects][object_name]['Content-Type'] = data[:headers]['Content-Type']
+            bucket[:objects][object_name] = object
+            response.headers = {
+              'Content-Length'  => object['Size'],
+              'Content-Type'    => object['Content-Type'],
+              'ETag'            => object['ETag'],
+              'Last-Modified'   => object['LastModified']
+            }
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 200}, response))

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

@@ -9,10 +9,10 @@ module Fog
         identity  :key,             :aliases => 'name'
 
         attr_writer :body
-        attribute :content_length,  :aliases => ['bytes', 'Content-Length']
+        attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
         attribute :content_type,    :aliases => ['content_type', 'Content-Type']
         attribute :etag,            :aliases => ['hash', 'Etag']
-        attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified']
+        attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified'], :type => :time
 
         def body
           @body ||= if last_modified
@@ -51,7 +51,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           data = connection.put_object(directory.key, @key, @body, options)
-          @etag = data.headers['ETag']
+          merge_attributes(data.headers)
           true
         end
 

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

@@ -38,15 +38,10 @@ module Fog
         def get(key, &block)
           requires :directory
           data = connection.get_object(directory.key, key, &block)
-          file_data = {
+          file_data = data.headers.merge({
             :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 Fog::Rackspace::Storage::NotFound
           nil
@@ -60,12 +55,9 @@ module Fog
         def head(key, options = {})
           requires :directory
           data = connection.head_object(directory.name, 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
+          file_data = data.headers.merge({
+            :key => key
+          })
           new(file_data)
         rescue Fog::Rackspace::Storage::NotFound
           nil

data/spec/aws/models/compute/server_spec.rb

@@ -1,10 +1,7 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../shared_examples/server_examples'
 
 describe 'Fog::AWS::Compute::Server' do
 
-  it_should_behave_like "Server"
-
   subject { @server = @servers.new(:image_id => GENTOO_AMI) }
 
   before(:each) do

data/spec/aws/requests/simpledb/get_attributes_spec.rb

@@ -36,6 +36,17 @@ describe 'SimpleDB.get_attributes' do
       end
     end
 
+    context "foo item is put with bar attribute as an array" do
+      it "should return the array for foo's bar attribute" do
+        the_array = %w{A B C}
+        AWS[:sdb].put_attributes(@domain_name, 'foo', { :bar => the_array })
+        eventually do
+          actual = AWS[:sdb].get_attributes(@domain_name, 'foo')
+          actual.body['Attributes']['bar'].should =~ the_array
+        end
+      end
+    end
+
   end
   describe 'failure' do
 

data/spec/core/attributes_spec.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class FogAttributeTestModel < Fog::Model
+  attribute :key_id, :aliases => "key", :squash => "id"
+  attribute :time, :type => :time
+end
+
+describe 'Fog::Attributes' do
+
+  describe ".attribute" do
+    describe "squashing a value" do
+      it "should accept squashed key as symbol" do
+        data = {"key" => {:id => "value"}}
+        model = FogAttributeTestModel.new
+        model.merge_attributes(data)
+        model.key_id.should == "value"
+      end
+
+      it "should accept squashed key as string" do
+        data = {"key" => {"id" => "value"}}
+        model = FogAttributeTestModel.new
+        model.merge_attributes(data)
+        model.key_id.should == "value"
+      end
+    end
+
+    describe "when merging a time field" do
+      it "should accept nil as a suitable setting" do
+        data = {"time" => nil}
+        model = FogAttributeTestModel.new
+        model.merge_attributes(data)
+        model.time.should be_nil
+      end
+
+      it "should accept empty string as a suitable setting" do
+        data = {"time" => ""}
+        model = FogAttributeTestModel.new
+        model.merge_attributes(data)
+        model.time.should == ""
+      end
+
+      it "should parse strings to get a Datetime" do
+        test_time = Time.parse("2010-11-12T13:14:15")
+        data = {"time" => test_time.to_s}
+        model = FogAttributeTestModel.new
+        model.merge_attributes(data)
+        model.time.should == test_time
+      end
+    end
+  end
+
+end