fog 0.0.29 → 0.0.30

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

@@ -12,7 +12,7 @@ module Fog
         def destroy
           connection.delete_bucket(@name)
           true
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           false
         end
 

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

@@ -8,6 +8,8 @@ module Fog
 
       class Buckets < Fog::Collection
 
+        model Fog::AWS::S3::Bucket
+
         def all
           data = connection.get_service.body
           owner = Fog::AWS::S3::Owner.new(data.delete('Owner').merge!(:connection => connection))
@@ -22,12 +24,6 @@ module Fog
           buckets
         end
 
-        def create(attributes = {})
-          bucket = new(attributes)
-          bucket.save
-          bucket
-        end
-
         def get(name, options = {})
           remap_attributes(options, {
             :max_keys     => 'max-keys',
@@ -55,23 +51,10 @@ module Fog
             }.merge!(object))
           end
           bucket
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
 
-        def new(attributes = {})
-          Fog::AWS::S3::Bucket.new(
-            attributes.merge!(
-              :collection => self,
-              :connection => connection
-            )
-          )
-        end
-
-        def reload
-          all
-        end
-
       end
 
     end

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

@@ -10,6 +10,8 @@ module Fog
         attribute :max_keys,      'MaxKeys'
         attribute :prefix,        'Prefix'
 
+        model Fog::AWS::S3::Object
+
         def all(options = {})
           bucket.collection.get(
             bucket.name,
@@ -21,13 +23,13 @@ module Fog
           @bucket
         end
 
-        def create(attributes = {})
-          object = new(attributes)
-          object.save
-          object
-        end
-
         def get(key, options = {}, &block)
+          options = {
+            'delimiter'   => @delimiter,
+            'marker'      => @marker,
+            'max-keys'    => @max_keys,
+            'prefix'      => @prefix
+          }.merge!(options)
           data = connection.get_object(bucket.name, key, options, &block)
           object_data = {
             :body => data.body,
@@ -44,7 +46,7 @@ module Fog
             :connection => connection
           }.merge!(object_data))
           object
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
 
@@ -68,25 +70,12 @@ module Fog
             :connection => connection
           }.merge!(object_data))
           object
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
 
         def new(attributes = {})
-          Fog::AWS::S3::Object.new({
-            :bucket     => bucket,
-            :collection => self,
-            :connection => connection
-          }.merge!(attributes))
-        end
-
-        def reload
-          all({
-            'delimiter'   => @delimiter,
-            'marker'      => @marker,
-            'max-keys'    => @max_keys,
-            'prefix'      => @prefix
-          })
+          super({ :bucket => bucket }.merge!(attributes))
         end
 
         private

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

@@ -7,7 +7,7 @@ unless Fog.mocking?
         # Acquire an elastic IP address.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'publicIp'<~String> - The acquired address
         #     * 'requestId'<~String> - Id of the request

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

@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * public_ip<~String> - Public ip to assign to instance
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -47,7 +47,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -12,7 +12,7 @@ unless Fog.mocking?
         # * device<~String> - Specifies how the device is exposed to the instance (e.g. "/dev/sdh")
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'attachTime'<~Time> - Time of attachment was initiated at
         #     * 'device'<~String> - Device as it is exposed to the instance
@@ -60,7 +60,7 @@ else
               }.merge!(data)
             else
               response.status = 400
-              raise(Fog::Errors.status_error(200, 400, response))
+              raise(Excon::Errors.status_error(200, 400, response))
             end
           else
             response.status = 400

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

@@ -19,7 +19,7 @@ unless Fog.mocking?
         #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * key_name<~String> - Unique name for key pair.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'keyFingerprint'<~String> - SHA-1 digest of DER encoded private key
         #     * 'keyMaterial'<~String> - Unencrypted encoded PEM private key
@@ -48,7 +48,7 @@ else
             }.merge!(data)
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -11,7 +11,7 @@ unless Fog.mocking?
         # * group_description<~String> - Description of group.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -49,7 +49,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * volume_id<~String> - Id of EBS volume to snapshot
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'progress'<~String> - The percentage progress of the snapshot
         #     * 'requestId'<~String> - id of request
@@ -53,7 +53,7 @@ else
             }.merge!(data)
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -12,7 +12,7 @@ unless Fog.mocking?
         # * snapshot_id<~String> - Optional, snapshot to create volume from
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'availabilityZone'<~String> - Availability zone for volume
         #     * 'createTime'<~Time> - Timestamp for creation
@@ -63,9 +63,9 @@ else
               'Code' => 'MissingParameter'
             }
             unless availability_zone
-              response['Message'] = 'The request must contain the parameter availability_zone'
+              response.body['Message'] = 'The request must contain the parameter availability_zone'
             else
-              response['Message'] = 'The request must contain the parameter size'
+              response.body['Message'] = 'The request must contain the parameter size'
             end
           end
           response

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * key_name<~String> - Name of the key pair.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> id of request
         #     * 'return'<~Boolean> - success?

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * group_name<~String> - Name of the security group.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -41,7 +41,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * snapshot_id<~String> - ID of snapshot to delete
         # ==== Returns
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -41,7 +41,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * volume_id<~String> - Id of volume to delete.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
@@ -43,7 +43,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * public_ip<~Array> - List of ips to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'addressesSet'<~Array>:
@@ -49,7 +49,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * zone_name<~String> - List of availability zones to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'availabilityZoneInfo'<~Array>:

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

@@ -14,7 +14,7 @@ unless Fog.mocking?
         #   * 'Owner'<~String> - Only return images belonging to owner.
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'imagesSet'<~Array>:

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * instance_id<~Array> - List of instance ids to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationSet'<~Array>:
@@ -104,7 +104,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * key_name<~Array>:: List of key names to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'keySet'<~Array>:
@@ -51,7 +51,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * region_name<~String> - List of regions to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'regionInfo'<~Array>:

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * group_name<~Array> - List of groups to describe, defaults to all
         #
         # === Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'securityGroupInfo'<~Array>:
@@ -59,7 +59,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * snapshot_id<~Array> - List of snapshots to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'snapshotSet'<~Array>:
@@ -66,7 +66,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end

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

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * volume_id<~Array> - List of volumes to describe, defaults to all
         #
         # ==== Returns
-        # * response<~Fog::AWS::Response>:
+        # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'volumeSet'<~Array>:
         #       * 'availabilityZone'<~String> - Availability zone for volume
@@ -73,7 +73,7 @@ else
             }
           else
             response.status = 400
-            raise(Fog::Errors.status_error(200, 400, response))
+            raise(Excon::Errors.status_error(200, 400, response))
           end
           response
         end