aws-sdk 1.6.5 → 1.6.6

data/lib/aws/s3/cors_rule_collection.rb

@@ -0,0 +1,192 @@
+# 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
+  class S3
+
+    # Manages the CORS rules for a single bucket.
+    #
+    # == Getting Rules
+    #
+    # To get the CORS rules for a bucket, use the {Bucket#cors} method.  This
+    # returns a CORSRuleCollection for the bucket.  The collection is
+    # enumerable.
+    #
+    #   # enumerating all rules for a buck
+    #   bucket.cors.each do |rule|
+    #     # rule is a CORSRule object
+    #   end
+    #
+    # == Setting Rules
+    #
+    # You can set the rules for a bucket (replacing all existing rules) using
+    # the {#set} method.
+    #
+    #   # accepts a list of one or more rules
+    #   bucket.rules.set(rule1, rule2)
+    #
+    #   # rules can be an array of rules
+    #   bucket.rules.set(rules)
+    #
+    #   # passing an empty list or array removes all rules
+    #   bucket.rules.set([])
+    #   bucket.rules.clear # does the same thing
+    #
+    # Each rule can be a Hash, a {CORSRule} or another {CORSRuleCollection}.
+    # See {Client#put_bucket_cors} for a list of keys for a rule hash.
+    #
+    # == Adding Rules
+    #
+    # Adding rules is the same as setting rules.  Rules you add will be
+    # appended to the end of the existing list of rules.
+    #
+    #   # add one or more rules
+    #   bucket.rules.add(rules)
+    #
+    # == Deleting Rules
+    #
+    # To remove a rule, use the {#delete_if} method.
+    #
+    #   # delete rules that allow access from any domain
+    #   bucket.cors.delete_if{|rule| rule.allowed_origins.include?('*')
+    #
+    class CORSRuleCollection
+
+      include Core::Collection::Simple
+
+      # @param [Bucket] bucket
+      # @param [Hash] options
+      def initialize bucket, options = {}
+        @bucket = bucket
+        super
+      end
+
+      # @return [Bucket]
+      attr_reader :bucket
+
+      # Replaces the CORS rules attached to this bucket.  You can pass
+      # one or more rules as an array or a list.
+      #
+      #   # replace all exisitng rules with a single rule
+      #   bucket.cors.set(
+      #     :allowed_methods => %w(GET),
+      #     :allowed_origins => %w(http://*.mydomain.com),
+      #     :max_age_seconds => 3600)
+      #
+      # If you pass an empty array, all of the rules will be removed from
+      # the bucket.
+      #
+      #    # these two lines are equivilent
+      #    bucket.cors.clear
+      #    bucket.cors.set([])
+      #
+      # @param [Hash,CORSRule,CORSRuleCollection] rule A list or array
+      #   of one or more rules to set.  Each rule may be a Hash, a CORSRule
+      #   or a CORSRuleCollection.
+      #
+      # @return [nil]
+      #
+      def set *rules
+
+        raise ArgumentError, 'expected one or more rules' if rules.empty?
+
+        if rules == [[]]
+          self.clear
+        else
+          rules = rule_hashes(rules)
+          client.put_bucket_cors(:bucket_name => bucket.name, :rules => rules)
+        end
+
+        nil
+
+      end
+
+      # Add one or more CORS rules to this bucket.
+      #
+      #   # adding a single rule as a hash
+      #   bucket.cors.add(
+      #     :allowed_methods => %w(GET HEAD),
+      #     :allowed_origins => %w(*),
+      #     :max_age_seconds => 3600)
+      #
+      # You can add multiple rules in a single call:
+      #
+      #   # each rule may be a hash, CORSRule or a CORSRuleCollection,
+      #   bucket.cors.add(rules)
+      #
+      #   # alternatively you can pass a list of rules
+      #   bucket.cors.add(rule1, rule2, ...)
+      #
+      # @param (see #set)
+      # @return (see #set)
+      def add *rules
+        self.set(self, *rules)
+      end
+      alias_method :create, :add
+
+      # Deletes every rule for which the block evaluates to +true+.
+      #
+      #   # remove all rules that are open to the 'world'
+      #   bucket.cors.delete_if{|rule| rule.allowed_origins.include?('*') }
+      #
+      # @yield [rule]
+      # @yieldparam [CORSRule] rule
+      # @yieldreturn [Boolean] Return +true+ for each rule you want to delete.
+      # @return (see #set)
+      def delete_if &block
+        rules = []
+        self.each do |rule|
+          rules << rule unless yield(rule)
+        end
+        self.set(*rules)
+      end
+
+      # Removes all CORS rules attached to this bucket.
+      #
+      #   bucket.cors.count #=> 3
+      #   bucket.cors.clear
+      #   bucket.cors.count #=> 0
+      #
+      # @return [nil]
+      def clear
+        client.delete_bucket_cors(:bucket_name => bucket.name)
+        nil
+      end
+
+      protected
+
+      def _each_item options
+        resp = client.get_bucket_cors(options.merge(:bucket_name => bucket.name))
+        resp.data[:rules].each do |rule|
+          yield(CORSRule.new(rule))
+        end
+      rescue AWS::S3::Errors::NoSuchCORSConfiguration
+        # no cors rules exist for this bucket, nothing to yield
+      end
+
+      def rule_hashes rule
+        case rule
+        when Hash then rule
+        when CORSRule then rule.to_h
+        when CORSRuleCollection then rule.map(&:to_h)
+        when Array then rule.map{|r| rule_hashes(r) }.flatten
+        else
+          msg = "Expected one or more CORSRule, CORSRuleCollection or hash"
+          msg << ", got #{rule.class.name}"
+          raise ArgumentError, msg
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/s3/request.rb

@@ -180,7 +180,7 @@ module AWS
         def sub_resources
           %w(acl location logging notification partNumber policy
              requestPayment torrent uploadId uploads versionId
-             versioning versions delete lifecycle)
+             versioning versions delete lifecycle tagging cors)
         end
 
         def query_parameters

data/lib/aws/s3/s3_object.rb

@@ -1384,9 +1384,11 @@ module AWS
         # Ensure metadata exists
         options[:metadata] = {} unless options[:metadata]
 
+        matdesc = options[:encryption_matdesc] || config.s3_encryption_matdesc
+
         encryption_materials = {'x-amz-key' => enc_envelope_key,
                                 'x-amz-iv'  => enc_envelope_iv,
-                                'x-amz-matdesc' => "{}"}
+                                'x-amz-matdesc' => matdesc}
         orig_headers = {}
 
         # Save the unencrypted content length

metadata

@@ -1,86 +1,92 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: aws-sdk
-version: !ruby/object:Gem::Version
-  version: 1.6.5
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 1
+  - 6
+  - 6
+  version: 1.6.6
 platform: ruby
-authors:
+authors: 
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-09-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  name: uuidtools
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
+  name: nokogiri
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  name: json
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+  requirement: *id004
 description: AWS SDK for Ruby
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - ca-bundle.crt
 - rails/init.rb
 - lib/aws/auto_scaling/activity.rb
@@ -386,11 +392,14 @@ files:
 - lib/aws/s3/bucket.rb
 - lib/aws/s3/bucket_collection.rb
 - lib/aws/s3/bucket_lifecycle_configuration.rb
+- lib/aws/s3/bucket_tag_collection.rb
 - lib/aws/s3/bucket_version_collection.rb
 - lib/aws/s3/cipher_io.rb
 - lib/aws/s3/client/xml.rb
 - lib/aws/s3/client.rb
 - lib/aws/s3/config.rb
+- lib/aws/s3/cors_rule.rb
+- lib/aws/s3/cors_rule_collection.rb
 - lib/aws/s3/data_options.rb
 - lib/aws/s3/encryption_utils.rb
 - lib/aws/s3/errors.rb
@@ -502,7 +511,6 @@ files:
 - lib/net/http/connection_pool/connection.rb
 - lib/net/http/connection_pool/session.rb
 - lib/net/http/connection_pool.rb
-- lib/user.rb
 - lib/aws/api_config/AutoScaling-2011-01-01.yml
 - lib/aws/api_config/CloudFormation-2010-05-15.yml
 - lib/aws/api_config/CloudFront-2012-05-05.yml
@@ -524,31 +532,37 @@ files:
 - NOTICE.txt
 - LICENSE.txt
 homepage: http://aws.amazon.com/sdkforruby
-licenses:
+licenses: 
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -4596701733449318258
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby
 test_files: []
+

data/lib/user.rb

@@ -1,49 +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.
-
-class User < AWS::Record::HashModel
-
-  set_shard_name 'ruby-users'
-
-  optimistic_locking
-
-  ## attributes
-
-  string_attr :username
-  string_attr :role
-  string_attr :tags, :set => true
-
-  boolean_attr :verified, :default => false
-
-  timestamps
-
-  ## validations
-
-  validates_presence_of :username, :role
-
-  validates_inclusion_of :role, 
-    :in => %w(root admin member), 
-    :allow_nil => true
-
-  validates_length_of :username, 
-    :within => 3..20, 
-    :allow_nil => true
-
-  validates_format_of :username, :tags,
-    :with => /^[a-z0-9]+$/i, 
-    :allow_nil => true,
-    :message => 'may only be letters and numbers'
-
-  validates_count_of :tags, :maximum => 3
-
-end