fog 0.0.25 → 0.0.26

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2009-10-23}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}

data/lib/fog/aws/models/ec2/address.rb

@@ -34,8 +34,9 @@ module Fog
         end
 
         def reload
-          new_attributes = addresses.get(@public_ip).attributes
-          merge_attributes(new_attributes)
+          if new_address = addresses.get(@public_ip)
+            merge_attributes(new_address.attributes)
+          end
         end
 
         def save

data/lib/fog/aws/models/ec2/addresses.rb

@@ -43,7 +43,9 @@ module Fog
         end
 
         def get(public_ip)
-          all(public_ip).first
+          if public_ip
+            all(public_ip).first
+          end
         rescue Fog::Errors::BadRequest
           nil
         end

data/lib/fog/aws/models/ec2/instance.rb

@@ -68,8 +68,9 @@ module Fog
         end
 
         def reload
-          new_attributes = instances.all(@instance_id).first.attributes
-          merge_attributes(new_attributes)
+          if new_instance = instances.get(@instance_id)
+            merge_attributes(new_instance.attributes)
+          end
         end
 
         def save
@@ -110,7 +111,11 @@ module Fog
         private
 
         def instance_state=(new_instance_state)
-          @instance_state = new_instance_state['name']
+          if new_instance_state.is_a?(Hash)
+            @instance_state = new_instance_state['name']
+          else
+            @instance_state = new_instance_state
+          end
         end
 
         def instances=(new_instances)

data/lib/fog/aws/models/ec2/instances.rb

@@ -39,7 +39,9 @@ module Fog
         end
 
         def get(instance_id)
-          all(instance_id).first
+          if instance_id
+            all(instance_id).first
+          end
         rescue Fog::Errors::BadRequest
           nil
         end

data/lib/fog/aws/models/ec2/key_pair.rb

@@ -18,8 +18,9 @@ module Fog
         end
 
         def reload
-          new_attributes = key_pairs.all(@name).first.attributes
-          merge_attributes(new_attributes)
+          if new_key_pair = key_pairs.get(@name)
+            merge_attributes(new_key_pair.attributes)
+          end
         end
 
         def save

data/lib/fog/aws/models/ec2/key_pairs.rb

@@ -37,7 +37,9 @@ module Fog
         end
 
         def get(key_name)
-          all(key_name).first
+          if key_name
+            all(key_name).first
+          end
         rescue Fog::Errors::BadRequest
           nil
         end

data/lib/fog/aws/models/ec2/security_group.rb

@@ -15,8 +15,9 @@ module Fog
         end
 
         def reload
-          new_attributes = security_groups.get(@group_name).attributes
-          merge_attributes(new_attributes)
+          if new_security_group = security_groups.get(@group_name)
+            merge_attributes(new_security_group.attributes)
+          end
         end
 
         def save

data/lib/fog/aws/models/ec2/security_groups.rb

@@ -37,7 +37,9 @@ module Fog
         end
 
         def get(group_name)
-          all(group_name).first
+          if group_name
+            all(group_name).first
+          end
         rescue Fog::Errors::BadRequest
           nil
         end

data/lib/fog/aws/models/ec2/snapshot.rb

@@ -16,8 +16,9 @@ module Fog
         end
 
         def reload
-          new_attributes = snapshots.get(@snapshot_id).attributes
-          merge_attributes(new_attributes)
+          if new_snapshot = snapshots.get(@snapshot_id)
+            merge_attributes(new_snapshot.attributes)
+          end
         end
 
         def save

data/lib/fog/aws/models/ec2/snapshots.rb

@@ -43,7 +43,9 @@ module Fog
         end
 
         def get(snapshot_id)
-          all(snapshot_id).first
+          if snapshot_id
+            all(snapshot_id).first
+          end
         rescue Fog::Errors::BadRequest
           nil
         end

data/lib/fog/aws/models/ec2/volume.rb

@@ -29,6 +29,9 @@ module Fog
         def instance=(new_instance)
           if !@volume_id
             @instance = new_instance
+            if new_instance
+              @availability_zone = new_instance.availability_zone
+            end
           elsif new_instance
             @instance = nil
             @instance_id = new_instance.instance_id
@@ -37,8 +40,9 @@ module Fog
         end
 
         def reload
-          new_attributes = volumes.get(@volume_id).attributes
-          merge_attributes(new_attributes)
+          if new_volume = volumes.get(@volume_id)
+            merge_attributes(new_volume.attributes)
+          end
         end
 
         def save

data/lib/fog/aws/models/ec2/volumes.rb

@@ -43,7 +43,9 @@ module Fog
         end
 
         def get(volume_id)
-          all(volume_id).first
+          if volume_id
+            all(volume_id).first
+          end
         rescue Fog::Errors::BadRequest
           nil
         end

data/lib/fog/aws/models/s3/bucket.rb

@@ -4,14 +4,11 @@ module Fog
 
       class Bucket < Fog::Model
 
+        identity  :name,          'Name'
+
         attribute :creation_date, 'CreationDate'
-        attribute :name,          'Name'
         attribute :owner
 
-        def buckets
-          @buckets
-        end
-
         def destroy
           connection.delete_bucket(@name)
           true
@@ -24,6 +21,10 @@ module Fog
           data.body['LocationConstraint']
         end
 
+        def location=(new_location)
+          @location = new_location
+        end
+
         def objects
           @objects ||= begin
             Fog::AWS::S3::Objects.new(
@@ -43,11 +44,6 @@ module Fog
           @payer = new_payer
         end
 
-        def reload
-          new_attributes = buckets.get(@name).attributes
-          merge_attributes(new_attributes)
-        end
-
         def save
           options = {}
           if @location
@@ -57,12 +53,6 @@ module Fog
           true
         end
 
-        private
-
-        def buckets=(new_buckets)
-          @buckets = new_buckets
-        end
-
       end
 
     end

data/lib/fog/aws/models/s3/buckets.rb

@@ -14,7 +14,7 @@ module Fog
           buckets = Fog::AWS::S3::Buckets.new(:connection => connection)
           data['Buckets'].each do |bucket|
             buckets << Fog::AWS::S3::Bucket.new({
-              :buckets    => buckets,
+              :collection => buckets,
               :connection => connection,
               :owner      => owner
             }.merge!(bucket))
@@ -34,7 +34,7 @@ module Fog
           })
           data = connection.get_bucket(name, options).body
           bucket = Fog::AWS::S3::Bucket.new({
-            :buckets    => self,
+            :collection => self,
             :connection => connection,
             :name       => data['Name']
           })
@@ -50,7 +50,7 @@ module Fog
             bucket.objects << Fog::AWS::S3::Object.new({
               :bucket     => bucket,
               :connection => connection,
-              :objects    => self,
+              :collection => bucket.objects,
               :owner      => owner
             }.merge!(object))
           end
@@ -62,8 +62,8 @@ module Fog
         def new(attributes = {})
           Fog::AWS::S3::Bucket.new(
             attributes.merge!(
-              :connection => connection,
-              :buckets    => self
+              :collection => self,
+              :connection => connection
             )
           )
         end

data/lib/fog/aws/models/s3/object.rb

@@ -4,11 +4,12 @@ module Fog
 
       class Object < Fog::Model
 
+        identity  :key,             'Key'
+
         attribute :body
         attribute :content_length,  'Content-Length'
         attribute :content_type,    'Content-Type'
         attribute :etag,            ['Etag', 'ETag']
-        attribute :key,             'Key'
         attribute :last_modified,   ['Last-Modified', 'LastModified']
         attribute :owner
         attribute :size,            'Size'
@@ -37,15 +38,6 @@ module Fog
           true
         end
 
-        def objects
-          @objects
-        end
-
-        def reload
-          new_attributes = objects.get(@key).attributes
-          merge_attributes(new_attributes)
-        end
-
         def save(options = {})
           data = connection.put_object(bucket.name, @key, @body, options)
           @etag = data.headers['ETag']
@@ -58,10 +50,6 @@ module Fog
           @bucket = new_bucket
         end
 
-        def objects=(new_objects)
-          @objects = new_objects
-        end
-
       end
 
     end

data/lib/fog/aws/models/s3/objects.rb

@@ -11,7 +11,7 @@ module Fog
         attribute :prefix,        'Prefix'
 
         def all(options = {})
-          bucket.buckets.get(
+          bucket.collection.get(
             bucket.name,
             options.reject {|key, value| !['delimiter', 'marker', 'max-keys', 'prefix'].include?(key)}
           ).objects
@@ -40,8 +40,8 @@ module Fog
           end
           object = Fog::AWS::S3::Object.new({
             :bucket     => bucket,
-            :connection => connection,
-            :objects    => self
+            :collection => self,
+            :connection => connection
           }.merge!(object_data))
           object
         rescue Fog::Errors::NotFound
@@ -64,8 +64,8 @@ module Fog
           end
           object = Fog::AWS::S3::Object.new({
             :bucket     => bucket,
-            :connection => connection,
-            :objects    => self
+            :collection => self,
+            :connection => connection
           }.merge!(object_data))
           object
         rescue Fog::Errors::NotFound
@@ -75,8 +75,8 @@ module Fog
         def new(attributes = {})
           Fog::AWS::S3::Object.new({
             :bucket     => bucket,
-            :connection => connection,
-            :objects    => self
+            :collection => self,
+            :connection => connection
           }.merge!(attributes))
         end
 

data/lib/fog/aws/requests/ec2/attach_volume.rb

@@ -41,25 +41,39 @@ else
 
         def attach_volume(instance_id, volume_id, device)
           response = Fog::Response.new
-          response.status = 200
-          instance = Fog::AWS::EC2.data[:instances][instance_id]
-          volume = Fog::AWS::EC2.data[:volumes][volume_id]
-          if instance && volume
-            data = {
-              'attachTime'  => Time.now,
-              'device'      => device,
-              'instanceId'  => instance_id,
-              'status'      => 'attaching',
-              'volumeId'    => volume_id
-            }
-            volume['attachmentSet'] << data
+          if instance_id && volume_id && device
             response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id
-            }.merge!(data)
+            instance = Fog::AWS::EC2.data[:instances][instance_id]
+            volume = Fog::AWS::EC2.data[:volumes][volume_id]
+            if instance && volume
+              data = {
+                'attachTime'  => Time.now,
+                'device'      => device,
+                'instanceId'  => instance_id,
+                'status'      => 'attaching',
+                'volumeId'    => volume_id
+              }
+              volume['attachmentSet'] << data
+              response.status = 200
+              response.body = {
+                'requestId' => Fog::AWS::Mock.request_id
+              }.merge!(data)
+            else
+              response.status = 400
+              raise(Fog::Errors.status_error(200, 400, response))
+            end
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            response.body = {
+              'Code' => 'MissingParameter'
+            }
+            if !instance_id
+              response['Message'] = 'The request must contain the parameter instance_id'
+            elsif !volume_id
+              response['Message'] = 'The request must contain the parameter volume_id'
+            else
+              response['Message'] = 'The request must contain the parameter device'
+            end
           end
           response
         end

data/lib/fog/aws/requests/ec2/create_volume.rb

@@ -41,21 +41,33 @@ else
 
         def create_volume(availability_zone, size, snapshot_id = nil)
           response = Fog::Response.new
-          response.status = 200
-          volume_id = Fog::AWS::Mock.volume_id
-          data = {
-            'availabilityZone'  => availability_zone,
-            'attachmentSet'     => [],
-            'createTime'        => Time.now,
-            'size'              => size,
-            'snapshotId'        => snapshot_id || '',
-            'status'            => 'creating',
-            'volumeId'          => volume_id
-          }
-          Fog::AWS::EC2.data[:volumes][volume_id] = data
-          response.body = {
-            'requestId' => Fog::AWS::Mock.request_id
-          }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId'].include?(key) })
+          if availability_zone && size
+            response.status = 200
+            volume_id = Fog::AWS::Mock.volume_id
+            data = {
+              'availabilityZone'  => availability_zone,
+              'attachmentSet'     => [],
+              'createTime'        => Time.now,
+              'size'              => size,
+              'snapshotId'        => snapshot_id || '',
+              'status'            => 'creating',
+              'volumeId'          => volume_id
+            }
+            Fog::AWS::EC2.data[:volumes][volume_id] = data
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id
+            }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId'].include?(key) })
+          else
+            response.status = 400
+            response.body = {
+              'Code' => 'MissingParameter'
+            }
+            unless availability_zone
+              response['Message'] = 'The request must contain the parameter availability_zone'
+            else
+              response['Message'] = 'The request must contain the parameter size'
+            end
+          end
           response
         end
 

data/lib/fog/connection.rb

@@ -79,7 +79,7 @@ unless Fog.mocking?
           response.headers[capitalize(header[0])] = header[1]
         end
 
-        unless params[:method] == 'HEAD'
+        unless params[:method] == 'HEAD' || [204, 304, *(100..199)].include?(response.status)
           if (error && params[:error_parser]) || params[:parser]
             if error
               parser = params[:error_parser]
@@ -105,18 +105,22 @@ unless Fog.mocking?
             end
           elsif response.headers['Transfer-Encoding'] == 'chunked'
             while true
+              chunk_size = connection.readline.chomp!.to_i(16)
               # 2 == "/r/n".length
-              chunk_size = connection.readline.chomp!.to_i(16) + 2
-              chunk = connection.read(chunk_size)[0...-2]
-              if error || !params[:block]
-                body << chunk
-              else
-                params[:block].call(chunk)
-              end
-              if chunk_size == 2
+              chunk = connection.read(chunk_size + 2)[0...-2]
+              if chunk_size == 0
                 break
+              else
+                if error || !params[:block]
+                  body << chunk
+                else
+                  params[:block].call(chunk)
+                end
               end
             end
+          elsif response.headers['Connection'] == 'close'
+            body << connection.read
+            @connection = nil
           end
 
           if parser

data/lib/fog/model.rb

@@ -11,6 +11,11 @@ module Fog
       end
     end
 
+    def self.identity(name, other_names = [])
+      @identity = name
+      self.attribute(name, other_names)
+    end
+
     def self.aliases
       @aliases ||= {}
     end
@@ -19,6 +24,10 @@ module Fog
       @attributes ||= []
     end
 
+    def identity
+      send(self.class.instance_variable_get('@identity'))
+    end
+
     def initialize(new_attributes = {})
       merge_attributes(new_attributes)
     end
@@ -39,6 +48,10 @@ module Fog
       attributes
     end
 
+    def collection
+      @collection
+    end
+
     def merge_attributes(new_attributes = {})
       for key, value in new_attributes
         if aliased_key = self.class.aliases[key]
@@ -50,8 +63,17 @@ module Fog
       self
     end
 
+    def reload
+      new_attributes = collection.get(identity).attributes
+      merge_attributes(new_attributes)
+    end
+
     private
 
+    def collection=(new_collection)
+      @collection = new_collection
+    end
+
     def connection=(new_connection)
       @connection = new_connection
     end

data/spec/aws/models/ec2/volume_spec.rb

@@ -39,7 +39,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#destroy" do
 
     it "should return true if the volume is deleted" do
-      volume = ec2.volumes.create
+      volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       volume.destroy.should be_true
     end
 
@@ -47,39 +47,56 @@ describe 'Fog::AWS::EC2::Volume' do
 
   describe "#instance=" do
     before(:each) do
-      @volume = ec2.volumes.new
       @instance = ec2.instances.create(:image_id => GENTOO_AMI)
+      @volume = ec2.volumes.new(:availability_zone => @instance.availability_zone, :size => 1, :device => 'dev/sdz1')
+      while @instance.instance_state == 'pending'
+        @instance.reload
+      end
+      while @volume.status == 'creating'
+        @volume.reload
+      end
     end
 
     after(:each) do
+      @instance.destroy
       if @volume.volume_id
         @volume.destroy
       end
-      @instance.destroy
     end
 
-    it "should not attach to instance if the address has not been saved" do
+    it "should not attach to instance if the volume has not been saved" do
       @volume.instance = @instance
       @volume.instance_id.should_not == @instance.instance_id
     end
 
-    it "should attach to instance when the address is saved" do
+    it "should change the availability_zone if the volume has not been saved" do
+      @volume.instance = @instance
+      @volume.availability_zone.should == @instance.availability_zone
+    end
+
+    it "should attach to instance when the volume is saved" do
       @volume.instance = @instance
       @volume.save.should be_true
       @volume.instance_id.should == @instance.instance_id
     end
 
-    it "should attach to instance to an already saved address" do
+    it "should attach to instance to an already saved volume" do
       @volume.save.should be_true
       @volume.instance = @instance
       @volume.instance_id.should == @instance.instance_id
     end
+
+    it "should not change the availability_zone if the volume has been saved" do
+      @volume.save.should be_true
+      @volume.instance = @instance
+      @volume.availability_zone.should == @instance.availability_zone
+    end
   end
 
   describe "#reload" do
 
     before(:each) do
-      @volume = ec2.volumes.create
+      @volume = ec2.volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @reloaded = @volume.reload
     end
 
@@ -100,7 +117,7 @@ describe 'Fog::AWS::EC2::Volume' do
   describe "#save" do
 
     before(:each) do
-      @volume = ec2.volumes.new
+      @volume = ec2.volumes.new(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
     end
 
     it "should return true when it succeeds" do
@@ -108,7 +125,7 @@ describe 'Fog::AWS::EC2::Volume' do
       @volume.destroy
     end
 
-    it "should not exist in addresses before save" do
+    it "should not exist in volumes before save" do
       @volume.volumes.get(@volume.volume_id).should be_nil
     end
 

data/spec/aws/models/s3/bucket_spec.rb

@@ -16,15 +16,15 @@ describe 'Fog::AWS::S3::Bucket' do
 
   end
 
-  describe "#buckets" do
+  describe "#collection" do
 
     it "should return a Fog::AWS::S3::Buckets" do
-      s3.buckets.new.buckets.should be_a(Fog::AWS::S3::Buckets)
+      s3.buckets.new.collection.should be_a(Fog::AWS::S3::Buckets)
     end
 
     it "should be the buckets the bucket is related to" do
       buckets = s3.buckets
-      buckets.new.buckets.should == buckets
+      buckets.new.collection.should == buckets
     end
 
   end
@@ -115,12 +115,12 @@ describe 'Fog::AWS::S3::Bucket' do
     end
 
     it "should not exist in buckets before save" do
-      @bucket.buckets.all.map {|bucket| bucket.name}.include?(@bucket.name).should be_false
+      s3.buckets.all.map {|bucket| bucket.name}.include?(@bucket.name).should be_false
     end
 
     it "should exist in buckets after save" do
       @bucket.save
-      @bucket.buckets.all.map {|bucket| bucket.name}.include?(@bucket.name).should be_true
+      s3.buckets.all.map {|bucket| bucket.name}.include?(@bucket.name).should be_true
       @bucket.destroy
     end
 

data/spec/spec_helper.rb

@@ -80,4 +80,6 @@ def eventually(max_delay = 16, &block)
   end
 end
 
-GENTOO_AMI = 'ami-5ee70037'
+unless defined?(GENTOO_AMI)
+  GENTOO_AMI = 'ami-5ee70037'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 -07:00
+date: 2009-10-23 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency