aws-sdk 1.2.3 → 1.2.4

data/lib/aws/core.rb

@@ -56,7 +56,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/core/http/net_http_handler.rb

@@ -11,9 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'net/http'
-require 'net/https'
-require 'openssl'
+require 'net/http/connection_pool'
 
 module AWS
   module Core
@@ -22,72 +20,33 @@ module AWS
       # The default http request handler for the aws-sdk gem.  It is based
       # on Net::Http.
       class NetHttpHandler
-  
-        def handle request, response
-          http_session_for(request) do |http|
-            begin
-              http_resp = http.request(build_request(request))
-              response.body = http_resp.body
-              response.status = http_resp.code.to_i
-              response.headers = http_resp.to_hash
-            rescue Timeout::Error, Errno::ETIMEDOUT => e
-              response.timeout = true
-            end
-          end
-        end
-          
-        # @private
-        protected
-        def http_session_for request, &block
-          begin
-            http = build_http(request)
-            http.start
-            yield(http)
-          ensure
-            http.finish if http.started?
-          end
-        end
-
-        # @private
-        protected
-        def build_http request
-
-          http_args = []
-          http_args << request.host
-          http_args << (request.use_ssl? ? 443 : 80)
 
-          ## add proxy arguments
+        @@pool = Net::HTTP::ConnectionPool.new
 
-          if proxy = request.proxy_uri
-            proxy_addr = proxy.respond_to?(:request_uri) ?
-              "#{proxy.host}#{proxy.request_uri}" : proxy.host
-            http_args << proxy_addr
-            http_args << proxy.port
-            http_args << proxy.user
-            http_args << proxy.password
-          end
+        # @private
+        def self.pool
+          @@pool
+        end
+  
+        def handle request, response
 
-          # ruby 1.8.7 does not accept a hash of options at the end of
-          # Net::HTTP.new like 1.9 does, therefore we have to set ssl
-          # options on the returned http object
-          http = Net::HTTP.new(*http_args)
+          options = {}
+          options[:ssl] = request.use_ssl?
+          options[:proxy_uri] = request.proxy_uri
+          options[:ssl_verify_peer] = request.ssl_verify_peer?
+          options[:ssl_ca_file] = request.ssl_ca_file
 
-          ## configure ssl 
+          connection = self.class.pool.connection_for(request.host, options)
 
-          if request.use_ssl?
-            http.use_ssl = true
-            if request.ssl_verify_peer?
-              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-              http.ca_file = request.ssl_ca_file
-            else
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
-          else
-            http.use_ssl = false
+          begin
+            http_response = connection.request(build_request(request))
+            response.body = http_response.body
+            response.status = http_response.code.to_i
+            response.headers = http_response.to_hash
+          rescue Timeout::Error, Errno::ETIMEDOUT => e
+            response.timeout = true
           end
 
-          http
-
         end
 
         # @private

data/lib/aws/record/attribute_macros.rb

@@ -18,6 +18,7 @@ require 'aws/record/attributes/float'
 require 'aws/record/attributes/sortable_float'
 require 'aws/record/attributes/boolean'
 require 'aws/record/attributes/datetime'
+require 'aws/record/attributes/date'
 
 module AWS
   module Record
@@ -204,16 +205,39 @@ module AWS
       # will be automanaged.
       #
       # @param [Symbol] name The name of the attribute.
+      #
       # @param [Hash] options
-      # @option options [Integer] :precision When set, the integer will be
-      #   serialized with the correct number of digits to SimpleDB, left 
-      #   padded by zeros to allow sorting.
+      #
       # @option options [Boolean] :set (false) When true this attribute
-      #   can have multiple values.
+      #   can have multiple date times.
+      #
       def datetime_attr name, options = {}
         add_attribute(DateTimeAttribute.new(name, options))
       end
 
+      # Adds a date attribute to this class.
+      #
+      # @example A standard date attribute
+      #
+      #   class Person < AWS::Record::Base
+      #     date_attr :birthdate
+      #   end
+      #
+      #   baby = Person.new
+      #   baby.birthdate = Time.now
+      #   baby.birthdate #=> <Date: ....>
+      #
+      # @param [Symbol] name The name of the attribute.
+      #
+      # @param [Hash] options
+      #
+      # @option options [Boolean] :set (false) When true this attribute
+      #   can have multiple dates.
+      #
+      def date_attr name, options = {}
+        add_attribute(DateAttribute.new(name, options))
+      end
+
       # A convenience method for adding the standard two datetime attributes
       # +:created_at+ and +:updated_at+.
       #

data/lib/aws/record/attributes/date.rb

@@ -0,0 +1,89 @@
+# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'date'
+require 'aws/record/attribute'
+
+module AWS
+  module Record
+
+    # @private
+    class DateAttribute < Attribute
+
+      # Returns value cast to a Date object.  Empty strings are cast to 
+      # nil.  Values are cast first to strings and then passed to 
+      # Date.parse.  Integers are treated as timestamps.
+      #
+      #   date_attribute.type_cast('2000-01-02T10:11:12Z')
+      #   #=> #<Date: 4903091/2,0,2299161>
+      #
+      #   date_attribute.type_cast(1306170146)
+      #   #<Date: 4911409/2,0,2299161>
+      #
+      #   date_attribute.type_cast('')
+      #   #=> nil
+      #
+      #   date_attribute.type_cast(nil)
+      #   #=> nil
+      #
+      # @param [Mixed] raw_value The value to cast to a Date object.
+      # @param [Hash] options
+      # @return [Date,nil]
+      def self.type_cast raw_value, options = {}
+        case raw_value
+        when nil      then nil
+        when ''       then nil
+        when Date     then raw_value
+        when Integer  then 
+          begin
+            Date.parse(Time.at(raw_value).to_s) # assumed timestamp
+          rescue
+            nil
+          end
+        else 
+          begin
+            Date.parse(raw_value.to_s) # Time, DateTime or String
+          rescue
+            nil
+          end
+        end
+      end
+
+      # Returns a Date object encoded as a string (suitable for sorting).
+      #
+      #   attribute.serialize(DateTime.parse('2001-01-01'))
+      #   #=> '2001-01-01'
+      #
+      # @param [Date] datetime The date to serialize.
+      #
+      # @param [Hash] options
+      #
+      # @return [String] Returns the date object serialized to a string
+      #   ('YYYY-MM-DD').
+      #
+      def self.serialize date, options = {}
+        unless date.is_a?(Date)
+          raise ArgumentError, "expected a Date value, got #{date.class}"
+        end
+        date.strftime('%Y-%m-%d')
+      end
+
+      # @private
+      def self.allow_set?
+        true
+      end
+
+    end
+
+  end
+end

data/lib/aws/record/base.rb

@@ -301,11 +301,23 @@ module AWS
       #
       # @param [Hash] attributes A set of attribute values to seed this record
       #   with.  The attributes are bulk assigned.
+      #
       # @return [Base] Returns a new record that has not been persisted yet.
+      #
       def initialize attributes = {}
+
+        opts = attributes.dup
+
         @_data = {}
+
+        @_domain = attributes.delete(:domain)
+        @_domain ||= attributes.delete('domain')
+        @_domain = self.class.domain_name(@_domain)
+
         assign_default_values
+
         bulk_assign(attributes)
+
       end
   
       # The id for each record is auto-generated.  The default strategy 
@@ -316,6 +328,12 @@ module AWS
         @_id
       end
 
+      # @return [String] Returns the name of the SimpleDB domain this record
+      #   is persisted to or will be persisted to.
+      def domain
+        @_domain
+      end
+
       # @return [Hash] A hash with attribute names as hash keys (strings) and 
       #   attribute values (of mixed types) as hash values.
       def attributes
@@ -450,7 +468,13 @@ module AWS
         # @param [String] name Defaults to the name of this class.
         # @return [String] Returns the full prefixed domain name for this class.
         def domain_name name = nil
-          "#{Record.domain_prefix}#{name || @_domain_name || self.to_s}"
+
+          name = @_domain_name if name.nil?
+          name = self.name if name.nil?
+          name = name.name if name.is_a?(SimpleDB::Domain)
+
+          "#{Record.domain_prefix}#{name}"
+
         end
 
         # Creates the SimpleDB domain that is configured for this class.
@@ -461,14 +485,19 @@ module AWS
         # @return [AWS::SimpleDB::Domain]
         #
         def create_domain name = nil
-          AWS::SimpleDB.new.domains.create(domain_name(name))
+          sdb.domains.create(domain_name(name))
         end
 
         # @return [AWS::SimpleDB::Domain] Returns a reference to the domain
         #   this class will save data to.
         # @private
         def sdb_domain name = nil
-          AWS::SimpleDB.new.domains[domain_name(name)]
+          sdb.domains[domain_name(name)]
+        end
+
+        protected
+        def sdb
+          AWS::SimpleDB.new
         end
 
       end
@@ -547,7 +576,14 @@ module AWS
       # @private
       private
       def sdb_item
-        self.class.sdb_domain.items[id]
+        sdb_domain.items[id]
+      end
+
+      # @return [SimpleDB::Domain] Returns the domain this record is
+      #   persisted to or will be persisted to.
+      private
+      def sdb_domain
+        self.class.sdb_domain(domain)
       end
 
       # @private
@@ -589,6 +625,7 @@ module AWS
       # @todo need to do something about partial hyrdation of attributes
       private
       def hydrate id, data
+
         @_id = id
   
         # New objects are populated with default values, but we don't

data/lib/aws/record/finder_methods.rb

@@ -29,11 +29,13 @@ module AWS
       #   Record::Base
       def find_by_id id, options = {}
 
-        data = sdb_domain(options[:domain]).items[id].data.attributes
+        domain = sdb_domain(options[:domain])
+
+        data = domain.items[id].data.attributes
 
         raise RecordNotFound, "no data found for id: #{id}" if data.empty?
 
-        obj = self.new
+        obj = self.new(:domain => domain)
         obj.send(:hydrate, id, data)
         obj
 
@@ -117,7 +119,7 @@ module AWS
       #
       # @return [Scope] Returns an enumerable scope object.
       def all options = {}
-        find(:all, options)
+        _new_scope.find(:all, options)
       end
 
       # Counts records in SimpleDB.
@@ -143,7 +145,7 @@ module AWS
       #   records are counted.
       # @option options [Integer] :limit The max number of records to count.
       def count(options = {})
-        find(:all).count(options)
+        _new_scope.count(options)
       end
       alias_method :size, :count
 
@@ -151,7 +153,7 @@ module AWS
       #   class.  If there are no records in the current classes domain, then
       #   nil is returned.
       def first options = {}
-        _new_scope.find(:first, options)
+        _new_scope.first(options)
       end
 
       # Limits which records are retried from SimpleDB when performing a find.

data/lib/aws/record/scope.rb

@@ -58,13 +58,34 @@ module AWS
       # @private
       def initialize base_class, options = {}
         @base_class = base_class
-        @options = options
+        @options = options.dup
+        @options[:where] ||= []
+        @options[:domain] ||= base_class.domain_name
       end
   
       # @return [Class] Returns the AWS::Record::Base extending class that
       #   this scope will find records for.
       attr_reader :base_class
 
+      def new attributes = {}
+
+        options = {}
+        options.merge!(attributes)
+        unless options.key?(:domain) or options.key?('domain')
+          options[:domain] = _domain
+        end
+
+        @options[:where].each do |conditions|
+          if conditions.size == 1 and conditions.first.is_a?(Hash)
+            options.merge!(conditions.first)
+          end
+        end
+
+        base_class.new(options)
+
+      end
+      alias_method :build, :new
+
       # @param [String] domain
       # @return [Scope] Returns a scope for restricting the domain of subsequent
       #   scope operations
@@ -102,7 +123,7 @@ module AWS
 
         case
         when id_or_mode == :all   then scope
-        when id_or_mode == :first then scope.limit(1).first
+        when id_or_mode == :first then scope.limit(1).to_a.first
         else
           base_class.find_by_id(id_or_mode, :domain => scope._domain)
         end
@@ -120,6 +141,12 @@ module AWS
       end
       alias_method :size, :count
 
+      # @return [Record::Base,nil] Gets the first record from the domain
+      #   and returns it, or returns nil if the domain is empty.
+      def first options = {}
+        _handle_options(options).find(:first)
+      end
+
       # Applies conditions to the scope that limit which records are returned.
       # Only those matching all given conditions will be returned.
       #
@@ -149,7 +176,7 @@ module AWS
         if conditions.empty?
           raise ArgumentError, 'missing required condition'
         end
-        _with(:where => Record.as_array(@options[:where]) + [conditions])
+        _with(:where => @options[:where] + [conditions])
       end
   
       # Specifies how to sort records returned.  
@@ -213,7 +240,7 @@ module AWS
         items = _item_collection
 
         items.select.each do |item_data|
-          obj = base_class.new
+          obj = base_class.new(:domain => _domain)
           obj.send(:hydrate, item_data.name, item_data.attributes)
           yield(obj)
         end
@@ -287,7 +314,7 @@ module AWS
         items = base_class.sdb_domain(_domain).items
         items = items.order(*@options[:order]) if @options[:order]
         items = items.limit(*@options[:limit]) if @options[:limit]
-        Record.as_array(@options[:where]).each do |where_condition|
+        @options[:where].each do |where_condition|
           items = items.where(*where_condition)
         end
         items