aws-sessionstore-dynamodb 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de27a483c385afd4785e472389af7e2dc4193435
-  data.tar.gz: 051f84065722c005ec292b1615d100cd3f344ccf
+  metadata.gz: e7fc34007a54a256d5ef9749bc952dcbbb9d8c1c
+  data.tar.gz: 31a61f733ce42fe5bf852ae6e7ed07e95a27066a
 SHA512:
-  metadata.gz: 490cd917053d74583e1e64f742c970cce1bf645da82dd812727c4142314d1bfd5b2eb5c90aadc93c6c7265a8f657ddc23b03e2af39e9836c563ee5d7bf5cdbf7
-  data.tar.gz: c8227bf9283d6d08635f41476efdd8cc9ddf6e005694be31622e8fcbaaf03acddb3efb67a9edf9ddb3c80e9e7c768d3d43e8b460cab20bb30d4c92e0fa02d6c6
+  metadata.gz: cec7d8e8ab2bf8135ceace7a4f54647744c2b1e88d69ba20ab44dc5f83236af40cd34cb23d1b1ddc942d4ea787d2e4674ff0e3670a1a3580c0f93850060033da
+  data.tar.gz: 66d01279ddc10ed9e821045356692b73ce9de9597f454787e64c53b8ce6d77b361ca3a5f8fed8447b350aa9cf9a1f42df03668dc8938c45b0c5c38843b440de6

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+
+rvm:
+  - 2.2.2
+  - 2.3.0
+  - 2.4.0
+
+sudo: false
+
+env:
+  - AWS_REGION=foo
+
+script: bundle exec rake
+
+bundler_args: --without docs release repl

data/Gemfile

@@ -15,7 +15,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake', '~> 10.0'
+gem 'rake', '~> 12.0'
 
 group :documentation do
   gem 'yard', '~> 0.0'

data/README.md

@@ -37,7 +37,7 @@ Ruby file using the following method:
 
     require 'aws-sessionstore-dynamodb'
 
-    AWS::SessionStore::DynamoDB::Table.create_table
+    Aws::SessionStore::DynamoDB::Table.create_table
 
 Run the session store as a Rack middleware in the following way:
 
@@ -46,7 +46,7 @@ Run the session store as a Rack middleware in the following way:
 
     options = { :secret_key => 'SECRET_KEY' }
 
-    use AWS::SessionStore::DynamoDB::RackMiddleware.new(options)
+    use Aws::SessionStore::DynamoDB::RackMiddleware.new(options)
     run SomeRackApp
 
 Note that `:secret_key` is a mandatory configuration option that must be set.
@@ -71,7 +71,7 @@ Full API documentation of the library can be found on [RubyDoc.info][1].
 ### Configuration Options
 
 A number of options are available to be set in
-`AWS::SessionStore::DynamoDB::Configuration`, which is used by the
+`Aws::SessionStore::DynamoDB::Configuration`, which is used by the
 `RackMiddleware` class. These options can be set in the YAML configuration
 file in a Rails application (located in `config/sessionstore/dynamodb.yml`),
 directly by Ruby code, or through environment variables.
@@ -126,7 +126,7 @@ You can create your own Rake task for garbage collection similar to below:
     desc 'Perform Garbage Collection'
     task :garbage_collect do |t|
      options = {:max_age => 3600*24, max_stale => 5*3600 }
-     AWS::SessionStore::DynamoDB::GarbageCollection.collect_garbage(options)
+     Aws::SessionStore::DynamoDB::GarbageCollection.collect_garbage(options)
     end
 
 The above example will clear sessions older than one day or that have been
@@ -164,7 +164,7 @@ locking strategy according to your needs:
 
 You can pass in your own error handler for raised exceptions or you can allow
 the default error handler to them for you. See the API documentation
-on the {AWS::SessionStore::DynamoDB::Errors::BaseHandler} class for more
+on the {Aws::SessionStore::DynamoDB::Errors::BaseHandler} class for more
 details.
 
 [1]: http://rubydoc.org/gems/aws-sessionstore-dynamodb/frames

data/aws-sessionstore-dynamodb.gemspec

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/lib/aws/session_store/dynamo_db/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "aws-sessionstore-dynamodb"
-  spec.version       = AWS::SessionStore::DynamoDB::VERSION
+  spec.version       = Aws::SessionStore::DynamoDB::VERSION
   spec.authors       = ["Ruby Robinson"]
   spec.summary       = "The Amazon DynamoDB Session Store handles sessions " +
                        "for Ruby web applications using a DynamoDB backend."
@@ -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 'rack', '~> 1.0'
+  spec.add_dependency 'aws-sdk', '~> 2.0'
+  spec.add_dependency 'rack', '>= 1.6.4'
 end

data/lib/aws-sessionstore-dynamodb.rb

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS
+module Aws
   module SessionStore
     module DynamoDB; end
   end

data/lib/aws/session_store/dynamo_db/configuration.rb

@@ -12,9 +12,9 @@
 # language governing permissions and limitations under the License.
 
 require 'yaml'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
-module AWS::SessionStore::DynamoDB
+module Aws::SessionStore::DynamoDB
   # This class provides a Configuration object for all DynamoDB transactions
   # by pulling configuration options from Runtime, a YAML file, the ENV and
   # default settings.
@@ -66,8 +66,7 @@ module AWS::SessionStore::DynamoDB
       :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.
@@ -154,7 +153,7 @@ module AWS::SessionStore::DynamoDB
     #   See AWS DynamoDB documentation for table write_capacity for more
     #   information on this setting.
     # @option options [DynamoDB Client] :dynamo_db_client
-    #   (AWS::DynamoDB::ClientV2) DynamoDB client used to perform database
+    #   (Aws::DynamoDB::Client) DynamoDB client used to perform database
     #   operations inside of middleware application.
     # @option options [Boolean] :raise_errors (false) If true, all errors are
     #   raised up the stack when default ErrorHandler. If false, Only specified
@@ -203,14 +202,15 @@ module AWS::SessionStore::DynamoDB
     # @return [Hash] DDB client.
     def gen_dynamo_db_client
       client_opts = client_subset(@options)
-      client = AWS::DynamoDB::Client
+      client_opts[:user_agent_suffix] = _user_agent(@options.delete(:user_agent_suffix))
+      client = Aws::DynamoDB::Client
       dynamo_db_client = @options[:dynamo_db_client] || client.new(client_opts)
       {:dynamo_db_client => dynamo_db_client}
     end
 
     # @return [Hash] Default Error Handler
     def gen_error_handler
-      default_handler = AWS::SessionStore::DynamoDB::Errors::DefaultHandler
+      default_handler = Aws::SessionStore::DynamoDB::Errors::DefaultHandler
       error_handler = @options[:error_handler] ||
                             default_handler.new(@options[:raise_errors])
       {:error_handler => error_handler}
@@ -294,5 +294,13 @@ module AWS::SessionStore::DynamoDB
         opts
       end
     end
+
+    def _user_agent(custom)
+      if custom
+        custom
+      else
+        " aws-sessionstore/#{VERSION}"
+      end
+    end
   end
 end

data/lib/aws/session_store/dynamo_db/errors/base_handler.rb

@@ -12,9 +12,9 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB::Errors
+module Aws::SessionStore::DynamoDB::Errors
   # BaseErrorHandler provides an interface for error handlers
-  # that can be passed in to {AWS::SessionStore::DynamoDB::RackMiddleware}.
+  # that can be passed in to {Aws::SessionStore::DynamoDB::RackMiddleware}.
   # Each error handler must implement a handle_error method.
   #
   # @example Sample ErrorHandler class
@@ -33,11 +33,11 @@ module AWS::SessionStore::DynamoDB::Errors
     # error up the stack.
     # You may reraise the error passed.
     #
-    # @param [AWS::DynamoDB::Errors::Base] error error passed in from
-    #  AWS::SessionStore::DynamoDB::RackMiddleware.
+    # @param [Aws::DynamoDB::Errors::Base] error error passed in from
+    #  Aws::SessionStore::DynamoDB::RackMiddleware.
     # @param [Rack::Request::Environment,nil] env Rack environment
     # @return [false] If exception was handled and will not reraise exception.
-    # @raise [AWS::DynamoDB::Errors] If error has be reraised.
+    # @raise [Aws::DynamoDB::Errors] If error has be reraised.
     def handle_error(error, env = {})
       raise NotImplementedError
     end

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

@@ -12,15 +12,15 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB::Errors
+module Aws::SessionStore::DynamoDB::Errors
   # This class handles errors raised from DynamoDB.
-  class DefaultHandler < AWS::SessionStore::DynamoDB::Errors::BaseHandler
+  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::SessionStore::DynamoDB::MissingSecretKeyError,
-      AWS::SessionStore::DynamoDB::LockWaitTimeoutError
+      Aws::DynamoDB::Errors::ResourceNotFoundException,
+      Aws::DynamoDB::Errors::ConditionalCheckFailedException,
+      Aws::SessionStore::DynamoDB::MissingSecretKeyError,
+      Aws::SessionStore::DynamoDB::LockWaitTimeoutError
     ]
 
     # Determines behavior of DefaultErrorHandler

data/lib/aws/session_store/dynamo_db/garbage_collection.rb

@@ -11,9 +11,9 @@
 # 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
+module Aws::SessionStore::DynamoDB
   # Collects and deletes unwanted sessions based on
   # their creation and update dates.
   module GarbageCollection
@@ -34,7 +34,7 @@ module AWS::SessionStore::DynamoDB
     # @option (see Configuration#initialize)
     # @api private
     def load_config(options = {})
-      AWS::SessionStore::DynamoDB::Configuration.new(options)
+      Aws::SessionStore::DynamoDB::Configuration.new(options)
     end
 
     # Sets scan filter attributes based on attributes specified.
@@ -59,7 +59,7 @@ module AWS::SessionStore::DynamoDB
     # @api private
     def scan(config, last_item = nil)
       options = scan_opts(config)
-      options.merge(start_key(last_item)) if last_item
+      options = options.merge(start_key(last_item)) if last_item
       config.dynamo_db_client.scan(options)
     end
 

data/lib/aws/session_store/dynamo_db/invalid_id_error.rb

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB
+module Aws::SessionStore::DynamoDB
   class InvalidIDError < RuntimeError
     def initialize(msg = "Corrupt Session ID!")
       super

data/lib/aws/session_store/dynamo_db/lock_wait_timeout_error.rb

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB
+module Aws::SessionStore::DynamoDB
   class LockWaitTimeoutError < RuntimeError
     def initialize(msg = 'Maximum time spent to acquire lock has been exceeded!')
       super

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

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB::Locking
+module Aws::SessionStore::DynamoDB::Locking
   # This class provides a framework for implementing
   # locking strategies.
   class Base
@@ -56,7 +56,7 @@ module AWS::SessionStore::DynamoDB::Locking
     def handle_error(env = nil, &block)
       begin
         yield
-      rescue AWS::DynamoDB::Errors::Base => e
+      rescue Aws::DynamoDB::Errors::ServiceError => e
         @config.error_handler.handle_error(e, env)
       end
     end
@@ -101,7 +101,7 @@ module AWS::SessionStore::DynamoDB::Locking
     def table_opts(sid)
       {
         :table_name => @config.table_name,
-        :key => {@config.table_key => {:s => sid}}
+        :key => { @config.table_key => sid }
       }
     end
 
@@ -116,7 +116,7 @@ module AWS::SessionStore::DynamoDB::Locking
 
     # Update client with current time attribute.
     def updated_at
-      { :value => {:n => "#{(Time.now).to_f}"}, :action  => "PUT" }
+      { :value => "#{(Time.now).to_f}", :action  => "PUT" }
     end
 
     # Attribute for creation of session.
@@ -132,7 +132,7 @@ module AWS::SessionStore::DynamoDB::Locking
     end
 
     def data_attr(session)
-       { "data" => {:value => {:s => session}, :action  => "PUT"} }
+       { "data" => {:value => session, :action  => "PUT"} }
     end
 
     # Determine if data has been manipulated
@@ -143,7 +143,7 @@ module AWS::SessionStore::DynamoDB::Locking
 
     # Expected attributes
     def expected_attributes(sid)
-      { :expected => {@config.table_key => {:value => {:s => sid}, :exists => true}} }
+      { :expected => { @config.table_key => {:value => sid, :exists => true} } }
     end
 
     # Attributes to be retrieved via client

data/lib/aws/session_store/dynamo_db/locking/null.rb

@@ -12,10 +12,10 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB::Locking
+module Aws::SessionStore::DynamoDB::Locking
   # This class gets and sets sessions
   # without a locking strategy.
-  class Null < AWS::SessionStore::DynamoDB::Locking::Base
+  class Null < Aws::SessionStore::DynamoDB::Locking::Base
     # Retrieve session if it exists from the database by id.
     # Unpack the data once retrieved from the database.
     def get_session_data(env, sid)
@@ -32,8 +32,8 @@ module AWS::SessionStore::DynamoDB::Locking
 
     # @return [String] Session data.
     def extract_data(env, result = nil)
-      env['rack.initial_data'] = result[:item]["data"][:s] if result[:item]
-      unpack_data(result[:item]["data"][:s]) if result[:item]
+      env['rack.initial_data'] = result[:item]["data"] if result[:item]
+      unpack_data(result[:item]["data"]) if result[:item]
     end
 
   end

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

@@ -12,11 +12,11 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB::Locking
+module Aws::SessionStore::DynamoDB::Locking
   # This class implements a pessimistic locking strategy for the
   # DynamoDB session handler. Sessions obtain an exclusive lock
   # for reads that is only released when the session is saved.
-  class Pessimistic < AWS::SessionStore::DynamoDB::Locking::Base
+  class Pessimistic < Aws::SessionStore::DynamoDB::Locking::Base
     WAIT_ERROR =
 
     # Saves the session.
@@ -43,7 +43,7 @@ module AWS::SessionStore::DynamoDB::Locking
         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)
@@ -58,7 +58,7 @@ module AWS::SessionStore::DynamoDB::Locking
     # @raise [Error] When time for attempting to get lock has
     #   been exceeded.
     def exceeded_wait_time?(max_attempt_date)
-      lock_error = AWS::SessionStore::DynamoDB::LockWaitTimeoutError
+      lock_error = Aws::SessionStore::DynamoDB::LockWaitTimeoutError
       raise lock_error if Time.now.to_f > max_attempt_date
     end
 
@@ -70,15 +70,15 @@ module AWS::SessionStore::DynamoDB::Locking
     # @return [Time] Time stamp for which the session was locked.
     def lock_time(sid)
       result = @config.dynamo_db_client.get_item(get_lock_time_opts(sid))
-      (result[:item]["locked_at"][:n]).to_f if result[:item]["locked_at"]
+      (result[:item]["locked_at"]).to_f if result[:item]["locked_at"]
     end
 
     # @return [String] Session data.
     def get_data(env, result)
-      lock_time = result[:attributes]["locked_at"][:n]
+      lock_time = result[:attributes]["locked_at"]
       env["locked_at"] = (lock_time).to_f
-      env['rack.initial_data'] = result[:item]["data"][:s] if result[:item]
-      unpack_data(result[:attributes]["data"][:s])
+      env['rack.initial_data'] = result[:item]["data"] if result.members.include? :item
+      unpack_data(result[:attributes]["data"])
     end
 
     # Attempt to bust the lock if the expiration date has expired.
@@ -119,7 +119,7 @@ module AWS::SessionStore::DynamoDB::Locking
 
     # Time in which session was updated.
     def updated_at
-      { :value => {:n => "#{(Time.now).to_f}"}, :action  => "PUT" }
+      { :value => "#{(Time.now).to_f}", :action  => "PUT" }
     end
 
     # Attributes for locking.
@@ -147,7 +147,7 @@ module AWS::SessionStore::DynamoDB::Locking
     # Expectation of when lock was set.
     def expect_lock_time(env)
       { :expected => {"locked_at" => {
-        :value => {:n => "#{env["locked_at"]}"}, :exists => true}} }
+        :value => "#{env["locked_at"]}", :exists => true}} }
     end
 
     # Attributes to be retrieved via client

data/lib/aws/session_store/dynamo_db/missing_secret_key_error.rb

@@ -12,7 +12,7 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB
+module Aws::SessionStore::DynamoDB
   class MissingSecretKeyError < RuntimeError
     def initialize(msg = "No secret key provided!")
       super

data/lib/aws/session_store/dynamo_db/rack_middleware.rb

@@ -13,9 +13,9 @@
 
 require 'rack/session/abstract/id'
 require 'openssl'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
-module AWS::SessionStore::DynamoDB
+module Aws::SessionStore::DynamoDB
   # This class is an ID based Session Store Rack Middleware
   # that uses a DynamoDB backend for session storage.
   class RackMiddleware < Rack::Session::Abstract::ID
@@ -24,9 +24,9 @@ module AWS::SessionStore::DynamoDB
     #
     # @param app Rack application.
     # @option (see Configuration#initialize)
-    # @raise [AWS::DynamoDB::Errors::ResourceNotFoundException] If valid table
+    # @raise [Aws::DynamoDB::Errors::ResourceNotFoundException] If valid table
     #   name is not provided.
-    # @raise [AWS::SessionStore::DynamoDB::MissingSecretKey] If secret key is
+    # @raise [Aws::SessionStore::DynamoDB::MissingSecretKey] If secret key is
     #   not provided.
     def initialize(app, options = {})
       super
@@ -42,16 +42,16 @@ module AWS::SessionStore::DynamoDB
     # @return [Locking::Pessimistic] If locking is enabled.
     def set_locking_strategy
       if @config.enable_locking
-        @lock = AWS::SessionStore::DynamoDB::Locking::Pessimistic.new(@config)
+        @lock = Aws::SessionStore::DynamoDB::Locking::Pessimistic.new(@config)
       else
-        @lock = AWS::SessionStore::DynamoDB::Locking::Null.new(@config)
+        @lock = Aws::SessionStore::DynamoDB::Locking::Null.new(@config)
       end
     end
 
     # Determines if the correct session table name is being used for
     # this application. Also tests existence of secret key.
     #
-    # @raise [AWS::DynamoDB::Errors::ResourceNotFoundException] If wrong table
+    # @raise [Aws::DynamoDB::Errors::ResourceNotFoundException] If wrong table
     #   name.
     def validate_config
       raise MissingSecretKeyError unless @config.secret_key
@@ -99,8 +99,8 @@ module AWS::SessionStore::DynamoDB
     def handle_error(env = nil, &block)
       begin
         yield
-      rescue AWS::DynamoDB::Errors::Base,
-             AWS::SessionStore::DynamoDB::InvalidIDError => e
+      rescue Aws::DynamoDB::Errors::Base,
+             Aws::SessionStore::DynamoDB::InvalidIDError => e
         @config.error_handler.handle_error(e, env)
       end
     end

data/lib/aws/session_store/dynamo_db/railtie.rb

@@ -12,10 +12,10 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS::SessionStore::DynamoDB
+module Aws::SessionStore::DynamoDB
   class Railtie < Rails::Railtie
     initializer 'aws-sessionstore-dynamodb-rack-middleware' do
-      ActionDispatch::Session::DynamodbStore = AWS::SessionStore::DynamoDB::RackMiddleware
+      ActionDispatch::Session::DynamodbStore = Aws::SessionStore::DynamoDB::RackMiddleware
     end
 
     # Load all rake tasks

data/lib/aws/session_store/dynamo_db/table.rb

@@ -11,10 +11,10 @@
 # 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
+module Aws::SessionStore::DynamoDB
   # This class provides a way to create and delete a session table.
   module Table
     module_function
@@ -30,7 +30,7 @@ module AWS::SessionStore::DynamoDB
       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
 
@@ -50,7 +50,7 @@ module AWS::SessionStore::DynamoDB
     # @option (see Configuration#initialize)
     # @api private
     def load_config(options = {})
-      AWS::SessionStore::DynamoDB::Configuration.new(options)
+      Aws::SessionStore::DynamoDB::Configuration.new(options)
     end
 
     # @return [Hash] Attribute settings for creating a session table.

data/lib/aws/session_store/dynamo_db/tasks/session_table.rake

@@ -15,7 +15,7 @@ namespace "db" do
   namespace "sessions" do
     desc 'Clean up old sessions in Amazon DynamoDB session store'
     task :cleanup => :environment do |t|
-      AWS::SessionStore::DynamoDB::GarbageCollection.collect_garbage
+      Aws::SessionStore::DynamoDB::GarbageCollection.collect_garbage
     end
   end
 end

data/lib/aws/session_store/dynamo_db/version.rb

@@ -12,10 +12,10 @@
 # language governing permissions and limitations under the License.
 
 
-module AWS
+module Aws
   module SessionStore
     module DynamoDB
-      VERSION = "0.5.1"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/rails/generators/sessionstore/dynamodb/templates/sessionstore_migration.rb

@@ -1,10 +1,10 @@
 class <%= name.camelize %> < ActiveRecord::Migration
   def up
-    AWS::SessionStore::DynamoDB::Table.create_table
+    Aws::SessionStore::DynamoDB::Table.create_table
   end
 
   def down
-    AWS::SessionStore::DynamoDB::Table.delete_table
+    Aws::SessionStore::DynamoDB::Table.delete_table
   end
 end
 

data/spec/aws/session_store/dynamo_db/configuration_spec.rb

@@ -13,7 +13,7 @@
 
 require "spec_helper"
 
-describe AWS::SessionStore::DynamoDB::Configuration do
+describe Aws::SessionStore::DynamoDB::Configuration do
 
   let(:defaults) do
     {
@@ -45,19 +45,19 @@ describe AWS::SessionStore::DynamoDB::Configuration do
   end
 
   def expected_options(opts)
-    cfg = AWS::SessionStore::DynamoDB::Configuration.new(opts)
+    cfg = Aws::SessionStore::DynamoDB::Configuration.new(opts)
     expected_opts = defaults.merge(expected_file_opts).merge(opts)
     cfg.to_hash.should include(expected_opts)
   end
 
   context "Configuration Tests" do
     it "configures option with out runtime,YAML or ENV options" do
-      cfg = AWS::SessionStore::DynamoDB::Configuration.new
+      cfg = Aws::SessionStore::DynamoDB::Configuration.new
       cfg.to_hash.should include(defaults)
     end
 
     it "configures accurate option hash with runtime options, no YAML or ENV" do
-      cfg = AWS::SessionStore::DynamoDB::Configuration.new(runtime_options)
+      cfg = Aws::SessionStore::DynamoDB::Configuration.new(runtime_options)
       expected_opts = defaults.merge(runtime_options)
       cfg.to_hash.should include(expected_opts)
     end
@@ -79,7 +79,7 @@ describe AWS::SessionStore::DynamoDB::Configuration do
     it "has rails defiend but no file specified, no error thrown" do
       rails = double('Rails', {:env => 'test', :root => ''})
       stub_const("Rails", rails)
-      cfg = AWS::SessionStore::DynamoDB::Configuration.new(runtime_options)
+      cfg = Aws::SessionStore::DynamoDB::Configuration.new(runtime_options)
       expected_opts = defaults.merge(runtime_options)
       cfg.to_hash.should include(expected_opts)
     end
@@ -87,7 +87,7 @@ describe AWS::SessionStore::DynamoDB::Configuration do
     it "has rails defiend but and default rails YAML file loads" do
       rails = double('Rails', {:env => 'test', :root => File.dirname(__FILE__)})
       stub_const("Rails", rails)
-      cfg = AWS::SessionStore::DynamoDB::Configuration.new(runtime_options)
+      cfg = Aws::SessionStore::DynamoDB::Configuration.new(runtime_options)
       expected_opts = defaults.merge(runtime_options)
       cfg.to_hash.should include(expected_opts)
     end
@@ -95,7 +95,7 @@ describe AWS::SessionStore::DynamoDB::Configuration do
     it "throws an exception when wrong path for file" do
       config_path = 'Wrong path!'
       runtime_opts = {:config_file => config_path}.merge(runtime_options)
-      expect{cfg = AWS::SessionStore::DynamoDB::Configuration.new(runtime_opts)}.to raise_error(Errno::ENOENT)
+      expect{cfg = Aws::SessionStore::DynamoDB::Configuration.new(runtime_opts)}.to raise_error(Errno::ENOENT)
     end
   end
 end

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

@@ -14,7 +14,7 @@
 
 require 'spec_helper'
 
-describe AWS::SessionStore::DynamoDB do
+describe Aws::SessionStore::DynamoDB do
   include Rack::Test::Methods
 
   instance_exec(&ConstantHelpers)
@@ -24,8 +24,8 @@ describe AWS::SessionStore::DynamoDB do
   end
 
   let(:base_app) { MultiplierApplication.new }
-  let(:app) { AWS::SessionStore::DynamoDB::RackMiddleware.new(base_app, @options) }
-  let(:client) { double('AWS::DynamoDB::Client') }
+  let(:app) { Aws::SessionStore::DynamoDB::RackMiddleware.new(base_app, @options) }
+  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

data/spec/aws/session_store/dynamo_db/garbage_collection_spec.rb

@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 
-describe AWS::SessionStore::DynamoDB::GarbageCollection do
+describe Aws::SessionStore::DynamoDB::GarbageCollection do
   def member(min,max)
     member = []
     for i in min..max
@@ -36,7 +36,7 @@ describe AWS::SessionStore::DynamoDB::GarbageCollection do
 
   def collect_garbage
     options = { :dynamo_db_client => dynamo_db_client, :max_age => 100, :max_stale => 100 }
-    AWS::SessionStore::DynamoDB::GarbageCollection.collect_garbage(options)
+    Aws::SessionStore::DynamoDB::GarbageCollection.collect_garbage(options)
   end
 
   let(:scan_resp1){
@@ -97,7 +97,7 @@ describe AWS::SessionStore::DynamoDB::GarbageCollection do
     }
   }
 
-  let(:dynamo_db_client) {AWS::DynamoDB::Client.new}
+  let(:dynamo_db_client) {Aws::DynamoDB::Client.new}
 
   context "Mock DynamoDB client with garbage collection" do
 
@@ -111,7 +111,10 @@ describe AWS::SessionStore::DynamoDB::GarbageCollection do
 
     it "gets scan results then returns last evaluated key and resumes scanning" do
       dynamo_db_client.should_receive(:scan).
-        exactly(2).times.and_return(scan_resp2, scan_resp3)
+        exactly(1).times.and_return(scan_resp2)
+      dynamo_db_client.should_receive(:scan).
+        exactly(1).times.with(hash_including(exclusive_start_key: scan_resp2[:last_evaluated_key])).
+        and_return(scan_resp3)
       dynamo_db_client.should_receive(:batch_write_item).
         exactly(3).times.and_return(write_resp1)
         collect_garbage

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

@@ -14,7 +14,7 @@
 
 require 'spec_helper'
 
-describe AWS::SessionStore::DynamoDB::RackMiddleware do
+describe Aws::SessionStore::DynamoDB::RackMiddleware do
   include Rack::Test::Methods
 
   def thread(mul_val, time, check)
@@ -39,11 +39,11 @@ describe AWS::SessionStore::DynamoDB::RackMiddleware do
   end
 
   let(:base_app) { MultiplierApplication.new }
-  let(:app) { AWS::SessionStore::DynamoDB::RackMiddleware.new(base_app, @options) }
+  let(:app) { Aws::SessionStore::DynamoDB::RackMiddleware.new(base_app, @options) }
 
   context "Mock Multiple Threaded Sessions", :integration => true do
     before do
-      @options = AWS::SessionStore::DynamoDB::Configuration.new.to_hash
+      @options = Aws::SessionStore::DynamoDB::Configuration.new.to_hash
       @options[:enable_locking] = true
       @options[:secret_key] = 'watermelon_smiles'
 
@@ -71,7 +71,7 @@ describe AWS::SessionStore::DynamoDB::RackMiddleware do
       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
@@ -87,7 +87,7 @@ describe AWS::SessionStore::DynamoDB::RackMiddleware do
 
       t1 = thread(2, 0, false)
       sleep(0.25)
-      t2 = thread_exception(AWS::SessionStore::DynamoDB::LockWaitTimeoutError)
+      t2 = thread_exception(Aws::SessionStore::DynamoDB::LockWaitTimeoutError)
       t1.join
       t2.join
     end

data/spec/aws/session_store/dynamo_db/rack_middleware_database_spec.rb

@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 
-module AWS
+module Aws
   module SessionStore
     module DynamoDB
       describe RackMiddleware do
@@ -29,7 +29,7 @@ module AWS
         def table_opts(sid)
           {
             :table_name => Configuration::DEFAULTS[:table_name],
-            :key => { Configuration::DEFAULTS[:table_key] => { :s => sid } }
+            :key => { Configuration::DEFAULTS[:table_key] => sid }
           }
         end
 
@@ -43,7 +43,7 @@ module AWS
 
         def extract_time(sid)
           options = table_opts(sid).merge(attr_opts)
-          Time.at((client.get_item(options)[:item]["created_at"][:n]).to_f)
+          Time.at((client.get_item(options)[:item]["created_at"]).to_f)
         end
 
         let(:base_app) { MultiplierApplication.new }
@@ -60,7 +60,7 @@ module AWS
           it "creates a new HTTP cookie when Cookie not supplied" do
             get "/"
             last_response.body.should eq('All good!')
-            last_response['Set-Cookie'].should be_true
+            last_response['Set-Cookie'].should be_truthy
           end
 
           it "does not rewrite Cookie if cookie previously/accuarately set" do

data/spec/aws/session_store/dynamo_db/rack_middleware_spec.rb

@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 
-module AWS
+module Aws
   module SessionStore
     module DynamoDB
       describe RackMiddleware do
@@ -46,11 +46,11 @@ module AWS
         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
-            { :item => { 'data' => { :s => sample_packed_data } } }
+            { :item => { 'data' => sample_packed_data } }
           end
           client.stub(:update_item) do
             { :attributes => { :created_at => 'now' } }
@@ -67,7 +67,7 @@ module AWS
           it "creates a new HTTP cookie when Cookie not supplied" do
             get "/"
             last_response.body.should eq('All good!')
-            last_response['Set-Cookie'].should be_true
+            last_response['Set-Cookie'].should be_truthy
           end
 
           it "loads/manipulates a session based on id from HTTP-Cookie" do

data/spec/aws/session_store/dynamo_db/table_spec.rb

@@ -15,7 +15,7 @@ require 'spec_helper'
 require 'stringio'
 require 'logger'
 
-module AWS
+module Aws
   module SessionStore
     module DynamoDB
       describe Table do

data/spec/spec_helper.rb

@@ -39,23 +39,29 @@ end
 
 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.new(double('Seahorse::Client::RequestContext'), resource_error_msg)
+  }
+  let(:resource_error_msg) { 'The Resource is not found.' }
+  let(:key_error) { Aws::DynamoDB::Errors::ValidationException.new(double('Seahorse::Client::RequestContext'), 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.new(double('Seahorse::Client::RequestContext'), client_error_msg)
+  }
+  let(:client_error_msg) { 'Unrecognized Client.'}
   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" }
-  let(:missing_key_error) { AWS::SessionStore::DynamoDB::MissingSecretKeyError }
+  let(:rack_default_error_msg) { "Warning! Aws::SessionStore::DynamoDB failed to save session. Content dropped.\n" }
+  let(:missing_key_error) { Aws::SessionStore::DynamoDB::MissingSecretKeyError }
 end
 
 RSpec.configure do |c|
   c.before(:each, :integration => true) do
     opts = {:table_name => 'sessionstore-integration-test'}
 
-    defaults = AWS::SessionStore::DynamoDB::Configuration::DEFAULTS
+    defaults = Aws::SessionStore::DynamoDB::Configuration::DEFAULTS
     defaults = defaults.merge(opts)
-    stub_const("AWS::SessionStore::DynamoDB::Configuration::DEFAULTS", defaults)
-    AWS::SessionStore::DynamoDB::Table.create_table(opts)
+    stub_const("Aws::SessionStore::DynamoDB::Configuration::DEFAULTS", defaults)
+    Aws::SessionStore::DynamoDB::Table.create_table(opts)
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: aws-sessionstore-dynamodb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ruby Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.6.4
 description: 
 email: 
 executables: []
@@ -45,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE.txt
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The Amazon DynamoDB Session Store handles sessions for Ruby web applications
@@ -120,4 +121,3 @@ test_files:
 - spec/aws/session_store/dynamo_db/rails_app_config.yml
 - spec/aws/session_store/dynamo_db/table_spec.rb
 - spec/spec_helper.rb
-has_rdoc: