aws-sdk 1.4.1 → 1.5.0

data/lib/aws/ec2/dhcp_options.rb

@@ -45,9 +45,9 @@ module AWS
 
       # @return [Hash]
       def configuration
-        dhcp_configuration_set.inject({}) do |config,opt|
-          key = opt.key.gsub(/-/, '_').to_sym
-          values = opt.value_set.map(&:value)
+        dhcp_configuration_set.to_a.inject({}) do |config,opt|
+          key = opt[:key].gsub(/-/, '_').to_sym
+          values = opt[:value_set].map{|v| v[:value] }
           values = values.first if key == :domain_name
           values = values.first.to_i if key == :netbios_node_type
           config.merge(key => values)

data/lib/aws/ec2/errors.rb

@@ -13,13 +13,19 @@
 
 module AWS
   class EC2
-
-    # @private
     module Errors
 
-      BASE_ERROR_GRAMMAR = Client::XML::BaseError
+      # @private
+      GRAMMAR = Core::XML::Grammar.customize do
+        element "Errors" do
+          ignore
+          element "Error" do
+            ignore
+          end
+        end
+      end
 
-      include Core::LazyErrorClasses
+      extend Core::LazyErrorClasses
 
     end
   end

data/lib/aws/ec2/instance.rb

@@ -343,7 +343,7 @@ module AWS
 
       provider(:terminate_instances, :start_instances, :stop_instances) do |provider|
         provider.find do |resp| 
-          resp.instances_set.find { |i| i.instance_id == id }
+          resp.instances_set.find {|i| i.instance_id == id }
         end
         provider.provides :status, :get_as => :current_state
         provider.provides :status_code, :get_as => :current_state
@@ -351,7 +351,7 @@ module AWS
       
       provider(:monitor_instances, :unmonitor_instances) do |provider|
         provider.find do |resp|
-          resp.instances_set.find { |i| i.instance_id == id }
+          resp.instances_set.find {|i| i.instance_id == id }
         end
         provider.provides :monitoring
       end
@@ -448,8 +448,8 @@ module AWS
       # Enables or disables monitoring for this instance.
       # @param [Boolean] state A true or false value.  Enables monintoring
       #   for a true value, disables it for a false value.
-      def monitoring_enabled= value
-        value ? enable_monitoring : disable_monitoring
+      def monitoring_enabled= state
+        state ? enable_monitoring : disable_monitoring
       end
 
       # @return [Booelan] Returns +true+ if CloudWatch monitoring is 
@@ -656,8 +656,9 @@ module AWS
       protected
       def attributes_from_response_object(obj)
         if atts = super(obj)
-          atts[:status] = obj.instance_state.name.tr("-","_").to_sym if
-            obj.respond_to?(:instance_state)
+          if obj[:instance_state]
+            atts[:status] = obj[:instance_state].name.tr("-","_").to_sym 
+          end
           atts
         end
       end

data/lib/aws/ec2/instance_collection.rb

@@ -261,8 +261,8 @@ module AWS
       # @yield [Instance] Yields each instance in the collection.
       def each(&block)
         response = filtered_request(:describe_instances)
-        response.reservation_set.each do |r|
-          r.instances_set.each do |i|
+        response.reservation_set.each do |reservation|
+          reservation.instances_set.each do |i|
             yield(Instance.new(i.instance_id, :config => config))
           end
         end

data/lib/aws/ec2/key_pair_collection.rb

@@ -85,9 +85,9 @@ module AWS
         response = client.send(client_method, options)
 
         options = {}
-        options[:fingerprint] = response.key_fingerprint
-        if response.respond_to?(:key_material)
-          options[:private_key] = response.key_material
+        options[:fingerprint] = response.data[:key_fingerprint]
+        if response[:key_material]
+          options[:private_key] = response.data[:key_material]
         end
 
         KeyPair.new(response.key_name, options)

data/lib/aws/ec2/network_acl.rb

@@ -21,7 +21,7 @@ module AWS
     #
     # @attr_reader [String] vpc_id
     #
-    # @attr_reader [Boolean] default? Returns true if this is the default 
+    # @attr_reader [Boolean] default Returns true if this is the default 
     #   network ACL.
     #
     class NetworkACL < Resource
@@ -40,7 +40,9 @@ module AWS
     
       attribute :vpc_id, :static => true
 
-      attribute :default?, :static => true
+      attribute :default, :static => true
+
+      alias_method :default?, :default
 
       attribute :entry_set
 

data/lib/aws/ec2/network_acl/entry.rb

@@ -20,18 +20,18 @@ module AWS
 
         def initialize network_acl, details
           @network_acl = network_acl
-          @rule_number = details.rule_number
-          @protocol = details.protocol.to_i
-          @action = details.rule_action.to_sym
-          @egress = details.egress?
+          @rule_number = details[:rule_number]
+          @protocol = details[:protocol].to_i
+          @action = details[:rule_action].to_sym
+          @egress = details[:egress]
           @ingress = !@egress
-          @cidr_block = details.cidr_block
-          if details.respond_to?(:icmp_type_code)
-            @icmp_type = details.icmp_type_code.type
-            @icmp_code = details.icmp_type_code.code
+          @cidr_block = details[:cidr_block]
+          if type_code = details[:icmp_type_code]
+            @icmp_type = type_code[:type]
+            @icmp_code = type_code[:code]
           end
-          if details.respond_to?(:port_range)
-            @port_range = (details.port_range.from..details.port_range.to)
+          if range = details[:port_range]
+            @port_range = (range[:from]..range[:to])
           end
         end
 

data/lib/aws/ec2/network_interface.rb

@@ -45,10 +45,9 @@ module AWS
 
       attribute :private_dns_name, :static => true
 
-      mutable_attribute :source_dest_check?, 
-        :set_as => :source_dest_check
+      mutable_attribute :source_dest_check
 
-      alias_method :source_dest_check, :source_dest_check?
+      alias_method :source_dest_check?, :source_dest_check
 
       attribute :attachment_details, :as => :attachment
 

data/lib/aws/ec2/network_interface/attachment.rb

@@ -20,15 +20,15 @@ module AWS
         
         def initialize network_interface, details
           @network_interface = network_interface
-          @attachment_id = details.attachment_id
-          @instance = Instance.new(details.instance_id, 
-            :owner_id => details.instance_owner_id,
+          @attachment_id = details[:attachment_id]
+          @instance = Instance.new(details[:instance_id],
+            :owner_id => details[:instance_owner_id],
             :config => network_interface.config)
-          @instance_owner_id = details.instance_owner_id
-          @device_index = details.device_index
-          @status = details.status.to_sym
-          @attach_time = details.attach_time
-          @delete_on_termination = details.delete_on_termination?
+          @instance_owner_id = details[:instance_owner_id]
+          @device_index = details[:device_index]
+          @status = details[:status].to_sym
+          @attach_time = details[:attach_time]
+          @delete_on_termination = details[:delete_on_termination]
         end
 
         # @return [String] Returns the attachment id.

data/lib/aws/ec2/permission_collection.rb

@@ -35,8 +35,8 @@ module AWS
       def each(&block)
         resp = client.send(describe_call, describe_params)
         resp.send(inflected_permissions_attribute).each do |permission|
-          if permission.respond_to?(:user_id)
-            user_id = permission.user_id
+          if permission[:user_id]
+            user_id = permission[:user_id]
             yield(user_id)
           end
         end
@@ -57,7 +57,7 @@ module AWS
       def public?
         resp = client.send(describe_call, describe_params)
         resp.send(inflected_permissions_attribute).any? do |permission|
-          permission.respond_to?(:group) and permission.group == "all"
+          permission[:group] and permission[:group] == "all"
         end
       end
 

data/lib/aws/ec2/request.rb

@@ -16,9 +16,7 @@ module AWS
 
     # @private
     class Request < Core::Http::Request
-      include Core::AuthorizeV2
-      include Core::AuthorizeWithSessionToken
+      include Core::Signature::Version2
     end
-
   end
 end

data/lib/aws/ec2/resource_tag_collection.rb

@@ -57,9 +57,8 @@ module AWS
         @tags.to_a.empty?
       end
 
+      # @param [String or Symbol] key The key of the tag to check.
       # @return [Boolean] True if the resource has a tag for the given key.
-      #
-      # @param [String or Symbol] The key of the tag to check.
       def has_key?(key)
         if cached = cached_tags
           return cached.has_key?(key.to_s)
@@ -70,9 +69,8 @@ module AWS
       alias_method :include?, :has_key?
       alias_method :member?, :has_key?
 
+      # @param [String or Symbol] value The value to check.
       # @return [Boolean] True if the resource has a tag with the given value.
-      #
-      # @param [String or Symbol] The value to check.
       def has_value?(value)
         if cached = cached_tags
           return cached.values.include?(value)
@@ -82,10 +80,8 @@ module AWS
       alias_method :value?, :has_value?
 
       # Changes the value of a tag.
-      #
-      # @param [String or Symbol] The key of the tag to set.
-      #
-      # @param [String] The new value.  If this is nil, the tag will
+      # @param [String or Symbol] key The key of the tag to set.
+      # @param [String] value The new value.  If this is nil, the tag will
       #   be deleted.
       def []=(key, value)
         if value

data/lib/aws/ec2/route_table.rb

@@ -107,8 +107,9 @@ module AWS
       #   {RouteTable::Association} objects (association to subnets).
       def associations
         association_set.collect do |details| 
-          subnet_id = details.respond_to?(:subnet_id) ? details.subnet_id : nil
-          Association.new(self, details.route_table_association_id, subnet_id)
+          Association.new(self, 
+            details[:route_table_association_id], 
+            details[:subnet_id])
         end
       end
 

data/lib/aws/ec2/route_table/route.rb

@@ -32,22 +32,22 @@ module AWS
 
           @destination_cidr_block = details.destination_cidr_block
 
-          if details.respond_to?(:gateway_id)
+          if details[:gateway_id]
             @internet_gateway = InternetGateway.new(
-              details.gateway_id, 
+              details[:gateway_id],
               :config => route_table.config)
           end
 
-          if details.respond_to?(:instance_id)
-            @instance = Instance.new(details.instance_id, 
+          if details[:instance_id]
+            @instance = Instance.new(details[:instance_id],
               :vpc_id => route_table.vpc_id,
-              :owner_id => details.instance_owner_id,
+              :owner_id => details[:instance_owner_id],
               :config => route_table.config)
           end
 
-          if details.respond_to?(:network_interface_id)
+          if details[:network_interface_id]
             @network_interface = NetworkInterface.new(
-              details.network_interface_id, 
+              details[:network_interface_id], 
               :vpc_id => route_table.vpc_id,
               :config => route_table.config)
           end

data/lib/aws/ec2/security_group.rb

@@ -114,7 +114,7 @@ module AWS
       #   # only allow ping from a particular address
       #   security_group.allow_ping('123.123.123.123/0')
       #
-      # @param [String] ip_ranges One or more IP ranges to allow ping from.
+      # @param [String] sources One or more IP ranges to allow ping from.
       #   Defaults to 0.0.0.0/0
       #
       # @return [nil]
@@ -127,7 +127,7 @@ module AWS
       # Removes ingress rules for ICMP pings.  Defaults to 0.0.0.0/0 for 
       # the list of IP ranges to revoke.
       #
-      # @param [String] ip_ranges One or more IP ranges to allow ping from.
+      # @param [String] sources One or more IP ranges to disallow ping from.
       #   Defaults to 0.0.0.0/0
       #
       # @return [nil] 

data/lib/aws/ec2/security_group/egress_ip_permission_collection.rb

@@ -14,14 +14,25 @@
 module AWS
   class EC2
     class SecurityGroup < Resource
-      class EgressIpPermissionCollection < IpPermissionCollection
+      class EgressIpPermissionCollection
+
+        include Core::Model
+        include Enumerable
+
+        def initialize security_group, options = {}
+          @security_group = security_group
+          super
+        end
+
+        # @return [SecurityGroup]
+        attr_reader :security_group
 
         def each
           security_group.ip_permissions_list_egress.each do |p|
 
             # egress permissions don't always have ports
-            if p.respond_to?(:from_port)
-              ports = [p.from_port, p.to_port]
+            if p[:from_port]
+              ports = [p[:from_port], p[:to_port]]
             else
               ports = nil
             end
@@ -29,8 +40,8 @@ module AWS
             ip_ranges = p.ip_ranges.collect{|ip| ip.cidr_ip }
 
             groups = p.groups.collect do |group|
-              SecurityGroup.new(group.group_id,
-                :owner_id => group.user_id,
+              SecurityGroup.new(group[:group_id],
+                :owner_id => group[:user_id],
                 :vpc_id => security_group.vpc_id,
                 :config => config)
             end

data/lib/aws/ec2/security_group/ingress_ip_permission_collection.rb

@@ -20,17 +20,18 @@ module AWS
         include Core::Model
         include Enumerable
 
-        attr_reader :security_group
-
         def initialize security_group, options = {}
           @security_group = security_group
           super
         end
 
+        # @return [SecurityGroup]
+        attr_reader :security_group
+
         def each
           security_group.ip_permissions_list.each do |p|
 
-            ports = p.respond_to?(:from_port) ? [p.from_port, p.to_port] : nil
+            ports = p[:from_port] ? [p[:from_port], p[:to_port]] : nil
 
             ip_ranges = p.ip_ranges.collect{|ip| ip.cidr_ip }
 

data/lib/aws/ec2/security_group/ip_permission.rb

@@ -20,8 +20,7 @@ module AWS
 
         # @param protocol [:tcp, :udp, :icmp]
         #
-        # @param port [Range,Integer] An integer or a range of integers
-        #   to open ports for.
+        # @param [Integer,Range<Integer>] ports A port or port range to allow.
         #
         # @param [Hash] options
         #

data/lib/aws/ec2/snapshot_collection.rb

@@ -94,14 +94,17 @@ module AWS
       # @param [Hash] opts Options for creating the snapshot.
       #   Either +:volume+ or +:volume_id+ is required.
       #
-      # @param opts [Volume] :volume The Amazon EBS volume of which
+      # @option opts [Volume] :volume The Amazon EBS volume of which
       #   to take a snapshot.
       #
-      # @param opts [String] :volume_id The ID of the Amazon EBS
+      # @option opts [String] :volume_id The ID of the Amazon EBS
       #   volume of which to take a snapshot.
       #
-      # @param opts [String] :description An optional description of
+      # @option opts [String] :description An optional description of
       #   the snapshot.  May contain up to 255 characters.
+      #
+      # @return [Snapshot]
+      #
       def create opts = {}
         if volume = opts.delete(:volume)
           opts[:volume_id] = volume.id

data/lib/aws/ec2/subnet.rb

@@ -92,7 +92,7 @@ module AWS
       # route table associated with this subnet, that association
       # is replaced.
       #
-      # @param [RouteTable,String] route_Table A {RouteTable} object or
+      # @param [RouteTable,String] route_table A {RouteTable} object or
       #   a route table id string.
       #
       # @return [RouteTable::Association]

data/lib/aws/ec2/volume.rb

@@ -66,9 +66,7 @@ module AWS
 
       attribute :snapshot_id, :static => true
 
-      attribute :size, :static => true do
-        translates_output {|value| value.to_i if value }
-      end
+      attribute :size, :static => true
 
       attribute :availability_zone_name, :as => :availability_zone,
         :static => true

data/lib/aws/ec2/volume_collection.rb

@@ -74,7 +74,9 @@ module AWS
       #   The Availability Zone in which to create the new volume.
       #   To get a list of the availability zones you can use, see
       #   {EC2#availability_zones}.
+      #
       # @return [Volume]
+      #
       def create options = {}
         if snapshot = options.delete(:snapshot)
           options[:snapshot_id] = snapshot.id