awsraw 0.1.2 → 0.1.3

data/lib/awsraw/s3/signer.rb

@@ -57,7 +57,12 @@ module AWSRaw
 
       def canonicalized_resource(request)
         # TODO: Should also append the sub-resource.
-        request.path
+        if request.host =~ /^(.+)\.s3\.amazonaws\.com/
+          bucket = request.host.split(/\./).first
+          '/' + bucket + request.path
+        else
+          request.path
+        end
       end
 
     end

data/lib/awsraw/version.rb

@@ -1,3 +1,3 @@
 module Awsraw
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/s3/query_string_signer_spec.rb

@@ -24,6 +24,22 @@ describe AWSRaw::S3::QueryStringSigner do
         "http://s3.amazonaws.com/johnsmith/photos/puppy.jpg?AWSAccessKeyId=#{access_key_id}&Expires=#{expiry}&Signature=NpgCjnDzrM%2BWFzoENXmpNDUsSn8%3D"
     end
 
+    it "signs a get request to a non-us-east bucket" do
+      url = "http://johnsmith.s3.amazonaws.com/photos/puppy.jpg"
+      expiry = 1175139620
+
+      subject.string_to_sign(url, expiry).should ==
+        "GET\n\n\n#{expiry}\n/johnsmith/photos/puppy.jpg"
+
+      subject.query_string_hash(url, expiry).should == {
+        "AWSAccessKeyId" => access_key_id,
+        "Expires"        => expiry.to_s,
+        "Signature"      => "NpgCjnDzrM%2BWFzoENXmpNDUsSn8%3D"
+      }
+
+      subject.sign_with_query_string(url, expiry).to_s.should ==
+        "http://johnsmith.s3.amazonaws.com/photos/puppy.jpg?AWSAccessKeyId=#{access_key_id}&Expires=#{expiry}&Signature=NpgCjnDzrM%2BWFzoENXmpNDUsSn8%3D"
+    end
   end
 end
 

data/spec/s3/signer_spec.rb

@@ -10,6 +10,7 @@ describe AWSRaw::S3::Signer do
     it "signs a get request correctly" do
       request = stub(
         :method  => "GET",
+        :host    => "s3.amazonaws.com",
         :path    => "/johnsmith/photos/puppy.jpg",
         :headers => { "Date" => "Tue, 27 Mar 2007 19:36:42 +0000" }
       )
@@ -23,6 +24,7 @@ describe AWSRaw::S3::Signer do
     it "signs an upload correctly" do
       request = stub(
         :method => "PUT",
+        :host    => "s3.amazonaws.com",
         :path   => "/static.johnsmith.net/db-backup.dat.gz",
         :headers => {
           "User-Agent"                   => "curl/7.15.5",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsraw
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,12 +87,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2102654929379621144
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2102654929379621144
 requirements: []
 rubyforge_project: awsraw
 rubygems_version: 1.8.23