aws 2.3.12 → 2.3.13

data/lib/sdb/active_sdb.rb

@@ -370,9 +370,9 @@ module Aws
                     options[:conditions] = build_conditions(options[:conditions])
                     # join ids condition and user defined conditions
                     options[:conditions] = options[:conditions].blank? ? ids_cond : "(#{options[:conditions]}) AND #{ids_cond}"
-                    puts 'options=' + options.inspect
+                    #puts 'options=' + options.inspect
                     result = sql_select(options)
-                    puts 'select_from_ids result=' + result.inspect
+                    #puts 'select_from_ids result=' + result.inspect
                     # if one record was requested then return it
                     unless bunch_of_records_requested
                         record = result[:items].first
@@ -397,9 +397,10 @@ module Aws
                     count = options[:count] || false
                     #puts 'count? ' + count.to_s
                     @next_token = options[:next_token]
+                    @consistent_read = options[:consistent_read]
                     select_expression = build_select(options)
                     # request items
-                    query_result = self.connection.select(select_expression, @next_token)
+                    query_result = self.connection.select(select_expression, @next_token, @consistent_read)
                     # puts 'QR=' + query_result.inspect
                     ret = {}
                     if count
@@ -464,6 +465,7 @@ module Aws
                 #
                 def query(options) # :nodoc:
                     @next_token = options[:next_token]
+                    @consistent_read = options[:consistent_read]
                     query_expression = build_conditions(options[:query_expression])
                     # add sort_options to the query_expression
                     if options[:sort_option]
@@ -482,7 +484,7 @@ module Aws
                         query_expression += sort_by_expression
                     end
                     # request items
-                    query_result = self.connection.query(domain, query_expression, options[:max_number_of_items], @next_token)
+                    query_result = self.connection.query(domain, query_expression, options[:max_number_of_items], @next_token, @consistent_read)
                     @next_token = query_result[:next_token]
                     items = query_result[:items].map do |name|
                         new_item = self.new('id' => name)
@@ -506,7 +508,8 @@ module Aws
                     records = query( :query_expression    => options[:conditions],
                                      :max_number_of_items => options[:limit],
                                      :next_token          => options[:next_token],
-                                     :sort_option         => options[:sort] || options[:order] )
+                                     :sort_option         => options[:sort] || options[:order],
+                                     :consistent_read     => options[:consistent_read] )
                     options[:auto_load] ? reload_all_records(records) : records
                 end
 

data/lib/sdb/right_sdb_interface.rb

@@ -407,10 +407,11 @@ module Aws
         #
         # 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 = nil)
             link = generate_request("GetAttributes", 'DomainName'    => domain_name,
-                                    'ItemName'      => item_name,
-                                    'AttributeName' => attribute_name )
+                                    'ItemName'       => item_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) }
@@ -482,14 +483,15 @@ module Aws
         # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/SDB_API_Query.html
         #      http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?SortingData.html
         #
-        def query(domain_name, query_expression = nil, max_number_of_items = nil, next_token = nil)
+        def query(domain_name, query_expression = nil, max_number_of_items = nil, next_token = nil, consistent_read = nil)
             query_expression = query_expression_from_array(query_expression) if query_expression.is_a?(Array)
             @last_query_expression = query_expression
             #
             request_params = { 'DomainName'       => domain_name,
                                'QueryExpression'  => query_expression,
                                'MaxNumberOfItems' => max_number_of_items,
-                               'NextToken'        => next_token }
+                               'NextToken'        => next_token,
+                               'ConsistentRead'   => consistent_read }
             link   = generate_request("Query", request_params)
             result = request_info( link, QSdbQueryParser.new )
             # return result if no block given
@@ -550,7 +552,7 @@ module Aws
         #
         # 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)
+        def query_with_attributes(domain_name, attributes=[], query_expression = nil, max_number_of_items = nil, next_token = nil, consistent_read = nil)
             attributes = attributes.to_a
             query_expression = query_expression_from_array(query_expression) if query_expression.is_a?(Array)
             @last_query_expression = query_expression
@@ -558,7 +560,8 @@ module Aws
             request_params = { 'DomainName'       => domain_name,
                                'QueryExpression'  => query_expression,
                                'MaxNumberOfItems' => max_number_of_items,
-                               'NextToken'        => next_token }
+                               'NextToken'        => next_token,
+                               'ConsistentRead'   => consistent_read }
             attributes.each_with_index do |attribute, idx|
                 request_params["AttributeName.#{idx+1}"] = attribute
             end
@@ -616,12 +619,13 @@ module Aws
         #      http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?UsingSelect.html
         #      http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/index.html?SDBLimits.html
         #
-        def select(select_expression, next_token = nil)
+        def select(select_expression, next_token = nil, consistent_read = nil)
             select_expression      = query_expression_from_array(select_expression) if select_expression.is_a?(Array)
             @last_query_expression = select_expression
             #
             request_params = { 'SelectExpression' => select_expression,
-                               'NextToken'        => next_token }
+                               'NextToken'        => next_token,
+                               'ConsistentRead'   => consistent_read }
             link   = generate_request("Select", request_params)
             result = select_response_to_ruby(request_info( link, QSdbSelectParser.new ))
             return result unless block_given?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 3
-  - 12
-  version: 2.3.12
+  - 13
+  version: 2.3.13
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency