Bump to aws-sdk and fix AWS to Aws namespace.

Author: Jeff Dutil

aws-sessionstore-dynamodb.gemspec

@@ -13,6 +13,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'aws-sdk-v1'
+  spec.add_dependency 'aws-sdk'
   spec.add_dependency 'rack', '~> 1.0'
 end

lib/aws/session_store/dynamo_db/configuration.rb

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 require 'yaml'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 module AWS::SessionStore::DynamoDB
   # This class provides a Configuration object for all DynamoDB transactions
@@ -66,8 +66,7 @@ class Configuration
       :lock_expiry_time => 500,
       :lock_retry_delay => 500,
       :lock_max_wait_time => 1,
-      :secret_key => nil,
-      :api_version => '2012-08-10'
+      :secret_key => nil
     }
 
     # @return [String] Session table name.
@@ -203,7 +202,7 @@ def to_hash
     # @return [Hash] DDB client.
     def gen_dynamo_db_client
       client_opts = client_subset(@options)
-      client = AWS::DynamoDB::Client
+      client = Aws::DynamoDB::Client
       dynamo_db_client = @options[:dynamo_db_client] || client.new(client_opts)
       {:dynamo_db_client => dynamo_db_client}
     end

lib/aws/session_store/dynamo_db/errors/default_handler.rb

@@ -17,8 +17,8 @@ module AWS::SessionStore::DynamoDB::Errors
   class DefaultHandler < AWS::SessionStore::DynamoDB::Errors::BaseHandler
     # Array of errors that will always be passed up the Rack stack.
     HARD_ERRORS = [
-      AWS::DynamoDB::Errors::ResourceNotFoundException,
-      AWS::DynamoDB::Errors::ConditionalCheckFailedException,
+      Aws::DynamoDB::Errors::ResourceNotFoundException,
+      Aws::DynamoDB::Errors::ConditionalCheckFailedException,
       AWS::SessionStore::DynamoDB::MissingSecretKeyError,
       AWS::SessionStore::DynamoDB::LockWaitTimeoutError
     ]

lib/aws/session_store/dynamo_db/garbage_collection.rb

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 module AWS::SessionStore::DynamoDB
   # Collects and deletes unwanted sessions based on

lib/aws/session_store/dynamo_db/locking/base.rb

@@ -56,7 +56,7 @@ def delete_session(env, sid)
     def handle_error(env = nil, &block)
       begin
         yield
-      rescue AWS::DynamoDB::Errors::Base => e
+      rescue Aws::DynamoDB::Errors::Base => e
         @config.error_handler.handle_error(e, env)
       end
     end

lib/aws/session_store/dynamo_db/locking/pessimistic.rb

@@ -43,7 +43,7 @@ def get_session_with_lock(env, sid)
         exceeded_wait_time?(max_attempt_date)
         begin
           result = attempt_set_lock(sid)
-        rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException
+        rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException
           expires_at ||= get_expire_date(sid)
           next if expires_at.nil?
           result = bust_lock(sid, expires_at)

lib/aws/session_store/dynamo_db/rack_middleware.rb

@@ -13,7 +13,7 @@
 
 require 'rack/session/abstract/id'
 require 'openssl'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 module AWS::SessionStore::DynamoDB
   # This class is an ID based Session Store Rack Middleware
@@ -99,7 +99,7 @@ def destroy_session(env, sid, options)
     def handle_error(env = nil, &block)
       begin
         yield
-      rescue AWS::DynamoDB::Errors::Base,
+      rescue Aws::DynamoDB::Errors::Base,
              AWS::SessionStore::DynamoDB::InvalidIDError => e
         @config.error_handler.handle_error(e, env)
       end

lib/aws/session_store/dynamo_db/table.rb

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'logger'
 
 module AWS::SessionStore::DynamoDB
@@ -30,7 +30,7 @@ def create_table(options = {})
       logger << "Table #{config.table_name} created, waiting for activation...\n"
       block_until_created(config)
       logger << "Table #{config.table_name} is now ready to use.\n"
-    rescue AWS::DynamoDB::Errors::ResourceInUseException
+    rescue Aws::DynamoDB::Errors::ResourceInUseException
       logger << "Table #{config.table_name} already exists, skipping creation.\n"
     end
 

spec/aws/session_store/dynamo_db/error/default_error_handler_spec.rb

@@ -25,7 +25,7 @@
 
   let(:base_app) { MultiplierApplication.new }
   let(:app) { AWS::SessionStore::DynamoDB::RackMiddleware.new(base_app, @options) }
-  let(:client) { double('AWS::DynamoDB::Client') }
+  let(:client) { double('Aws::DynamoDB::Client') }
 
   context "Error handling for Rack Middleware with default error handler" do
     it "raises error for missing secret key" do

spec/aws/session_store/dynamo_db/garbage_collection_spec.rb

@@ -97,7 +97,7 @@ def collect_garbage
     }
   }
 
-  let(:dynamo_db_client) {AWS::DynamoDB::Client.new}
+  let(:dynamo_db_client) { Aws::DynamoDB::Client.new }
 
   context "Mock DynamoDB client with garbage collection" do
 

spec/aws/session_store/dynamo_db/locking/threaded_sessions_spec.rb

@@ -71,7 +71,7 @@ def update_item_mock(options, update_method)
       get "/"
       last_request.session[:multiplier].should eq(1)
 
-      t1 = thread_exception(AWS::DynamoDB::Errors::ConditionalCheckFailedException)
+      t1 = thread_exception(Aws::DynamoDB::Errors::ConditionalCheckFailedException)
       t2 = thread(2, 0.25, true)
       t1.join
       t2.join

spec/aws/session_store/dynamo_db/rack_middleware_spec.rb

@@ -46,7 +46,7 @@ def ensure_data_updated(mutated_data)
         end
 
         let(:dynamo_db_client) do
-          client = double('AWS::DynamoDB::Client')
+          client = double('Aws::DynamoDB::Client')
           client.stub(:delete_item) { 'Deleted' }
           client.stub(:list_tables) { {:table_names => ['Sessions']} }
           client.stub(:get_item) do

spec/spec_helper.rb

@@ -39,10 +39,10 @@ def call(env)
 
 ConstantHelpers = lambda do
   let(:token_error_msg) { 'The security token included in the request is invalid' }
-  let(:resource_error) { AWS::DynamoDB::Errors::ResourceNotFoundException }
-  let(:key_error) { AWS::DynamoDB::Errors::ValidationException.new(key_error_msg) }
+  let(:resource_error) { Aws::DynamoDB::Errors::ResourceNotFoundException }
+  let(:key_error) { Aws::DynamoDB::Errors::ValidationException.new(key_error_msg) }
   let(:key_error_msg) { 'The provided key element does not match the schema' }
-  let(:client_error) { AWS::DynamoDB::Errors::UnrecognizedClientException }
+  let(:client_error) { Aws::DynamoDB::Errors::UnrecognizedClientException }
   let(:invalid_cookie) { {"HTTP_COOKIE" => "rack.session=ApplePieBlueberries"} }
   let(:invalid_session_data) { {"rack.session"=>{"multiplier" => 1}} }
   let(:rack_default_error_msg) { "Warning! AWS::SessionStore::DynamoDB failed to save session. Content dropped.\n" }