aws-sdk 1.2.6 → 1.3.0

data/lib/aws/record/validations.rb

@@ -26,7 +26,7 @@ require 'aws/record/validators/method'
 module AWS
   module Record
 
-    # Validation methods to be used with subclasses of AWS::Record::Base.
+    # Validation methods to be used with subclasses of AWS::Record::Model.
     #
     # = General Usage
     #
@@ -34,7 +34,7 @@ module AWS
     # Call the validation method followed by one more attribute names
     # and then an optional hash of modifiers.
     #
-    #   class Book < AWS::Record::Base
+    #   class Book < AWS::Record::Model
     #
     #     # ...
     #
@@ -89,7 +89,7 @@ module AWS
     # All of the validators can be used with configured attributes, but they
     # can also be used with any attribute that has a setter and a getter.
     #
-    #   Class Book < AWS::Record::Base
+    #   Class Book < AWS::Record::Model
     #
     #     attr_accessor :title
     #
@@ -156,7 +156,7 @@ module AWS
       # checkbox (like an EULA agreement or terms of service acknowledgement)
       # is checked.
       #
-      #   class User < AWS::Record::Base
+      #   class User < AWS::Record::Model
       #     boolean_attr :terms_of_service
       #     validates_acceptance_of :terms_of_service
       #   end
@@ -166,7 +166,7 @@ module AWS
       # If you choose to validate the acceptance of a non-existant attribute
       # then a setter and a getter will be added automtically for you.
       #
-      #   class User < AWS::Record::Base
+      #   class User < AWS::Record::Model
       #     validates_acceptance_of :terms_of_service
       #   end
       #
@@ -183,7 +183,7 @@ module AWS
       # * +nil+ implies the field was omitted from the form and therefore
       #   should not be validated
       #
-      #     class User < AWS::Record::Base
+      #     class User < AWS::Record::Model
       #       validates_acceptance_of :terms_of_service
       #     end
       #
@@ -237,7 +237,7 @@ module AWS
       # by requiring it twice:
       #
       #   Model:
-      #     class User < AWS::Record::Base
+      #     class User < AWS::Record::Model
       #       validates_confirmation_of :password, :if => :password_changed?
       #     end
       #
@@ -376,7 +376,7 @@ module AWS
 
       # Adds a block validator that is called during record validation.
       #
-      #   class ExampleClass < AWS::Record::Base
+      #   class ExampleClass < AWS::Record::Model
       #
       #     string_attr :name
       #
@@ -422,7 +422,7 @@ module AWS
       # You may use this with multi-valued attributes the same way you use it
       # with single-valued attributes:
       #
-      #   class Product < AWS::Record::Base
+      #   class Product < AWS::Record::Model
       #
       #     string_attr :tags, :set => true
       #
@@ -468,7 +468,7 @@ module AWS
       # You may use this with multi-valued attributes the same way you use it
       # with single-valued attributes:
       #
-      #   class Product < AWS::Record::Base
+      #   class Product < AWS::Record::Model
       #
       #     string_attr :tags, :set => true
       #
@@ -507,7 +507,7 @@ module AWS
       # Validates that the attribute value is included in the given enumerable
       # object.
       #
-      #   class MultipleChoiceAnswer < AWS::Record::Base
+      #   class MultipleChoiceAnswer < AWS::Record::Model
       #     validates_inclusion_of :letter, :in => %w(a b c d e)
       #   end
       #

data/lib/aws/s3/client.rb

@@ -877,11 +877,14 @@ module AWS
       end
 
       protected
-      def xml_error_response? response
-        (response.http_response.status >= 300 ||
-         response.request_type == :complete_multipart_upload) and
-          response.http_response.body and
-          Core::XmlGrammar.parse(response.http_response.body).respond_to?(:code)
+      def extract_error_code response
+        if (response.http_response.status >= 300 ||
+            response.request_type == :complete_multipart_upload) and
+            body = response.http_response.body and
+            parse = Core::XmlGrammar.parse(body) and
+            parse.respond_to?(:code)
+          parse.code
+        end
       end
 
       protected
@@ -901,7 +904,7 @@ module AWS
       def should_retry? response
         super or
           response.request_type == :complete_multipart_upload &&
-          xml_error_response?(response)
+          extract_error_code(response)
       end
 
       protected

data/lib/aws/s3/object_collection.rb

@@ -51,7 +51,7 @@ module AWS
     #   photos/2011/summer/vacation.jpg
     #   photos/2011/summer/family.jpg
     #
-    #   tree = bucket.objects.with_prefix.prefix('photos').as_tree
+    #   tree = bucket.objects.with_prefix('photos').as_tree
     #
     #   directories = tree.children.select(&:branch?).collect(&:prefix)
     #   #=> ['photos/2010', 'photos/2011']

data/lib/aws/simple_db/expect_condition_option.rb

@@ -29,7 +29,7 @@ module AWS
               :name => expected_name.to_s,
               :value => expected_value
             }
-          when :unless
+          when :unless, :unless_exists
             expected << {
               :name => value.to_s,
               :exists => false

data/lib/aws/simple_db/item_collection.rb

@@ -165,13 +165,15 @@ module AWS
       #   nil is returned.
       #
       def each options = {}, &block
+        super
+      end
 
+      # @private
+      def each_batch options = {}, &block
         handle_query_options(options) do |collection, opts|
-          return collection.each(opts, &block)
+          return collection.each_batch(opts, &block)
         end
-
         super
-
       end
 
       # Counts the items in the collection.

data/lib/aws/sts/client.rb

@@ -31,6 +31,15 @@ module AWS
 
       configure_client
 
+      def initialize *args
+        super
+        unless config.use_ssl?
+          msg = 'AWS Security Token Service (STS) requires ssl but the ' + 
+            ':use_ssl option is set to false.  Try passing :use_ssl => true'
+          raise ArgumentError, msg
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
-  version: 1.2.6
+  segments: 
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -10,52 +15,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 Z
+date: 2012-01-17 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
         version: "2.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
         version: "0.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
   type: :runtime
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
         version: "1.4"
   type: :runtime
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id004
 description: AWS SDK for Ruby
 email: 
 executables: []
@@ -83,6 +106,7 @@ files:
 - lib/aws/core/configuration.rb
 - lib/aws/core/configured_client_methods.rb
 - lib/aws/core/configured_grammars.rb
+- lib/aws/core/configured_json_client_methods.rb
 - lib/aws/core/configured_option_grammars.rb
 - lib/aws/core/configured_xml_grammars.rb
 - lib/aws/core/default_signer.rb
@@ -107,9 +131,27 @@ files:
 - lib/aws/core/response.rb
 - lib/aws/core/response_cache.rb
 - lib/aws/core/service_interface.rb
+- lib/aws/core/session_signer.rb
 - lib/aws/core/uri_escape.rb
 - lib/aws/core/xml_grammar.rb
 - lib/aws/core.rb
+- lib/aws/dynamo_db/attribute_collection.rb
+- lib/aws/dynamo_db/batch_get.rb
+- lib/aws/dynamo_db/client.rb
+- lib/aws/dynamo_db/config.rb
+- lib/aws/dynamo_db/errors.rb
+- lib/aws/dynamo_db/expectations.rb
+- lib/aws/dynamo_db/item.rb
+- lib/aws/dynamo_db/item_collection.rb
+- lib/aws/dynamo_db/item_data.rb
+- lib/aws/dynamo_db/keys.rb
+- lib/aws/dynamo_db/primary_key_element.rb
+- lib/aws/dynamo_db/request.rb
+- lib/aws/dynamo_db/resource.rb
+- lib/aws/dynamo_db/table.rb
+- lib/aws/dynamo_db/table_collection.rb
+- lib/aws/dynamo_db/types.rb
+- lib/aws/dynamo_db.rb
 - lib/aws/ec2/attachment.rb
 - lib/aws/ec2/attachment_collection.rb
 - lib/aws/ec2/availability_zone.rb
@@ -203,26 +245,22 @@ files:
 - lib/aws/iam/user_policy_collection.rb
 - lib/aws/iam.rb
 - lib/aws/rails.rb
-- lib/aws/record/attribute.rb
-- lib/aws/record/attribute_macros.rb
-- lib/aws/record/attributes/boolean.rb
-- lib/aws/record/attributes/date.rb
-- lib/aws/record/attributes/datetime.rb
-- lib/aws/record/attributes/float.rb
-- lib/aws/record/attributes/integer.rb
-- lib/aws/record/attributes/sortable_float.rb
-- lib/aws/record/attributes/sortable_integer.rb
-- lib/aws/record/attributes/string.rb
-- lib/aws/record/base.rb
+- lib/aws/record/abstract_base.rb
+- lib/aws/record/attributes.rb
 - lib/aws/record/conversion.rb
 - lib/aws/record/dirty_tracking.rb
 - lib/aws/record/errors.rb
 - lib/aws/record/exceptions.rb
-- lib/aws/record/finder_methods.rb
+- lib/aws/record/hash_model/attributes.rb
+- lib/aws/record/hash_model/finder_methods.rb
+- lib/aws/record/hash_model/scope.rb
+- lib/aws/record/hash_model.rb
+- lib/aws/record/model/attributes.rb
+- lib/aws/record/model/finder_methods.rb
+- lib/aws/record/model/scope.rb
+- lib/aws/record/model.rb
 - lib/aws/record/naming.rb
-- lib/aws/record/optimistic_locking.rb
 - lib/aws/record/scope.rb
-- lib/aws/record/scopes.rb
 - lib/aws/record/validations.rb
 - lib/aws/record/validator.rb
 - lib/aws/record/validators/acceptance.rb
@@ -334,6 +372,7 @@ files:
 - lib/net/http/connection_pool/connection.rb
 - lib/net/http/connection_pool/session.rb
 - lib/net/http/connection_pool.rb
+- lib/aws/api_config/DynamoDB-2011-12-05.yml
 - lib/aws/api_config/EC2-2011-02-28.yml
 - lib/aws/api_config/ELB-2011-08-15.yml
 - lib/aws/api_config/IAM-2010-07-15.yml
@@ -347,6 +386,7 @@ files:
 - README.rdoc
 - NOTICE.txt
 - LICENSE.txt
+has_rdoc: true
 homepage: http://aws.amazon.com/sdkforruby
 licenses: 
 - Apache 2.0
@@ -360,7 +400,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2254749614229087864
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -369,11 +409,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby

data/lib/aws/record/attribute.rb

@@ -1,94 +0,0 @@
-# Copyright 2011-2012 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.
-
-module AWS
-  module Record
-
-    # Base class for all of the AWS::Record attributes.
-    # @private
-    class Attribute
-
-      # @param [Symbol] Name of this attribute.  It should be a name that
-      #   is safe to use as a method.
-      # @param [Hash] options
-      # @option options [Boolean] :set (false) When true this attribute can
-      #   accept multiple unique values.  
-      def initialize name, options = {}
-        @name = name.to_s
-        @options = options.dup
-        if options[:set] and !self.class.allow_set?
-          raise ArgumentError, "invalid option :set for #{self.class}"
-        end
-      end
-
-      # @return [String] The name of this attribute
-      attr_reader :name
-
-      # @return [Hash] The hash of options this attribute was constructed with
-      attr_reader :options
-
-      # @return [Boolean] Returns true if this attribute can have 
-      #   multiple values.
-      def set?
-        options[:set] ? true : false
-      end
-
-      # @return Returns the default value for this attribute.  Defaults to nil.
-      def default_value
-        options[:default_value]
-      end
-
-      # @param [Mixed] A single value to type cast.
-      # @return [Mixed] Returns the type casted value.
-      def type_cast raw_value
-        self.class.type_cast(raw_value, options)
-      end
-
-      # @param [String] The serialized string value.
-      # @return [Mixed] Returns a deserialized type-casted value.
-      def deserialize serialized_value
-        self.class.deserialize(serialized_value, options)
-      end
-
-      # Takes the type casted value and serializes it
-      # @param [Mixed] A single value to serialize.
-      # @return [Mixed] Returns the serialized value.
-      def serialize type_casted_value
-        self.class.serialize(type_casted_value, options)
-      end
-      
-      # @param [String] serialized_value The string value as returned from AWS.
-      # @return [Mixed] Returns the type-casted deserialized value.
-      def self.deserialize serialized_value, options = {}
-        self.type_cast(serialized_value, options)
-      end
-
-      # @return [Boolean] Returns true if this attribute type can be used
-      #   with the +:set => true+ option.  Certain attirbutes can not 
-      #   be represented with multiple values (like BooleanAttribute).
-      def self.allow_set?
-        raise 'allow_set? must be defined in subclasses'
-      end
-
-      # @private
-      protected
-      def self.expect klass, value, &block
-        unless value.is_a?(klass)
-          raise ArgumentError, "expected a #{klass} value, got #{value.class}"
-        end
-        yield
-      end
-
-    end
-  end
-end