aws-sdk 1.0.1 → 1.0.2

data/lib/aws/record/scopes.rb

@@ -0,0 +1,55 @@
+# 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 'aws/simple_db'
+require 'aws/record/scope'
+
+module AWS
+  module Record
+
+    module Scopes
+
+      # Adds a scoped finder method to this class.  Given a call
+      # to scope like:
+      #
+      #   scope :top_10, order(:popularity, :desc).limit(10) 
+      #
+      # Then you can call the method +top_10+ on the class and it will
+      # return an enumerable scope object with the given find conditions.
+      #
+      # @param [Symbol] name The name of the scope.  Scope names should be
+      #   method-safe and should not conflict with any other class methods.
+      #
+      def scope name, scope = nil, &block
+        
+        raise ArgumentError, "only a scope or block may be passed, not both" if
+          scope and block_given?
+
+        method_definition = scope ? 
+          lambda{ scope } :
+          block
+
+        extend(Module.new { define_method(name, &method_definition) })
+
+      end
+
+      # @return [Scope] Returns a new scope object for this class.
+      # @private
+      private
+      def _new_scope
+        Scope.new(self)
+      end
+
+    end
+  end
+end

data/lib/aws/s3/bucket_collection.rb

@@ -41,6 +41,19 @@ module AWS
 
       # Creates and returns a new Bucket.  For example:
       #
+      # @note If your bucket name contains one or more periods and it
+      #   is hosted in a non-US region, you should make requests
+      #   against the bucket using the S3 endpoint specific to the
+      #   region in which your bucket resides. For example:
+      #
+      #     s3 = AWS::S3.new(:s3_endpoint => "s3-eu-west-1.amazonaws.com")
+      #     bucket = s3.buckets.create("my.eu.bucket")
+      #
+      #   For a full list of endpoints and regions, see
+      #   {http://docs.amazonwebservices.com/general/latest/gr/index.html?rande.html
+      #   Regions and Endpoints} in the Amazon Web Services General
+      #   Reference.
+      #
       # @example
       #
       #   bucket = s3.buckets.create('my-bucket')

data/lib/aws/s3/client.rb

@@ -827,6 +827,20 @@ module AWS
           validate_bucket_name!(bucket_name) rescue false
         end
 
+        # Returns true if the given +bucket_name+ is DNS compatible.
+        #
+        # DNS compatible bucket names may be accessed like:
+        #
+        #   http://dns.compat.bucket.name.s3.amazonaws.com/
+        #
+        # Whereas non-dns compatible bucket names must place the bucket
+        # name in the url path, like:
+        #
+        #   http://s3.amazonaws.com/dns_incompat_bucket_name/
+        #   
+        # @return [Boolean] Returns true if the given bucket name may be
+        #   is dns compatible.  
+        #   this bucket n
         def dns_compatible_bucket_name?(bucket_name)
           return false if
             !valid_bucket_name?(bucket_name) or
@@ -850,6 +864,27 @@ module AWS
           true
         end
 
+        # Returns true if the bucket name must be used in the request
+        # path instead of as a sub-domain when making requests against
+        # S3.  
+        #
+        # This can be an issue if the bucket name is DNS compatible but 
+        # contains '.' (periods).  These cause the SSL certificate to
+        # become invalid when making authenticated requets over SSL to the
+        # bucket name.  The solution is to send this as a path argument
+        # instead.
+        # 
+        # @return [Boolean] Returns true if the bucket name should be used
+        #   as a path segement instead of dns prefix when making requests
+        #   against s3.  
+        def path_style_bucket_name? bucket_name
+          if dns_compatible_bucket_name?(bucket_name)
+            bucket_name =~ /\./ ? true : false
+          else
+            true
+          end
+        end
+
         protected
         def validate! name, value, &block
           if error_msg = yield

data/lib/aws/s3/data_options.rb

@@ -32,7 +32,7 @@ module AWS
 
         # string, pathname, file, io-like object, etc
         data = options[:data]
-        file_opts = ["r"]
+        file_opts = ["rb"]
         file_opts << { :encoding => "BINARY" } if Object.const_defined?(:Encoding)
         case
         when data.is_a?(String)

data/lib/aws/s3/policy.rb

@@ -16,7 +16,7 @@ require 'aws/policy'
 module AWS
   class S3
 
-    # @private
+    # @see AWS::Policy
     class Policy < AWS::Policy
 
       class Statement < AWS::Policy::Statement

data/lib/aws/s3/request.rb

@@ -53,16 +53,12 @@ module AWS
       end
 
       def host
-        Client.dns_compatible_bucket_name?(bucket) ?
-          "#{bucket}.#{@host}" : 
-          @host
+        Client.path_style_bucket_name?(bucket) ? @host : "#{bucket}.#{@host}"
       end
 
       def path
         parts = []
-        unless bucket.nil? or Client.dns_compatible_bucket_name?(bucket)
-          parts << bucket 
-        end
+        parts << bucket if bucket and Client.path_style_bucket_name?(bucket)
         parts << key if key
         "/#{parts.join('/')}"
       end
@@ -131,23 +127,25 @@ module AWS
 
         # virtual hosted-style requests require the hostname to appear
         # in the canonicalized resource prefixed by a forward slash.
-        if Client.dns_compatible_bucket_name?(bucket)
+        if 
+          Client.dns_compatible_bucket_name?(bucket) and
+          !Client.path_style_bucket_name?(bucket)
+        then
           parts << "/#{bucket}"
         end
- 
+  
         # all requests require the portion of the un-decoded uri up to
         # but not including the query string
         parts << path
  
         # lastly any sub resource querystring params need to be appened
         # in lexigraphical ordered joined by '&' and prefixed by '?'
-        params = (sub_resource_params +
-                  query_parameters_for_signature)
+        params = (sub_resource_params + query_parameters_for_signature)
         unless params.empty?
           parts << '?'
           parts << params.sort.collect{|p| p.to_s }.join('&')
         end
- 
+
         parts.join
       end
 

data/lib/aws/s3/s3_object.rb

@@ -85,7 +85,7 @@ module AWS
       # @param [Hash] options
       # @option options [String] :version_id Which version of this object
       #   to make a HEAD request against.
-      # @return [Response] A head object response with metatadata, 
+      # @return A head object response with metatadata, 
       #   content_length, content_type and etag.
       def head options = {}
         client.head_object(options.merge(
@@ -122,11 +122,12 @@ module AWS
       # @option [String] :version_id (nil) If present the specified version
       #   of this object will be deleted.  Only works for buckets that have
       #   had versioning enabled.
-      # @return [Response]
+      # @return [nil]
       def delete options = {}
         options[:bucket_name] = bucket.name
         options[:key] = key
         client.delete_object(options)
+        nil
       end
 
       # @option [String] :version_id (nil) If present the metadata object
@@ -552,13 +553,13 @@ module AWS
       #   AccessControlList#initialize.
       #
       # @param (see Bucket#acl=)
-      # @return [Response]
-      #
+      # @return [nil]
       def acl=(acl)
         client.set_object_acl(
           :bucket_name => bucket.name,
           :key => key,
           :acl => acl)
+        nil
       end
 
       # @private

data/lib/aws/sns.rb

@@ -28,7 +28,7 @@ module AWS
   #
   # For more information about Amazon SNS:
   #
-  # * {Amazon SNS}[http://aws.amazon.com/simpledb/]
+  # * {Amazon SNS}[http://aws.amazon.com/sns/]
   # * {Amazon SNS Documentation}[http://aws.amazon.com/documentation/sns/]
   #
   # = Credentials
@@ -46,9 +46,6 @@ module AWS
   #     :access_key_id => 'YOUR_ACCESS_KEY_ID',
   #     :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
   #
-  # = Understanding the SNS Interface
-  #
-  # ...
   class SNS
 
     include ServiceInterface

data/lib/aws/sns/policy.rb

@@ -16,7 +16,7 @@ require 'aws/policy'
 module AWS
   class SNS
 
-    # @private
+    # @see AWS::Policy
     class Policy < AWS::Policy
 
       class Statement < AWS::Policy::Statement

data/lib/aws/sqs/policy.rb

@@ -16,7 +16,7 @@ require 'aws/policy'
 module AWS
   class SQS
 
-    # @private
+    # @see AWS::Policy
     class Policy < AWS::Policy
 
       class Statement < AWS::Policy::Statement

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 -07:00
+date: 2011-07-21 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2158760920 !ruby/object:Gem::Requirement
+  requirement: &2155405840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2158760920
+  version_requirements: *2155405840
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2158760460 !ruby/object:Gem::Requirement
+  requirement: &2155405080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2158760460
+  version_requirements: *2155405080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2158759980 !ruby/object:Gem::Requirement
+  requirement: &2155394520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2158759980
+  version_requirements: *2155394520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2158759520 !ruby/object:Gem::Requirement
+  requirement: &2155393900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2158759520
+  version_requirements: *2155393900
 description: AWS SDK for Ruby
 email: 
 executables: []
@@ -123,7 +123,6 @@ files:
 - lib/aws/ec2/volume_collection.rb
 - lib/aws/ec2.rb
 - lib/aws/errors.rb
-- lib/aws/http/builtin_handler.rb
 - lib/aws/http/curb_handler.rb
 - lib/aws/http/handler.rb
 - lib/aws/http/httparty_handler.rb
@@ -156,7 +155,9 @@ files:
 - lib/aws/record/exceptions.rb
 - lib/aws/record/finder_methods.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
@@ -283,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3178253575301581896
+      hash: 437793363847079671
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/aws/http/builtin_handler.rb

@@ -1,69 +0,0 @@
-# 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 'net/http'
-require 'net/https'
-
-module AWS
-  module Http
-    
-    # @private
-    class BuiltinHandler
-
-      def handle(request, response)
-
-        http = Net::HTTP.new(request.host, request.use_ssl? ? 443 : 80)
-
-        # http://www.ruby-lang.org/en/news/2007/10/04/net-https-vulnerability/
-        if request.use_ssl?
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          store = OpenSSL::X509::Store.new
-          store.set_default_paths
-          http.cert_store = store
-        end
-
-        http.start do 
-
-          # Net::HTTP adds this header for us when the body is
-          # provided, but it messes up signing
-          headers = { 'content-type' => '' }
-
-          # Net::HTTP calls strip on each header value, this causes errors
-          # when the values are numbers (like Content-Length)
-          request.headers.each_pair do |key,value|
-            headers[key] = value.to_s
-          end
-
-          http_request_class = case request.http_method
-          when 'HEAD'   then Net::HTTP::Head
-          when 'GET'    then Net::HTTP::Get
-          when 'PUT'    then Net::HTTP::Put
-          when 'POST'   then Net::HTTP::Post
-          when 'DELETE' then Net::HTTP::Delete
-          else raise "unsupported http request method: #{request.http_method}"
-          end
-
-          http_request = http_request_class.new(request.uri, headers)
-          http.request(http_request, request.body) do |http_response|
-            response.body = http_response.body
-            response.status = http_response.code.to_i
-            response.headers = http_response.to_hash
-          end
-
-        end
-      end
-
-    end
-  end
-end