awsraw 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64214884680bff94ead6d97622548ca2b2220696
-  data.tar.gz: fb9def9e60782f6a8fcea2925cffffb87df7aa87
+  metadata.gz: 27534ba6f94fa8bd5456bc693dc5505bcf30840e
+  data.tar.gz: cacd2d4029079c1c2a71b611d050ff00d5d878ea
 SHA512:
-  metadata.gz: efd7197aad5e071fb3706845c324230891b80d736be0fb9eaebe9989a9faf3563abb064f237853c0b6371e99996d4ba0be30b2a63c9bd0abe0f556cd439e84b5
-  data.tar.gz: c460f8556b43325d1355f71aad38fa870122e9d19aa41193e6c9f51808ac09871faf587346676c22c04b1b05e1f485c8dae0176d0bc04a7379f813e3d01da1c1
+  metadata.gz: eccdf2a5654dc5fdaf984a2745bc39e5795177e23ff19bc6bda8108d792dfe648c2d854aec9fbb4e3ba233a045ebcbf3e842700a7cdd6766baeb33b780a6bf78
+  data.tar.gz: 8e4ab1687c3445a1289acb7540ca576243a37e127328fb9150d73ddebdafa066b01a8bf6648e11649db2f85d8d6b3756be83af65616dd0d35197adb53a34160b

data/.gitignore

@@ -1,4 +1,5 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
+/*.gem
+/.bundle
+/Gemfile.lock
+/pkg/*
+/vendor

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0

data/awsraw.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.14"
+  s.add_development_dependency "rspec", "~> 3.0.0"
   s.add_runtime_dependency "finer_struct", "~> 0.0.5"
-  s.add_runtime_dependency "faraday", "~> 0.8.8"
+  s.add_runtime_dependency "faraday", "~> 0.9.0"
 end

data/build

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mkdir -p vendor/bundle
+bundle install --path vendor/bundle
+bundle exec rspec

data/lib/awsraw/s3/faraday_middleware.rb

@@ -19,9 +19,20 @@ module AWSRaw
           raise AWSRaw::Error, "Can't make a request with a body but no Content-Type header"
         end
 
+        add_missing_headers(env)
+        sign_request(env)
+
+        @app.call(env)
+      end
+
+    private
+
+      def add_missing_headers(env)
         env[:request_headers]['Date']        ||= Time.now.httpdate
         env[:request_headers]['Content-MD5'] ||= ContentMD5Header.generate_content_md5(env[:body]) if env[:body]
+      end
 
+      def sign_request(env)
         string_to_sign = StringToSign.string_to_sign(
           :method       => env[:method].to_s.upcase,
           :uri          => env[:url],
@@ -32,9 +43,8 @@ module AWSRaw
         )
 
         env[:request_headers]['Authorization'] = Signature.authorization_header(string_to_sign, @credentials)
-
-        @app.call(env)
       end
+
     end
   end
 end

data/lib/awsraw/s3/signature.rb

@@ -38,7 +38,7 @@ module AWSRaw
     private
 
       def self.hmac_sha1(data, credentials)
-        digest = OpenSSL::Digest::Digest.new("sha1")
+        digest = OpenSSL::Digest.new("sha1")
         OpenSSL::HMAC.digest(digest, credentials.secret_access_key, data)
       end
 

data/lib/awsraw/version.rb

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

data/spec/s3/faraday_middleware_spec.rb

@@ -37,7 +37,7 @@ describe AWSRaw::S3::FaradayMiddleware do
   end
 
   it "sets the Date header if there isn't one" do
-    Time.stub(:now => time) # Freeze time for the duration of the test.
+    allow(Time).to receive(:now).and_return(time) # Freeze time for the duration of the test.
 
     env = {
       :method          => :get,
@@ -103,7 +103,7 @@ describe AWSRaw::S3::FaradayMiddleware do
       :request_headers => { }
     }
 
-    app.should_receive(:call).with(env)
+    expect(app).to receive(:call).with(env)
 
     subject.call(env)
   end

data/spec/s3/signature_spec.rb

@@ -11,6 +11,7 @@ describe AWSRaw::S3::Signature do
     )
   end
 
+
   context ".signature" do
     context "AWS example tests:" do
       # Examples are pulled from the AWS docs:
@@ -90,14 +91,21 @@ EOF
 
     let(:signature) { "0RavWzkygo6QX9caELEqKi9kDbU=" }
 
+    # Note: These credentials are (I think) from an old version of the AWS
+    # examples. The credentials currently in the docs don't produce the
+    # example signature. I suspect AWS haven't correctly updated their docs.
+    let(:credentials) do
+      OpenStruct.new(
+        :access_key_id     => "0PN5J17HBGZHT7JJ3X82",
+        :secret_access_key => "uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o"
+      )
+    end
+
     it ".encode_form_policy correctly encodes a policy" do
       expect(subject.encode_form_policy(policy_json)).to eq(policy_base64)
     end
 
-    # Note: This test fails. I'm pretty sure the example in the AWS docs is
-    # wrong, but I'm leaving it failing until I can confirm that.
     it ".form_signature correctly signs a policy" do
-      pending "Figure out which is wrong: the AWS examples or the code"
       expect(subject.form_signature(policy_base64, credentials)).to eq(signature)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsraw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.alpha.3
 platform: ruby
 authors:
 - Pete Yandell
@@ -10,64 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: finer_struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
 description: A client for Amazon Web Services in the style of FlickRaw
 email:
 - pete@notahat.com
@@ -77,14 +77,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - awsraw.gemspec
+- build
 - lib/awsraw.rb
 - lib/awsraw/credentials.rb
 - lib/awsraw/error.rb
@@ -112,17 +113,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: awsraw
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Minimal AWS client
@@ -133,3 +134,4 @@ test_files:
 - spec/s3/query_string_signer_spec.rb
 - spec/s3/signature_spec.rb
 - spec/s3/string_to_sign_spec.rb
+has_rdoc: