ralexa 0.0.3 → 0.0.4

data/lib/ralexa/uri_signer.rb

@@ -20,13 +20,13 @@ module Ralexa
 
     def sign_uri(original_uri)
       original_uri.dup.tap do |uri|
-        uri.query_values = uri.query_values.merge(
+        add_query_values(uri,
           "AWSAccessKeyId" => @access_key_id,
           "Timestamp" => timestamp,
           "SignatureVersion" => SIGNATURE_VERSION.to_s,
           "SignatureMethod" => signature_method,
         )
-        uri.query_values = uri.query_values.merge(
+        add_query_values(uri,
           "Signature" => signature(uri)
         )
       end
@@ -34,6 +34,10 @@ module Ralexa
 
     private
 
+    def add_query_values(uri, parameters)
+      uri.query_values = (uri.query_values || {}).merge(parameters)
+    end
+
     def string_to_sign(uri)
       [
         "GET",

data/lib/ralexa/version.rb

@@ -1,3 +1,3 @@
 module Ralexa
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/ralexa.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Ralexa::VERSION
 
-  gem.add_runtime_dependency "addressable"
+  # addressable 2.2.7 introduces URI#hostname for Net::HTTP compatibility.
+  gem.add_runtime_dependency "addressable", ">= 2.2.7"
   gem.add_runtime_dependency "nokogiri"
 
   gem.add_development_dependency "minitest"

data/spec/uri_signer_spec.rb

@@ -6,9 +6,17 @@ module Ralexa
   describe UriSigner do
 
     let(:time_utc) { Time.now.utc }
+    let(:timestamp) { time_utc.strftime("%Y-%m-%dT%H:%M:%S.000Z") }
     let(:digest) { MiniTest::Mock.new }
     let(:hmac_signer) { MiniTest::Mock.new }
     let(:base64_encoder) { MiniTest::Mock.new }
+    let(:signed_uri) { signer.sign_uri(uri) }
+
+    before do
+      digest.expect :name, "FAKE"
+      hmac_signer.expect :digest, "the_hmac", [ digest, "secret", combined ]
+      base64_encoder.expect :encode64, "base64_encoded\n", [ "the_hmac" ]
+    end
 
     def signer
       UriSigner.new("id", "secret").tap do |rs|
@@ -22,20 +30,12 @@ module Ralexa
     describe "for http://example.org/path?b=c&a=b" do
 
       let(:uri) { Addressable::URI.parse("http://example.org/path?b=c&a=b") }
-      let(:signed_uri) { signer.sign_uri(uri) }
-      let(:timestamp) { time_utc.strftime("%Y-%m-%dT%H:%M:%S.000Z") }
-
-      before do
+      let(:combined) do
         ts = URI.escape(timestamp, /:/)
-        combined = [
-          "GET",
-          "example.org",
-          "/path",
+        [
+          "GET", "example.org", "/path",
           "AWSAccessKeyId=id&SignatureMethod=HmacFAKE&SignatureVersion=2&Timestamp=#{ts}&a=b&b=c"
         ].join("\n")
-        hmac_signer.expect :digest, "the_hmac", [ digest, "secret", combined ]
-        base64_encoder.expect :encode64, "base64_encoded\n", [ "the_hmac" ]
-        digest.expect :name, "FAKE"
       end
 
       it "returns a signed URL" do
@@ -57,5 +57,26 @@ module Ralexa
       end
     end
 
+    describe "for URL without query string" do
+      let(:uri) { Addressable::URI.parse("http://example.org/") }
+      let(:combined) do
+        ts = URI.escape(timestamp, /:/)
+        [
+          "GET", "example.org", "/",
+          "AWSAccessKeyId=id&SignatureMethod=HmacFAKE&SignatureVersion=2&Timestamp=#{ts}"
+        ].join("\n")
+      end
+
+      it "returns a signed URL" do
+        signed_uri.query_values.must_equal(
+          "AWSAccessKeyId" => "id",
+          "Signature" => "base64_encoded",
+          "SignatureMethod" => "HmacFAKE",
+          "SignatureVersion" => "2",
+          "Timestamp" => timestamp,
+        )
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ralexa
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70339587667200 !ruby/object:Gem::Requirement
+  requirement: &70150126400840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70339587667200
+  version_requirements: *70150126400840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70339587666780 !ruby/object:Gem::Requirement
+  requirement: &70150126400420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339587666780
+  version_requirements: *70150126400420
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70339587666360 !ruby/object:Gem::Requirement
+  requirement: &70150126399960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339587666360
+  version_requirements: *70150126399960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70339587665940 !ruby/object:Gem::Requirement
+  requirement: &70150126399540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339587665940
+  version_requirements: *70150126399540
 description: Ruby client for Amazon Alexa APIs.
 email:
 - paul@annesley.cc