aws-sdk-core 2.0.0.rc3 → 2.0.0.rc4

data/lib/aws/error_handler.rb

@@ -24,9 +24,9 @@ module Aws
     private
 
     def error(context, code, message)
-      svc_class_name = context.config.api.metadata['service_class_name']
-      klass = Errors.error_class(svc_class_name, code)
-      Errors.error_class(svc_class_name, code).new(context, message)
+      svc = context.client.class.name.split('::')[1]
+      errors_module = Aws.const_get(svc).const_get(:Errors)
+      errors_module.error_class(code).new(context, message)
     end
 
     def empty_body?(response)

data/lib/aws/errors.rb

@@ -57,24 +57,18 @@ module Aws
         const_set(constant, Class.new(ServiceError))
       end
 
-    end
-
-    class << self
-
       # Given the name of a service and an error code, this method
       # returns an error class (that extends {ServiceError}.
       #
-      #     Aws::Errors.error_class('S3', 'NoSuchBucket').new
+      #     Aws::S3::Errors.error_class('NoSuchBucket').new
       #     #=> #<Aws::S3::Errors::NoSuchBucket>
       #
       # @api private
-      def error_class(svc_class_name, error_code)
-        constant = error_code.to_s.gsub(/\W+/, '').to_sym
-        errors = Aws.const_get(svc_class_name).const_get(:Errors)
-        if errors.constants.include?(constant)
-          errors.const_get(constant)
+      def error_class(contstant)
+        if constants.include?(contstant.to_sym)
+          const_get(contstant)
         else
-          errors.const_set(constant, Class.new(ServiceError))
+          const_set(contstant, Class.new(ServiceError))
         end
       end
 

data/lib/aws/plugins/glacier_checksums.rb

@@ -56,7 +56,7 @@ module Aws
         def compute_checksums(body, &block)
 
           tree_hash = TreeHash.new
-          digest = OpenSSL::Digest::Digest.new('sha256')
+          digest = OpenSSL::Digest.new('sha256')
 
           # if the body is empty/EOF, then we should compute the
           # digests of the empty string

data/lib/aws/plugins/s3_complete_multipart_upload_fix.rb

@@ -21,7 +21,7 @@ module Aws
           if xml['Error']
             error_code = xml['Error']['Code']
             error_message = xml['Error']['Message']
-            Errors.error_class('S3', error_code).new(error_message)
+            S3::Errors.error_class(error_code).new(response.context, error_message)
           end
         end
 

data/lib/aws/signers/base.rb

@@ -11,7 +11,7 @@ module Aws
 
       def sha256_hmac(value)
         Base64.encode64(
-          OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'),
+          OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'),
             @credentials.secret_access_key, value)
         ).strip
       end

data/lib/aws/signers/s3.rb

@@ -69,7 +69,7 @@ module Aws
       end
 
       def hmac(key, value)
-        OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), key, value)
+        OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), key, value)
       end
 
       # From the S3 developer guide:

data/lib/aws/signers/v4.rb

@@ -119,11 +119,11 @@ module Aws
       end
 
       def hmac(key, value)
-        OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), key, value)
+        OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha256'), key, value)
       end
 
       def hexhmac(key, value)
-        OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha256'), key, value)
+        OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), key, value)
       end
 
       private

data/lib/aws/tree_hash.rb

@@ -31,7 +31,7 @@ module Aws
   class TreeHash
 
     def initialize(hashes = [])
-      @digest = OpenSSL::Digest::Digest.new('sha256')
+      @digest = OpenSSL::Digest.new('sha256')
       @hashes = hashes
     end
 
@@ -49,7 +49,7 @@ module Aws
 
     def digest
       hashes = @hashes
-      digest = OpenSSL::Digest::Digest.new('sha256')
+      digest = OpenSSL::Digest.new('sha256')
       until hashes.count == 1
         hashes = hashes.each_slice(2).map do |h1,h2|
           digest.reset

data/lib/aws/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.0.rc3'
+  VERSION = '2.0.0.rc4'
 end

data/spec/aws/service_spec.rb

@@ -235,13 +235,27 @@ module Aws
         expect(err_class.new).to be_kind_of(Errors::ServiceError)
       end
 
+    end
+
+    describe 'DynamicErrors module' do
+
       it 'allows you to create error classes named like Ruby classes' do
-        error_class = Aws::Errors.error_class('S3', 'Range')
+        mod = Module.new
+        mod.extend(Aws::Errors::DynamicErrors)
+        error_class = mod.error_class('Range')
         expect(error_class).not_to be(Range)
-        expect(error_class).to be(Aws::S3::Errors::Range)
+        expect(error_class).to be(mod::Range)
         expect(error_class.ancestors).to include(Errors::ServiceError)
       end
 
+      it 'always returns the same error class given the same error code' do
+        mod = Module.new
+        mod.extend(Aws::Errors::DynamicErrors)
+        klass2 = mod.error_class(:Range)
+        klass1 = mod.error_class('Range')
+        expect(klass1).to be(klass2)
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json