dynamodb 0.0.2 → 1.1.1

data/spec/dynamodb_spec.rb

@@ -31,6 +31,20 @@ describe DynamoDB do
       DynamoDB.serialize("foo" => nil).should == {}
       DynamoDB.serialize("foo" => "").should == {}
     end
+
+    it "serializes StringSet" do
+      DynamoDB.serialize(["foo", "bar", "foo"]).should == {"SS" => ["foo", "bar"]}
+    end
+
+    it "serializes NumberSet" do
+      DynamoDB.serialize([1, 2, 1]).should == {"NS" => [1,2]}
+    end
+
+    it "raises an error on mixed types" do
+      lambda {
+        DynamoDB.serialize([1, "2", 1])
+      }.should raise_error
+    end
   end
 
   describe "#deserialize" do
@@ -55,5 +69,15 @@ describe DynamoDB do
       deserialized["price"].should == 11.99
       deserialized["active"].should == 1
     end
+
+    it "deserializes StringSet and NumberSet" do
+      item = {
+        "turtles" => {"SS" => ["Leonardo", "Michelangelo"]},
+        "powerball" => {"NS" => [1,2]}
+      }
+      deserialized = DynamoDB.deserialize(item)
+      deserialized["turtles"].should == ["Leonardo", "Michelangelo"]
+      deserialized["powerball"].should == [1,2]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +77,19 @@ files:
 - dynamodb.gemspec
 - lib/dynamodb.rb
 - lib/dynamodb/connection.rb
-- lib/dynamodb/credentials.rb
-- lib/dynamodb/response.rb
-- lib/dynamodb/security_token_service.rb
-- lib/dynamodb/typhoeus/request.rb
+- lib/dynamodb/failure_response.rb
+- lib/dynamodb/http_handler.rb
+- lib/dynamodb/request.rb
+- lib/dynamodb/success_response.rb
+- lib/dynamodb/version.rb
+- lib/net/http/connection_pool.rb
+- lib/net/http/connection_pool/connection.rb
+- lib/net/http/connection_pool/session.rb
 - spec/dynamodb/connection_spec.rb
-- spec/dynamodb/credentials_spec.rb
-- spec/dynamodb/response_spec.rb
-- spec/dynamodb/security_token_service_spec.rb
+- spec/dynamodb/failure_response_spec.rb
+- spec/dynamodb/http_handler_spec.rb
+- spec/dynamodb/request_spec.rb
+- spec/dynamodb/success_response_spec.rb
 - spec/dynamodb_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/groupme/dynamodb
@@ -129,8 +118,9 @@ specification_version: 3
 summary: Communicate with Amazon DynamoDB.
 test_files:
 - spec/dynamodb/connection_spec.rb
-- spec/dynamodb/credentials_spec.rb
-- spec/dynamodb/response_spec.rb
-- spec/dynamodb/security_token_service_spec.rb
+- spec/dynamodb/failure_response_spec.rb
+- spec/dynamodb/http_handler_spec.rb
+- spec/dynamodb/request_spec.rb
+- spec/dynamodb/success_response_spec.rb
 - spec/dynamodb_spec.rb
 - spec/spec_helper.rb

data/lib/dynamodb/credentials.rb

@@ -1,30 +0,0 @@
-module DynamoDB
-  class Credentials
-    attr_reader :access_key_id, :secret_access_key, :session_token
-
-    def self.from_hash(hash)
-      new(hash["access_key_id"], hash["secret_access_key"], hash["session_token"])
-    end
-
-    def initialize(access_key_id, secret_access_key, session_token)
-      @access_key_id = access_key_id
-      @secret_access_key = secret_access_key
-      @session_token = session_token
-    end
-
-    def to_hash
-      {
-        "access_key_id" => access_key_id,
-        "secret_access_key" => secret_access_key,
-        "session_token" => session_token
-      }
-    end
-
-    def ==(other)
-      self.class == other.class &&
-      access_key_id == other.access_key_id &&
-      secret_access_key == other.secret_access_key &&
-      session_token == other.session_token
-    end
-  end
-end

data/lib/dynamodb/response.rb

@@ -1,33 +0,0 @@
-module DynamoDB
-  class Response
-    attr_reader :typhoeus_response
-
-    def initialize(typhoeus_response)
-      @typhoeus_response = typhoeus_response
-    end
-
-    def hash_key_element
-      DynamoDB.deserialize(json["LastEvaluatedKey"]["HashKeyElement"])
-    end
-
-    def range_key_element
-      DynamoDB.deserialize(json["LastEvaluatedKey"]["RangeKeyElement"])
-    end
-
-    def item
-      return unless json["Item"]
-      @item ||= DynamoDB.deserialize(json["Item"])
-    end
-
-    def items
-      return unless json["Items"]
-      @items ||= json["Items"].map { |i| DynamoDB.deserialize(i) }
-    end
-
-    private
-
-    def json
-      @json ||= MultiJson.load(typhoeus_response.body)
-    end
-  end
-end

data/lib/dynamodb/security_token_service.rb

@@ -1,110 +0,0 @@
-module DynamoDB
-  attr_writer :access_key_id
-  attr_writer :secret_acces_key
-  attr_writer :session_token
-
-  # SecurityTokenService automatically manages the creation and renewal of
-  # temporary AWS credentials.
-  #
-  # Usage:
-  #
-  #     credentials = SecurityTokenService.new "id", "secret key"
-  #     credentials.access_key_id     # => String
-  #     credentials.secret_access_key # => String
-  #     credentials.session_token     # => String
-  #
-  class SecurityTokenService
-    THIRTY_SIX_HOURS = 129600
-
-    # A SecurityTokenService is initialized for a single AWS user using his
-    # credentials.
-    def initialize(access_key_id, secret_access_key)
-      @_access_key_id = access_key_id
-      @_secret_access_key = secret_access_key
-      @credentials = nil
-    end
-
-    def credentials
-      obtain_credentials
-      @credentials
-    end
-
-    private
-
-    def signature(authorization_params)
-      sign(string_to_sign(authorization_params))
-    end
-
-    # The last line needs to be a query string of all parameters
-    # in the request in alphabetical order.
-    def string_to_sign(authorization_params)
-      [
-        "GET",
-        "sts.amazonaws.com",
-        "/",
-        "AWSAccessKeyId=#{@_access_key_id}" +
-          "&Action=GetSessionToken" +
-          "&DurationSeconds=#{THIRTY_SIX_HOURS}" +
-          "&SignatureMethod=HmacSHA256" +
-          "&SignatureVersion=2" +
-          "&Timestamp=#{CGI.escape(authorization_params[:Timestamp])}" +
-          "&Version=2011-06-15"
-      ].join("\n")
-    end
-
-    # Extract the contents of a given tag.
-    def get_tag(tag, string)
-      # Considering that the XML string received from STS is sane and always
-      # has the same simple structure, I think a simple regular expression
-      # can do the job (with the benefit of not adding a dependency on
-      # another library just for ONE method). I will switch to Nokogiri if
-      # needed.
-      string.match(/#{tag.to_s}>([^<]*)/)[1]
-    end
-
-    # Obtain temporary credentials, set to expire after 1 hour. If
-    # credentials were previously obtained, no request is made until they
-    # expire.
-    def obtain_credentials
-      return unless credentials_expired?
-
-      authorization_params = {
-        :Action           => 'GetSessionToken',
-        :Timestamp        => Time.now.utc.iso8601,
-        :Version          => '2011-06-15',
-        :DurationSeconds  => THIRTY_SIX_HOURS # 36 hour expiration
-      }
-
-      params = {
-        :AWSAccessKeyId   => @_access_key_id,
-        :SignatureMethod  => 'HmacSHA256',
-        :SignatureVersion => '2',
-        :Signature        => signature(authorization_params)
-      }.merge(authorization_params)
-
-      response = Typhoeus::Request.get("https://sts.amazonaws.com", :params => params)
-      if response.success?
-        body = response.body
-        @expiration = Time.parse(get_tag(:Expiration, body))
-        @credentials = Credentials.new(
-          get_tag(:AccessKeyId, body),
-          get_tag(:SecretAccessKey, body),
-          get_tag(:SessionToken, body))
-      else
-        raise AuthenticationError.new(response)
-      end
-    end
-
-    # Sign (HMAC-SHA256) a string using the secret key given at
-    # initialization.
-    def sign(string)
-      Base64.encode64(
-        OpenSSL::HMAC.digest('sha256', @_secret_access_key, string)
-      ).strip
-    end
-
-    def credentials_expired?
-      @expiration.nil? || @expiration <= Time.now.utc
-    end
-  end
-end

data/lib/dynamodb/typhoeus/request.rb

@@ -1,27 +0,0 @@
-module Typhoeus
-  class Request
-    def sign(credentials)
-      headers.merge!('x-amzn-authorization' => "AWS3 AWSAccessKeyId=#{credentials.access_key_id},Algorithm=HmacSHA256,Signature=#{digest(credentials.secret_access_key)}")
-    end
-
-    private
-
-    def digest(secret_key)
-      Base64.encode64(
-        OpenSSL::HMAC.digest('sha256', secret_key, Digest::SHA256.digest(string_to_sign))
-      ).strip
-    end
-
-    def string_to_sign
-      "POST\n/\n\nhost:#{parsed_uri.host}\n#{amz_to_sts}\n#{body}"
-    end
-
-    def amz_to_sts
-      get_amz_headers.sort.map {|key, val| [key, val].join(':') + "\n"}.join
-    end
-
-    def get_amz_headers
-      headers.select {|key, val| key =~ /\Ax-amz-/}
-    end
-  end
-end

data/spec/dynamodb/credentials_spec.rb

@@ -1,22 +0,0 @@
-require "spec_helper"
-
-describe DynamoDB::Credentials do
-  describe "#==" do
-    it "is true for identical credentials" do
-      DynamoDB::Credentials.new("abc", "123", "token").should ==
-        DynamoDB::Credentials.new("abc", "123", "token")
-    end
-
-    it "is false otherwise" do
-      DynamoDB::Credentials.new("abc", "123", "token").should_not ==
-        DynamoDB::Credentials.new("abc", "123", "different token")
-    end
-  end
-
-  describe "#to_hash" do
-    it "converts to a hash and back" do
-      credentials = DynamoDB::Credentials.new("abc", "123", "token")
-      DynamoDB::Credentials.from_hash(credentials.to_hash).should == credentials
-    end
-  end
-end

data/spec/dynamodb/response_spec.rb

@@ -1,87 +0,0 @@
-require 'spec_helper'
-
-describe DynamoDB::Response do
-  before do
-    body = {
-      "LastEvaluatedKey" => {
-        "HashKeyElement" => {"N"=>"1"},
-        "RangeKeyElement"=>{"N"=>"1501"}
-      },
-      "Items"=>[
-        {
-          "name"=>{"S"=>"John Smith"},
-          "created_at"=>{"N"=>"1321564309.99428"},
-          "disabled"=>{"N"=>"0"},
-          "group_id"=>{"N"=>"1"},
-          "person_id"=>{"N" => "1500"}
-        },
-        {
-          "name"=>{"S"=>"Jane Smith"},
-          "created_at"=>{"N"=>"1321564309.99428"},
-          "disabled"=>{"N"=>"1"},
-          "group_id"=>{"N"=>"1"},
-          "person_id"=>{"N" => "1501"}
-        }
-      ],
-      "Count" => 1,
-      "ConsumedCapacityUnits" => 0.5
-    }
-    @typhoeus_response = mock("response", :body => MultiJson.dump(body))
-  end
-
-  describe "#hash_key_element" do
-    it "returns the typecast value of HashKeyElement" do
-      response = DynamoDB::Response.new(@typhoeus_response)
-      response.hash_key_element.should == 1
-    end
-  end
-
-  describe "#range_key_element" do
-    it "returns the typecast value of RangeKeyElement" do
-      response = DynamoDB::Response.new(@typhoeus_response)
-      response.range_key_element.should == 1501
-    end
-  end
-
-  context "Items" do
-    it "type casts response" do
-      response = DynamoDB::Response.new(@typhoeus_response)
-      response.items[0]["name"].should == "John Smith"
-      response.items[0]["created_at"].should == 1321564309.99428
-      response.items[0]["disabled"].should == 0
-      response.items[0]["group_id"].should == 1
-      response.items[0]["person_id"].should == 1500
-
-      response.items[1]["name"].should == "Jane Smith"
-      response.items[1]["created_at"].should == 1321564309.99428
-      response.items[1]["disabled"].should == 1
-      response.items[1]["group_id"].should == 1
-      response.items[1]["person_id"].should == 1501
-    end
-  end
-
-  context "Item" do
-    before do
-      body = {
-        "Item"=> {
-          "name"=>{"S"=>"John Smith"},
-          "created_at"=>{"N"=>"1321564309.99428"},
-          "disabled"=>{"N"=>"0"},
-          "group_id"=>{"N"=>"1"},
-          "person_id"=>{"N" => "1500"}
-        },
-        "ConsumedCapacityUnits" => 0.5
-      }
-      @typhoeus_response = mock("response", :body => MultiJson.dump(body))
-    end
-
-    it "type casts response" do
-      response = DynamoDB::Response.new(@typhoeus_response)
-      response.item["name"].should == "John Smith"
-      response.item["created_at"].should == 1321564309.99428
-      response.item["disabled"].should == 0
-      response.item["group_id"].should == 1
-      response.item["person_id"].should == 1500
-    end
-  end
-end

data/spec/dynamodb/security_token_service_spec.rb

@@ -1,97 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-module DynamoDB
-  describe SecurityTokenService do
-    let(:sts) { SecurityTokenService.new("access_key_id", "secret_access_key") }
-
-    context "success" do
-      before do
-        Time.stub(:now).and_return(Time.parse("2012-03-24T22:10:38Z"))
-        success_body = <<-XML
-          <GetSessionTokenResponse xmlns="https://sts.amazonaws.com/doc/2011-06-15/">
-          <GetSessionTokenResult>
-          <Credentials>
-          <SessionToken>session_token</SessionToken>
-          <SecretAccessKey>secret_access_key</SecretAccessKey>
-          <Expiration>2036-03-19T01:03:22.276Z</Expiration>
-          <AccessKeyId>access_key_id</AccessKeyId>
-          </Credentials>
-          </GetSessionTokenResult>
-          <ResponseMetadata>
-          <RequestId>f0fa5827-7156-11e1-8f1e-a92b58fdc66e</RequestId>
-          </ResponseMetadata>
-          </GetSessionTokenResponse>
-        XML
-
-        @request = stub_request(:get, "https://sts.amazonaws.com/").
-          with(:query => {
-            "AWSAccessKeyId"   => "access_key_id",
-            "Action"           => "GetSessionToken",
-            "Signature"        => "HyF65paDxprCe+zEHx7wxah+hiZ43PhvtmeehDtfuw8=",
-            "SignatureMethod"  => "HmacSHA256",
-            "SignatureVersion" => "2",
-            "Timestamp"        => "2012-03-24T22:10:38Z",
-            "Version"          => "2011-06-15",
-            "DurationSeconds"  => "129600"
-          }).to_return(:status => 200, :body => success_body)
-      end
-
-      it "obtains session_token, access_key_id, secret_access_key" do
-        sts = SecurityTokenService.new("access_key_id", "secret_access_key")
-        credentials = sts.credentials
-        credentials.access_key_id.should == "access_key_id"
-        credentials.secret_access_key.should == "secret_access_key"
-        credentials.session_token.should == "session_token"
-      end
-
-      it "does not query STS if the credentials are not expired" do
-        sts = SecurityTokenService.new("access_key_id", "secret_access_key")
-
-        sts.stub(:credentials_expired?).and_return(true)
-        sts.credentials
-        @request.should have_been_requested
-
-        WebMock.reset!
-
-        sts.stub(:credentials_expired?).and_return(false)
-        sts.credentials
-        @request.should_not have_been_requested
-      end
-    end
-
-    context "failure" do
-      before do
-        Time.stub(:now).and_return(Time.parse("2012-03-24T22:10:38Z"))
-        error_body = <<-XML
-          <ErrorResponse xmlns="https://sts.amazonaws.com/doc/2011-06-15/">
-            <Error>
-              <Type>Sender</Type>
-              <Code>InvalidClientTokenId</Code>
-              <Message>The security token included in the request is invalid</Message>
-            </Error>
-            <RequestId>a9f51cd0-7f5b-11e1-8022-bd0f2fc51c4b</RequestId>
-          </ErrorResponse>
-        XML
-
-        stub_request(:get, "https://sts.amazonaws.com/").
-          with(:query => {
-            "AWSAccessKeyId"   => "access_key_id",
-            "Action"           => "GetSessionToken",
-            "Signature"        => "HyF65paDxprCe+zEHx7wxah+hiZ43PhvtmeehDtfuw8=",
-            "SignatureMethod"  => "HmacSHA256",
-            "SignatureVersion" => "2",
-            "Timestamp"        => "2012-03-24T22:10:38Z",
-            "Version"          => "2011-06-15",
-            "DurationSeconds"  => "129600"
-          }).to_return(:status => 403, :body => error_body)
-      end
-
-      it "raises an AuthenticationError" do
-        s = SecurityTokenService.new("access_key_id", "secret_access_key")
-        proc {
-          s.credentials
-        }.should raise_error(DynamoDB::AuthenticationError)
-      end
-    end
-  end
-end