right_aws-yodal 1.10.7 → 1.10.10

data/lib/rds/right_rds_interface.rb

@@ -316,8 +316,8 @@ module RightAws
     #  rds.describe_db_security_groups('kd3')
     #
     def describe_db_security_groups(*db_security_group_name, &block)
-      item, params = AwsUtils::split_items_and_params(db_security_group_name)
-      params['DBSecurityGroupName'] = item if item
+      items, params = AwsUtils::split_items_and_params(db_security_group_name)
+      params['DBSecurityGroupName'] = items.first unless items.blank?
       result = []
       incrementally_list_items('DescribeDBSecurityGroups', DescribeDbSecurityGroupsParser, params) do |response|
         result += response[:db_security_groups]
@@ -433,8 +433,8 @@ module RightAws
     #  end
     #
     def describe_db_parameter_groups(*db_parameter_group_name, &block)
-      item, params = AwsUtils::split_items_and_params(db_parameter_group_name)
-      params['DBParameterGroupName'] = item if item
+      items, params = AwsUtils::split_items_and_params(db_parameter_group_name)
+      params['DBParameterGroupName'] = items.first unless items.blank?
       result = []
       incrementally_list_items('DescribeDBParameterGroups', DescribeDbParameterGroupsParser, params) do |response|
         result += response[:db_parameter_groups]

data/lib/right_aws.rb

@@ -41,6 +41,8 @@ require 'awsbase/right_awsbase'
 require 'ec2/right_ec2'
 require 'ec2/right_ec2_images'
 require 'ec2/right_ec2_instances'
+require 'ec2/right_ec2_security_groups'
+require 'ec2/right_ec2_spot_instances'
 require 'ec2/right_ec2_ebs'
 require 'ec2/right_ec2_reserved_instances'
 require 'ec2/right_ec2_vpc'
@@ -56,16 +58,18 @@ require 'sqs/right_sqs_gen2_interface'
 require 'sqs/right_sqs_gen2'
 require 'sdb/right_sdb_interface'
 require 'acf/right_acf_interface'
+require 'acf/right_acf_streaming_interface'
+require 'acf/right_acf_origin_access_identities'
 require 'rds/right_rds_interface'
 
 
 module RightAws #:nodoc:
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 11
-    TINY  = 0
+    MAJOR = 2  unless defined?(MAJOR)
+    MINOR = 0 unless defined?(MINOR)
+    TINY  = 1  unless defined?(TINY)
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
   end
 end
 

data/lib/s3/right_s3.rb

@@ -460,6 +460,30 @@ module RightAws
         get if !@data and exists?
         @data
       end
+        
+        # Getter for the 'content-type' metadata
+      def content_type
+        @headers['content-type'] if @headers
+      end
+      
+        # Helper to get and URI-decode a header metadata.
+        # Metadata have to be HTTP encoded (rfc2616) as we use the Amazon S3 REST api
+        # see http://docs.amazonwebservices.com/AmazonS3/latest/index.html?UsingMetadata.html
+      def decoded_meta_headers(key = nil)
+        if key
+          # Get one metadata value by its key
+          URI.decode(@meta_headers[key.to_s])
+        else
+          # Get a hash of all metadata with a decoded value
+          @decoded_meta_headers ||= begin
+            metadata = {}
+            @meta_headers.each do |key, value|
+              metadata[key.to_sym] = URI.decode(value)
+            end
+            metadata
+          end
+        end
+      end
       
         # Retrieve object data and attributes from Amazon. 
         # Returns a +String+. 
@@ -759,7 +783,7 @@ module RightAws
         @thing = thing
         @id    = id
         @name  = name
-        @perms = perms.to_a
+        @perms = Array(perms)
         case action
           when :apply             then apply
           when :refresh           then refresh

data/lib/s3/right_s3_interface.rb

@@ -93,7 +93,11 @@ module RightAws
       s3_headers = {}
       headers.each do |key, value|
         key = key.downcase
-        s3_headers[key] = value.to_s.strip if key[/^#{AMAZON_HEADER_PREFIX}|^content-md5$|^content-type$|^date$/o]
+        value = case
+                when value.is_a?(Array) then value.join('')
+                else                         value.to_s
+                end
+        s3_headers[key] = value.strip if key[/^#{AMAZON_HEADER_PREFIX}|^content-md5$|^content-type$|^date$/o]
       end
       s3_headers['content-type'] ||= ''
       s3_headers['content-md5']  ||= ''
@@ -740,7 +744,7 @@ module RightAws
         else
           result[:grantees][key] = 
             { :display_name => grantee[:display_name] || grantee[:uri].to_s[/[^\/]*$/],
-              :permissions  => grantee[:permissions].to_a,
+              :permissions  => Array(grantee[:permissions]),
               :attributes   => grantee[:attributes] }
         end
       end

data/lib/sdb/active_sdb.rb

@@ -92,6 +92,59 @@ module RightAws
   #  # remove domain
   #  Client.delete_domain
   #
+  #  # Dynamic attribute accessors
+  #
+  #  class KdClient < RightAws::ActiveSdb::Base
+  #  end
+  #
+  #  client = KdClient.select(:all, :order => 'expiration').first
+  #    pp client.attributes #=>
+  #      {"name"=>["Putin"],
+  #       "post"=>["president"],
+  #       "country"=>["Russia"],
+  #       "expiration"=>["2008"],
+  #       "id"=>"376d2e00-75b0-11dd-9557-001bfc466dd7",
+  #       "gender"=>["male"]}
+  #
+  #    pp client.name    #=> ["Putin"]
+  #    pp client.country #=> ["Russia"]
+  #    pp client.post    #=> ["president"]
+  #
+  # # Columns and simple typecasting
+  #
+  #  class Person < RightAws::ActiveSdb::Base
+  #    columns do
+  #      name
+  #      email
+  #      score         :Integer
+  #      is_active     :Boolean
+  #      registered_at :DateTime
+  #      created_at    :DateTime, :default => lambda{ Time.now }
+  #    end
+  #  end
+  #  Person::create( :name => 'Yetta E. Andrews', :email => 'nulla.facilisis@metus.com', :score => 100, :is_active => true, :registered_at => Time.local(2000, 1, 1) )
+  #
+  #  person = Person.find_by_email 'nulla.facilisis@metus.com'
+  #  person.reload
+  #
+  #  pp person.attributes #=>
+  #    {"name"=>["Yetta E. Andrews"],
+  #     "created_at"=>["2010-04-02T20:51:58+0400"],
+  #     "id"=>"0ee24946-3e60-11df-9d4c-0025b37efad0",
+  #     "registered_at"=>["2000-01-01T00:00:00+0300"],
+  #     "is_active"=>["T"],
+  #     "score"=>["100"],
+  #     "email"=>["nulla.facilisis@metus.com"]}
+  #  pp person.name                #=> "Yetta E. Andrews"
+  #  pp person.name.class          #=> String
+  #  pp person.registered_at.to_s  #=> "2000-01-01T00:00:00+03:00"
+  #  pp person.registered_at.class #=> DateTime
+  #  pp person.is_active           #=> true
+  #  pp person.is_active.class     #=> TrueClass
+  #  pp person.score               #=> 100
+  #  pp person.score.class         #=> Fixnum
+  #  pp person.created_at.to_s     #=> "2010-04-02T20:51:58+04:00"
+  #
   class ActiveSdb
     
     module ActiveSdbConnect
@@ -242,7 +295,31 @@ module RightAws
         def delete_domain
           connection.delete_domain(domain)
         end
-        
+
+        def columns(&block)
+          @columns ||= ColumnSet.new
+          @columns.instance_eval(&block) if block
+          @columns
+        end
+
+        def column?(col_name)
+          columns.include?(col_name)
+        end
+
+        def type_of(col_name)
+          columns.type_of(col_name)
+        end
+
+        def serialize(attribute, value)
+          s = serialization_for_type(type_of(attribute))
+          s ? s.serialize(value) : value.to_s
+        end
+
+        def deserialize(attribute, value)
+          s = serialization_for_type(type_of(attribute))
+          s ? s.deserialize(value) : value
+        end
+
         # Perform a find request.
         #  
         # Single record: 
@@ -364,7 +441,11 @@ module RightAws
         end
 
         def generate_id # :nodoc:
-          UUIDTools::UUID.timestamp_create().to_s
+          if UUID::VERSION::STRING < '2.0.0'
+            UUID.timestamp_create().to_s
+          else
+            UUIDTools::UUID.timestamp_create().to_s
+          end
         end
 
       protected
@@ -376,7 +457,7 @@ module RightAws
           # detect amount of records requested
           bunch_of_records_requested = args.size > 1 || args.first.is_a?(Array)
           # flatten ids
-          args = args.to_a.flatten
+          args = Array(args).flatten
           args.each { |id| cond << "id=#{self.connection.escape(id)}" }
           ids_cond = "(#{cond.join(' OR ')})"
           # user defined :conditions to string (if it was defined)
@@ -518,7 +599,7 @@ module RightAws
           # detect amount of records requested
           bunch_of_records_requested = args.size > 1 || args.first.is_a?(Array)
           # flatten ids
-          args = args.to_a.flatten
+          args = Array(args).flatten
           args.each { |id| cond << "'id'=#{self.connection.escape(id)}" }
           ids_cond = "[#{cond.join(' OR ')}]"
           # user defined :conditions to string (if it was defined)
@@ -590,6 +671,13 @@ module RightAws
           end
         end
 
+        def serialization_for_type(type)
+          @serializations ||= {}
+          unless @serializations.has_key? type
+            @serializations[type] = ::RightAws::ActiveSdb.const_get("#{type}Serialization") rescue false
+          end
+          @serializations[type]
+        end
       end
       
       public
@@ -661,7 +749,11 @@ module RightAws
         self.attributes
       end
 
-      def connection 
+      def columns
+        self.class.columns
+      end
+
+      def connection
         self.class.connection
       end
 
@@ -675,7 +767,8 @@ module RightAws
       #  puts item['Cat'].inspect  #=> ["Jons socks", "clew", "mice"]
       #
       def [](attribute)
-        @attributes[attribute.to_s]
+        raw = @attributes[attribute.to_s]
+        self.class.column?(attribute) && raw ? self.class.deserialize(attribute, raw.first) : raw
       end
 
       # Updates the attribute identified by +attribute+ with the specified +values+.
@@ -686,7 +779,14 @@ module RightAws
       #
       def []=(attribute, values)
         attribute = attribute.to_s
-        @attributes[attribute] = attribute == 'id' ? values.to_s : values.to_a.uniq
+        @attributes[attribute] = case
+        when attribute == 'id'
+          values.to_s
+        when self.class.column?(attribute)
+          self.class.serialize(attribute, values)
+        else
+          Array(values).uniq
+        end
       end
 
       # Reload attributes from SDB. Replaces in-memory attributes.
@@ -906,25 +1006,117 @@ module RightAws
         @new_record = false
       end
 
-    private    
-    
+      # support accessing attribute values via method call
+      def method_missing(method_sym, *args)
+        method_name = method_sym.to_s
+        setter = method_name[-1,1] == '='
+        method_name.chop! if setter
+
+        if @attributes.has_key?(method_name) || self.class.column?(method_name)
+          setter ? self[method_name] = args.first : self[method_name]
+        else
+          super
+        end
+      end
+
+    private
+
       def raise_on_id_absence
         raise ActiveSdbError.new('Unknown record id') unless id
       end
       
       def prepare_for_update
         @attributes['id'] = self.class.generate_id if @attributes['id'].blank?
+        columns.all.each do |col_name|
+          self[col_name] ||= columns.default(col_name)
+        end
       end
       
       def uniq_values(attributes=nil) # :nodoc:
         attrs = {}
         attributes.each do |attribute, values|
           attribute = attribute.to_s
-          attrs[attribute] = attribute == 'id' ? values.to_s : values.to_a.uniq
+          attrs[attribute] = case
+          when attribute == 'id'
+            values.to_s
+          when self.class.column?(attribute)
+            values.is_a?(String) ? values : self.class.serialize(attribute, values)
+          else
+            Array(values).uniq
+          end
           attrs.delete(attribute) if values.blank?
         end
         attrs
       end
     end
+
+    class ColumnSet
+      attr_accessor :columns
+      def initialize
+        @columns = {}
+      end
+
+      def all
+        @columns.keys
+      end
+
+      def column(col_name)
+        @columns[col_name.to_s]
+      end
+      alias_method :include?, :column
+
+      def type_of(col_name)
+        column(col_name) && column(col_name)[:type]
+      end
+
+      def default(col_name)
+        return nil unless include?(col_name)
+        default = column(col_name)[:default]
+        default.respond_to?(:call) ? default.call : default
+      end
+
+      def method_missing(method_sym, *args)
+        data_type = args.shift || :String
+        options = args.shift || {}
+        @columns[method_sym.to_s] = options.merge( :type => data_type )
+      end
+    end
+
+    class DateTimeSerialization
+      class << self
+        def serialize(date)
+          date.strftime('%Y-%m-%dT%H:%M:%S%z')
+        end
+
+        def deserialize(string)
+          r = DateTime.parse(string) rescue nil
+        end
+      end
+    end
+
+    class BooleanSerialization
+      class << self
+        def serialize(boolean)
+          boolean ? 'T' : 'F'
+        end
+
+        def deserialize(string)
+          string == 'T'
+        end
+      end
+    end
+
+    class IntegerSerialization
+      class << self
+        def serialize(int)
+          int.to_s
+        end
+
+        def deserialize(string)
+          string.to_i
+        end
+      end
+    end
+
   end
 end

data/lib/sdb/right_sdb_interface.rb

@@ -33,7 +33,7 @@ module RightAws
     DEFAULT_PORT      = 443
     DEFAULT_PROTOCOL  = 'https'
     DEFAULT_PATH      = '/'
-    API_VERSION       = '2007-11-07'
+    API_VERSION       = '2009-04-15'
     DEFAULT_NIL_REPRESENTATION = 'nil'
 
     @@bench = AwsBenchmarkingBlock.new
@@ -89,24 +89,42 @@ module RightAws
 
     # Prepare attributes for putting.
     # (used by put_attributes)
-    def pack_attributes(attributes, replace = false) #:nodoc:
+    def pack_attributes(items_or_attributes, replace = false, batch = false) #:nodoc:
+      if batch
+        index = 0
+        items_or_attributes.inject({}){|result, (item_name, attributes)|
+          item_prefix = "Item.#{index}."
+          result["#{item_prefix}ItemName"] = item_name.to_s
+          result.merge!(
+            pack_single_item_attributes(attributes, replace, item_prefix))
+          index += 1
+          result
+        }
+      else
+        pack_single_item_attributes(items_or_attributes, replace)
+      end
+    end
+
+    def pack_single_item_attributes(attributes, replace, prefix = "")
       result = {}
       if attributes
         idx = 0
         skip_values = attributes.is_a?(Array)
         attributes.each do |attribute, values|
           # set replacement attribute
-          result["Attribute.#{idx}.Replace"] = 'true' if replace
+          result["#{prefix}Attribute.#{idx}.Replace"] = 'true' if replace
           # pack Name/Value
           unless values.nil?
-            Array(values).each do |value|
-              result["Attribute.#{idx}.Name"]  = attribute
-              result["Attribute.#{idx}.Value"] = ruby_to_sdb(value) unless skip_values
+            # Array(values) does not work here:
+            #  - Array('') => [] but we wanna get here ['']
+            [values].flatten.each do |value|
+              result["#{prefix}Attribute.#{idx}.Name"]  = attribute
+              result["#{prefix}Attribute.#{idx}.Value"] = ruby_to_sdb(value) unless skip_values
               idx += 1
             end
           else
-            result["Attribute.#{idx}.Name"] = attribute
-            result["Attribute.#{idx}.Value"] = ruby_to_sdb(nil) unless skip_values
+            result["#{prefix}Attribute.#{idx}.Name"] = attribute
+            result["#{prefix}Attribute.#{idx}.Value"] = ruby_to_sdb(nil) unless skip_values
             idx += 1
           end
         end
@@ -307,6 +325,37 @@ module RightAws
     rescue Exception
       on_exception
     end
+
+    # Add/Replace attributes for multiple items at a time.
+    #
+    # Params:
+    #   domain_name = DomainName
+    #   items       = {
+    #     'Item1' => {
+    #       'nameA'  => [valueA1, valueA2,..., valueAN],
+    #       ...
+    #       'nameB'  => [valueB1, valueB2,..., valueBN]
+    #     },
+    #     'Item2' => {
+    #       'nameC'  => [valueC1, valueC2,..., valueCN],
+    #       ...
+    #       'nameD'  => [valueD1, valueD2,..., valueDN]
+    #     }
+    #   }
+    #   replace = :replace | any other value to skip replacement
+    #
+    # Usage of batch_put_attributes is similar to put_attributes except that
+    # instead of supplying an item_name and a hash of attributes, you supply a
+    # hash of item names to attributes.
+    #
+    # See: http://docs.amazonwebservices.com/AmazonSimpleDB/latest/DeveloperGuide/index.html?SDB_API_BatchPutAttributes.html
+    def batch_put_attributes(domain_name, items, replace = false)
+      params = { 'DomainName' => domain_name }.merge(pack_attributes(items, replace, true))
+      link = generate_request("BatchPutAttributes", params)
+      request_info( link, QSdbSimpleParser.new)
+    rescue Exception
+      on_exception
+    end
     
     # Retrieve SDB item's attribute(s).
     # 
@@ -332,10 +381,11 @@ module RightAws
     #
     # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/SDB_API_GetAttributes.html
     #
-    def get_attributes(domain_name, item_name, attribute_name=nil)
+    def get_attributes(domain_name, item_name, attribute_name=nil, consistent_read=false)
       link = generate_request("GetAttributes", 'DomainName'    => domain_name,
                                                'ItemName'      => item_name,
-                                               'AttributeName' => attribute_name )
+                                               'AttributeName' => attribute_name,
+					       'ConsistentRead' => consistent_read )
       res = request_info(link, QSdbGetAttributesParser.new)
       res[:attributes].each_value do |values|
         values.collect! { |e| sdb_to_ruby(e) }
@@ -476,7 +526,7 @@ module RightAws
     # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?SDB_API_QueryWithAttributes.html
     #
     def query_with_attributes(domain_name, attributes=[], query_expression = nil, max_number_of_items = nil, next_token = nil)
-      attributes = attributes.to_a
+      attributes = Array(attributes)
       query_expression = query_expression_from_array(query_expression) if query_expression.is_a?(Array)
       @last_query_expression = query_expression
       #