Fix more references to attribute types.

Author: Jeff Dutil

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

@@ -143,7 +143,7 @@ def data_unchanged?(env, session)
 
     # 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

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

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-
 module AWS::SessionStore::DynamoDB::Locking
   # This class gets and sets sessions
   # without a locking strategy.
@@ -32,9 +31,8 @@ def get_session_opts(sid)
 
     # @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
 end

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

@@ -70,15 +70,15 @@ def get_lock_time_opts(sid)
     # @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[:item]
+      unpack_data(result[:attributes]["data"])
     end
 
     # Attempt to bust the lock if the expiration date has expired.
@@ -119,7 +119,7 @@ def lock_attr
 
     # Time in which session was updated.
     def updated_at
-      { :value => {:n => "#{(Time.now).to_f}"}, :action  => "PUT" }
+      { :value => Time.now.to_f.to_s, :action  => "PUT" }
     end
 
     # Attributes for locking.
@@ -147,7 +147,7 @@ def add_attr
     # 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"].to_s, :exists => true}} }
     end
 
     # Attributes to be retrieved via client

spec/aws/session_store/dynamo_db/rack_middleware_spec.rb

@@ -50,7 +50,7 @@ def ensure_data_updated(mutated_data)
           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' } }