awsraw 0.1.1 → 0.1.2

data/README.md

@@ -31,11 +31,15 @@ s3 = AWSRaw::S3::Client.new(
        ENV['AWS_ACCESS_KEY_ID'],
        ENV['AWS_SECRET_ACCESS_KEY'])
 
+file = File.open("reaction.gif", "rb")
+
 s3.request(:method  => "PUT",
            :bucket  => "mah-sekret-buckit",
            :key     => "reaction.gif",
-           :content => File.read("reaction.gif"),
+           :content => file,
            :headers => { "Content-Type" => "image/gif" })
+
+f.close
 ```
 
 Signed query-string requests, to allow authorized clients to get protected

data/awsraw.gemspec

@@ -5,8 +5,8 @@ require "awsraw/version"
 Gem::Specification.new do |s|
   s.name        = "awsraw"
   s.version     = Awsraw::VERSION
-  s.authors     = ["Pete Yandell", "David Goodlad"]
-  s.email       = ["pete@notahat.com", "david@goodlad.net"]
+  s.authors     = ["Pete Yandell", "David Goodlad", "Jack 'chendo' Chen"]
+  s.email       = ["pete@notahat.com", "david@goodlad.net", "gems.awsraw@chen.do"]
   s.license     = 'MIT'
   s.homepage    = "http://github.com/envato/awsraw"
   s.summary     = %q{Minimal AWS client}

data/lib/awsraw/s3/client.rb

@@ -1,11 +1,14 @@
 require 'net/http'
 require 'awsraw/s3/request'
+require 'awsraw/s3/http_request_builder'
 require 'awsraw/s3/response'
 require 'awsraw/s3/signer'
-
+require 'awsraw/s3/md5_digester'
 module AWSRaw
   module S3
 
+    class ConnectionError < StandardError; end
+
     # A client for the AWS S3 rest API.
     #
     # http://docs.amazonwebservices.com/AmazonS3/latest/API/APIRest.html
@@ -19,7 +22,7 @@ module AWSRaw
       def request(params = {})
         request = Request.new(params, signer)
 
-        http_request = construct_http_request(request)
+        http_request = HTTPRequestBuilder.new(request).build
 
         http_response = Net::HTTP.start(request.uri.host, request.uri.port) do |http|
           http.request(http_request)
@@ -30,36 +33,11 @@ module AWSRaw
 
       def request!(params = {})
         response = request(params)
-        raise "Uh oh! Failure from S3." if response.failure?
+        raise ConnectionError, response.inspect if response.failure?
       end
 
     private
 
-      def construct_http_request(request)
-        klass = http_request_class(request)
-        path  = request.uri.request_uri
-
-        klass.new(path).tap do |http_request|
-          request.headers.each do |name, value|
-            http_request[name] = value
-          end
-          http_request.body = request.content
-        end
-      end
-
-      def http_request_class(request)
-        case request.method
-          when "GET"
-            Net::HTTP::Get
-          when "HEAD"
-            Net::HTTP::Head
-          when "PUT"
-            Net::HTTP::Put
-          else
-            raise "Invalid HTTP method!"
-        end
-      end
-
       def construct_response(http_response)
         Response.new(
           :code    => http_response.code,

data/lib/awsraw/s3/http_request_builder.rb

@@ -0,0 +1,49 @@
+require 'net/http'
+module AWSRaw
+  module S3
+    class HTTPRequestBuilder
+      attr_reader :s3_request
+
+      def initialize(s3_request)
+        @s3_request = s3_request
+      end
+
+      def build
+        klass = http_request_class(s3_request)
+        path  = s3_request.uri.request_uri
+
+        klass.new(path).tap do |http_request|
+          s3_request.headers.each do |name, value|
+            http_request[name] = value
+          end
+          set_content_on_request(http_request, s3_request.content)
+        end
+      end
+
+      private
+
+      def http_request_class(s3_request)
+        case s3_request.method
+          when "GET"
+            Net::HTTP::Get
+          when "HEAD"
+            Net::HTTP::Head
+          when "PUT"
+            Net::HTTP::Put
+          else
+            raise "Invalid HTTP method!"
+        end
+      end
+
+      def set_content_on_request(http_request, content)
+        if content.is_a?(File)
+          http_request.body_stream = content
+          http_request['Content-Length'] = content.size.to_s
+        else
+          http_request.body = content
+        end
+      end
+
+    end
+  end
+end

data/lib/awsraw/s3/md5_digester.rb

@@ -0,0 +1,19 @@
+module AWSRaw
+  module S3
+    class MD5Digester
+      def initialize(string_or_file)
+        @string_or_file = string_or_file
+      end
+
+      def digest
+        if @string_or_file.is_a?(File)
+          Digest::MD5.file(@string_or_file.path).digest
+        elsif @string_or_file.is_a?(String)
+          Digest::MD5.digest(@string_or_file)
+        else
+          raise "Unable to digest #{@string_or_file.class}"
+        end
+      end
+    end
+  end
+end

data/lib/awsraw/s3/request.rb

@@ -50,7 +50,7 @@ module AWSRaw
       end
 
       def content_md5
-        @content_md5 ||= Base64.encode64(Digest::MD5.digest(content)).strip
+        @content_md5 ||= Base64.encode64(MD5Digester.new(content).digest).strip
       end
     end
 

data/lib/awsraw/version.rb

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

data/spec/s3/client_spec.rb

@@ -4,14 +4,14 @@ describe AWSRaw::S3::Client do
 
   subject { AWSRaw::S3::Client.new("dummy_access_key_id", "dummy_secret_access_key") }
 
-  context "#request!" do
+  describe "#request!" do
     it "returns if the response indicates success" do
       response = stub(:failure? => false)
       subject.stub(:request => response)
 
       expect {
         subject.request!(:method => "PUT")
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it "raises an error if the response indicates failure" do
@@ -20,9 +20,8 @@ describe AWSRaw::S3::Client do
 
       expect {
         subject.request!(:method => "PUT")
-      }.should raise_error("Uh oh! Failure from S3.")
+      }.to raise_error(::AWSRaw::S3::ConnectionError)
     end
   end
-
 end
 

data/spec/s3/http_request_builder_spec.rb

@@ -0,0 +1,45 @@
+require 'awsraw/s3/http_request_builder'
+
+describe AWSRaw::S3::HTTPRequestBuilder do
+  subject do
+    AWSRaw::S3::HTTPRequestBuilder.new(s3_request)
+  end
+
+  let(:content) { "hello world" }
+  let(:s3_request) do
+    stub(
+      :uri => URI.parse("http://foo.com/foo"),
+      :headers => {"Content-Type" => "application/not-real"},
+      :content => content,
+      :method => "PUT"
+    )
+  end
+
+  context "content is a string" do
+    let(:content) { "hello world" }
+    it "sets the body on the http request to content" do
+      subject.build.body.should == content
+    end
+  end
+
+  context "content is a file object" do
+    let(:content) { File.open(__FILE__, "rb") }
+    it "sets the body on the http request to content" do
+      http_request = subject.build
+      http_request.body_stream.should == content
+      http_request['Content-Length'].should == File.size(__FILE__).to_s
+    end
+  end
+
+  it "sets the path on the request" do
+    subject.build.path.should == "/foo"
+  end
+
+  it "sets the headers" do
+    subject.build["Content-Type"].should == "application/not-real"
+  end
+
+  it "returns the appropriate request class" do
+    subject.build.class.should == Net::HTTP::Put
+  end
+end

data/spec/s3/md5_digester_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+require 'awsraw/s3/md5_digester'
+
+describe AWSRaw::S3::MD5Digester do
+
+  describe "#digest" do
+    it "returns the md5 digest of the string" do
+      AWSRaw::S3::MD5Digester.new("hello").digest.should == Digest::MD5.digest("hello")
+    end
+
+    it "returns the md5 digest of a file" do
+      file = File.open(__FILE__, "rb")
+      AWSRaw::S3::MD5Digester.new(file).digest.should == Digest::MD5.file(__FILE__).digest
+    end
+
+    it "raises an error on unknown input" do
+      expect { AWSRaw::S3::MD5Digester.new(3).digest }.to raise_error("Unable to digest Fixnum")
+    end
+  end
+end
+

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: awsraw
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - Pete Yandell
 - David Goodlad
+- Jack 'chendo' Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,6 +49,7 @@ description: A client for Amazon Web Services in the style of FlickRaw
 email:
 - pete@notahat.com
 - david@goodlad.net
+- gems.awsraw@chen.do
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -60,12 +62,16 @@ files:
 - awsraw.gemspec
 - lib/awsraw.rb
 - lib/awsraw/s3/client.rb
+- lib/awsraw/s3/http_request_builder.rb
+- lib/awsraw/s3/md5_digester.rb
 - lib/awsraw/s3/query_string_signer.rb
 - lib/awsraw/s3/request.rb
 - lib/awsraw/s3/response.rb
 - lib/awsraw/s3/signer.rb
 - lib/awsraw/version.rb
 - spec/s3/client_spec.rb
+- spec/s3/http_request_builder_spec.rb
+- spec/s3/md5_digester_spec.rb
 - spec/s3/query_string_signer_spec.rb
 - spec/s3/signer_spec.rb
 homepage: http://github.com/envato/awsraw
@@ -81,18 +87,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2315837560340304412
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2315837560340304412
 requirements: []
 rubyforge_project: awsraw
 rubygems_version: 1.8.23
@@ -101,5 +101,7 @@ specification_version: 3
 summary: Minimal AWS client
 test_files:
 - spec/s3/client_spec.rb
+- spec/s3/http_request_builder_spec.rb
+- spec/s3/md5_digester_spec.rb
 - spec/s3/query_string_signer_spec.rb
 - spec/s3/signer_spec.rb