awsraw 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74ab136d9a8688640905f2ffd967f828dc960f42
-  data.tar.gz: d961172c156fe8a271b94d33665597cea23e249b
+  metadata.gz: 64214884680bff94ead6d97622548ca2b2220696
+  data.tar.gz: fb9def9e60782f6a8fcea2925cffffb87df7aa87
 SHA512:
-  metadata.gz: 2512ee73dde56b39b937258e0432eacd3b12a2056905ae28b921df5afb758d7d98cafe8225f3d96cefbcb9daf2833c42037724e8e9cc04ff57024f64b1c22d6d
-  data.tar.gz: c39c859a8b5516efaf9fd33dd0afc234c23efa70d79d802571b0baf68aebc81af417afcaae06a5886b830e46be35a9f9a6ea02e76f37f0dd92fe9882f559dab3
+  metadata.gz: efd7197aad5e071fb3706845c324230891b80d736be0fb9eaebe9989a9faf3563abb064f237853c0b6371e99996d4ba0be30b2a63c9bd0abe0f556cd439e84b5
+  data.tar.gz: c460f8556b43325d1355f71aad38fa870122e9d19aa41193e6c9f51808ac09871faf587346676c22c04b1b05e1f485c8dae0176d0bc04a7379f813e3d01da1c1

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -1,19 +1,36 @@
 # AWSRaw
 
-A client for [Amazon Web Services](http://www.amazonaws.com/) in the style of
+A client for [Amazon Web Services](http://www.amazonaws.com/) inspired by
 [FlickRaw](http://hanklords.github.com/flickraw/).
 
+
 ## Background
 
 AWSRaw has a simple goal: to let you follow the [AWS API
 docs](http://aws.amazon.com/documentation/), and translate that into Ruby code
-with the minimum of fuss.
+with the minimum of fuss. It adds as little abstraction as possible on top of
+the AWS REST API. (Think of it as the opposite of [fog](http://fog.io).)
+
+You use a regular HTTP library
+([Faraday](https://github.com/lostisland/faraday)) to make requests, and AWSRaw
+provides useful additions like request signing.
+
+
+## Status [![Build Status](https://travis-ci.org/envato/awsraw.png)](https://travis-ci.org/envato/awsraw) [![Code Climate](https://codeclimate.com/github/envato/awsraw.png)](https://codeclimate.com/github/envato/awsraw)
 
-This is the opposite of [fog](http://fog.io). AWSRaw tries to add as little
-abstraction as possible on top of the AWS REST API.
+This is a pre-release of 1.0, so to install it as a gem you'll need to use `gem
+install --pre awsraw`, or declare it as `gem 'awsraw', '~>1.0.0.alpha'` in your
+`Gemfile`.
+
+1.0 has solid tests, but has only had light use so far, and feedback is
+definitely welcome.
+
+So far we've only built S3 support. We'd love to see pull requests for other
+AWS services.
 
-You use a regular HTTP library to make requests, and AWSRaw provides useful
-additions like request signing.
+The old, 0.1 version lives on the
+[0.1-maintenance](https://github.com/envato/awsraw/tree/0.1-maintenance)
+branch.
 
 
 ## Examples
@@ -63,15 +80,15 @@ for all the requests you can make.
 
 #### On request bodies
 
-If your request has a body and you don't provide a Content-MD5 header for it,
-AWSRaw will try to calculate one. (The S3 API requires the Content-MD5 header
+If your request has a body and you don't provide a `Content-MD5` header for it,
+AWSRaw will try to calculate one. (The S3 API requires the `Content-MD5` header
 for correct request signing.)
 
-It can handle the body behaving as either a String or a File. If you want to do
-something different with the body, you'll need to set the Content-MD5 header
-yourself.
+It can handle the body behaving as either a `String` or a `File`. If you want
+to do something different with the body, you'll need to set the `Content-MD5`
+header yourself.
 
-You must also provide a Content-Type header for your request if there's a
+You must also provide a `Content-Type` header for your request if there's a
 request body. AWSRaw will raise an exception if you don't.
 
 
@@ -117,19 +134,6 @@ Then get your browser to do an XHR request using the http_post_variables, and
 Bob's your aunty.
 
 
-## Status
-
-This is still a bit experimental, and is missing some key features, but what's
-there is solid and well tested.
-
-Right now AWSRaw only has direct support for
-[Faraday](https://github.com/lostisland/faraday), but you could still use it
-with other client libraries with a bit of work.
-
-So far we've only built S3 support. We'd love to see pull requests for other
-AWS services.
-
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/awsraw/s3/canonicalized_resource.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'cgi'
 
 module AWSRaw
   module S3
@@ -39,9 +40,17 @@ module AWSRaw
       # that are overridden by parameters, nor does it handle the "delete"
       # parameter for multi-object Delete requests.
       def self.canonicalized_subresources(query)
-        query ||= ""
-        subresources = query.split("&") & VALID_SUBRESOURCES
-        "?#{subresources.sort.join('&')}" unless subresources.empty?
+        params = CGI.parse(query || "")
+        subresources = params.keys & VALID_SUBRESOURCES
+        return nil if subresources.empty?
+
+        '?' + subresources.sort.collect { |subresource|
+          if params[subresource].empty?
+            subresource
+          else
+            params[subresource].collect { |value| "#{subresource}=#{value}" }
+          end
+        }.flatten.join('&')
       end
 
     end

data/lib/awsraw/s3/faraday_middleware.rb

@@ -20,7 +20,7 @@ module AWSRaw
         end
 
         env[:request_headers]['Date']        ||= Time.now.httpdate
-        env[:request_headers]['Content-MD5'] ||= ContentMD5Header.generate_content_md5(env[:body])
+        env[:request_headers]['Content-MD5'] ||= ContentMD5Header.generate_content_md5(env[:body]) if env[:body]
 
         string_to_sign = StringToSign.string_to_sign(
           :method       => env[:method].to_s.upcase,
@@ -32,8 +32,9 @@ module AWSRaw
         )
 
         env[:request_headers]['Authorization'] = Signature.authorization_header(string_to_sign, @credentials)
-      end
 
+        @app.call(env)
+      end
     end
   end
 end

data/lib/awsraw/version.rb

@@ -1,3 +1,3 @@
 module AWSRaw
-  VERSION = "1.0.0.alpha.1"
+  VERSION = "1.0.0.alpha.2"
 end

data/spec/s3/canonicalized_resource_spec.rb

@@ -46,6 +46,10 @@ describe AWSRaw::S3::CanonicalizedResource do
     it "sorts the subresources" do
       expect(subject.canonicalized_subresources("website&acl")).to eq("?acl&website")
     end
+
+    it "includes subresources with parameters" do
+      expect(subject.canonicalized_subresources("uploadId=foo")).to eq("?uploadId=foo")
+    end
   end
 
 end

data/spec/s3/faraday_middleware_spec.rb

@@ -10,8 +10,9 @@ describe AWSRaw::S3::FaradayMiddleware do
     )
   end
 
-  let(:app)  { double("app") }
-  let(:time) { Time.parse("2013-09-19 19:22:13 +1000") }
+  let(:app)      { double("app", :call => response) }
+  let(:time)     { Time.parse("2013-09-19 19:22:13 +1000") }
+  let(:response) { double "response" }
 
   subject { described_class.new(app, credentials) }
 
@@ -85,4 +86,25 @@ describe AWSRaw::S3::FaradayMiddleware do
     expect { subject.call(env) }.to raise_error(AWSRaw::Error, "Can't make a request with a body but no Content-Type header")
   end
 
+  it "does not set the MD5 header if no body is supplied" do
+    env = {
+      :method          => :get,
+      :url             => "http://s3.amazonaws.com/johnsmith/my-file.txt",
+      :request_headers => { }
+    }
+    subject.call(env)
+    expect(env[:request_headers].keys).to_not include("Content-MD5")
+  end
+
+  it "passes on the call to the app" do
+    env = {
+      :method          => :get,
+      :url             => "http://s3.amazonaws.com/johnsmith/my-file.txt",
+      :request_headers => { }
+    }
+
+    app.should_receive(:call).with(env)
+
+    subject.call(env)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsraw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.1
+  version: 1.0.0.alpha.2
 platform: ruby
 authors:
 - Pete Yandell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,6 +78,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md