rack-contrib-sign 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e063e40cf6ff43aa7ccd9f89e905d4f87a733baf
-  data.tar.gz: 7a20e29567951a4d2908bb5a64aea76820fb4c87
+  metadata.gz: 0f04f49f937e4e268755732df3b62e1fa36a0646
+  data.tar.gz: f93c5ed88d1dd26885d43014f1b25818a77e0617
 SHA512:
-  metadata.gz: 7d2255f91a0a46d4f65a26ab6589a1c480ef9caa5fa0a2b27f55900cb90c367f4f1689e06ea836df5552a074f7c3256aa939b0e0a6bd9f41f64d3092461321a2
-  data.tar.gz: e4013973326b23f2f14101a725b775f908409ccefaa313208257460b76e2fafddad8166c4014de3a671d51f50ea73df4947343e83d229f25029f06da19e373ea
+  metadata.gz: 5152592a6cbcae4aa188c8fdd81cbe647a74dcd0bdc84898a8693e1624579edbb8fe2d7003d93c9c3442eccafd2f23f25a0fe7d64f25676e6a895a7625464cec
+  data.tar.gz: b6b67f84cadd35298807bb9136ef20c43cdb802b8061e72eb05102dfc39d93674e25fb34c405ab4ecf738d309d0fc8c6fc126fe014ab8d9a42fde35f39f7bc91

data/lib/rack/contrib/sign.rb

@@ -1,4 +1,5 @@
 
+require 'digest/md5'
 require 'logger'
 
 require "rack/contrib/sign/version"

data/lib/rack/contrib/sign/middleware.rb

@@ -47,9 +47,11 @@ module Rack
         # Extract environmental data into a Receipt
         def build_receipt env, credentials
           receipt = Rack::Contrib::Sign::Receipt.new
+          receipt.host = env['rack.url_scheme'] + '://' + env['HTTP_HOST']
           receipt.uri = env['REQUEST_URI']
           receipt.request_method = env['REQUEST_METHOD']
           receipt.body = extract_body env
+          receipt.content_type = env['HTTP_CONTENT_TYPE'] || ''
 
           extract_headers(env).each { |h,v| receipt.headers[h] = v }
 

data/lib/rack/contrib/sign/receipt.rb

@@ -8,7 +8,9 @@ module Rack
         attr_accessor :api_key
         attr_accessor :api_secret
         attr_accessor :body
+        attr_accessor :content_type
         attr_accessor :uri
+        attr_accessor :host
 
         def initialize
           @headers = {}
@@ -18,17 +20,27 @@ module Rack
           @request_method = s.upcase
         end
 
+        def body_md5
+          Digest::MD5.hexdigest(body)
+        end
+
+        def body_length
+          body.length
+        end
+
         def to_s
           preamble + header_text
         end
 
         def preamble
           s = ""
-          s << "%s %s\n" % [request_method, uri]
+          s << "%s\n" % request_method
+          s << "%s\n" % host
+          s << "%s\n" % uri
           s << "%s\n" % api_key
-          s << "%s\n" % api_secret
-          s << "%s\n" % body
-          s << "--\n"
+          s << "%s\n" % content_type
+          s << "%s\n" % body_length
+          s << "%s\n" % body_md5
           s
         end
 

data/lib/rack/contrib/sign/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Contrib
     module Sign
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/rack/contrib/sign/middleware_spec.rb

@@ -29,7 +29,10 @@ describe Rack::Contrib::Sign::Middleware do
     it "sets various options" do
       env = {
         'REQUEST_METHOD' => 'POST',
-        'REQUEST_URI' => 'foo/bar',
+        'HTTP_HOST' => '127.0.0.1:9292',
+        'rack.url_scheme' => 'http',
+        'HTTP_CONTENT_TYPE' => 'text/plain',
+        'REQUEST_URI' => '/foo/bar',
         'HTTP_HI_FOOO' => 'YIPEE',
         'rack.input' => StringIO.new('foo=bar')
       }
@@ -38,7 +41,9 @@ describe Rack::Contrib::Sign::Middleware do
 
       receipt = ware.build_receipt(env, creds)
 
-      receipt.uri.should eq('foo/bar')
+      receipt.host.should eq('http://127.0.0.1:9292')
+      receipt.content_type.should eq('text/plain')
+      receipt.uri.should eq('/foo/bar')
       receipt.request_method.should eq('POST')
       receipt.body.should eq('foo=bar')
       receipt.api_key.should eq('123')
@@ -130,6 +135,8 @@ describe Rack::Contrib::Sign::Middleware do
         env = {
           'HTTP_AUTHORIZATION' => 'foo-bar 123:foo',
           'REQUEST_METHOD' => '?',
+          'HTTP_HOST' => '127.0.0.1:9292',
+          'rack.url_scheme' => 'http',
           'rack.input' => StringIO.new()
         }
 
@@ -143,7 +150,9 @@ describe Rack::Contrib::Sign::Middleware do
         env = {
           'HTTP_AUTHORIZATION' => 'foo-bar abc:YABBA DABBA DOOO',
           'REQUEST_METHOD' => 'POST',
-          'REQUEST_URI' => 'http://foo/bar/baz',
+          'HTTP_HOST' => '127.0.0.1:9292',
+          'rack.url_scheme' => 'http',
+          'REQUEST_URI' => '/foo/bar/baz',
           'rack.input' => StringIO.new('foo=bar'),
         }
 
@@ -154,9 +163,12 @@ describe Rack::Contrib::Sign::Middleware do
       it "works when I sign it right" do
         cred_provider['123'] = 'abc'
         env = {
-          'HTTP_AUTHORIZATION' => 'foo-bar 123:0d501b6934dc0ec5f1452947a7afd108e41c91af',
+          'HTTP_AUTHORIZATION' => 'foo-bar 123:75e8d7d1c4eeb07a049f9f7c1395aa2e61e5a879',
           'REQUEST_METHOD' => 'POST',
-          'REQUEST_URI' => 'http://foo/bar/baz',
+          'HTTP_HOST' => '127.0.0.1:9292',
+          'HTTP_CONTENT_TYPE' => 'text/plain',
+          'rack.url_scheme' => 'http',
+          'REQUEST_URI' => '/foo/bar/baz',
           'rack.input' => StringIO.new('foo=bar'),
           'HTTP_HI_FOOOO' => 'aoenuoneuh',
           'HTTP_BYE_FOOO' => 'oeucorgcgc'

data/spec/rack/contrib/sign/receipt_spec.rb

@@ -9,8 +9,12 @@ describe Rack::Contrib::Sign::Receipt do
   it { should respond_to(:api_secret=) }
   it { should respond_to(:body) }
   it { should respond_to(:body=) }
+  it { should respond_to(:content_type) }
+  it { should respond_to(:content_type=) }
   it { should respond_to(:request_method) }
   it { should respond_to(:request_method=) }
+  it { should respond_to(:host) }
+  it { should respond_to(:host=) }
   it { should respond_to(:uri) }
   it { should respond_to(:uri=) }
   it { should respond_to(:headers) }
@@ -22,6 +26,22 @@ describe Rack::Contrib::Sign::Receipt do
     end
   end
 
+  describe "#body_md5" do
+    it "returns the md5 of the body" do
+      receipt.body = 'herro'
+
+      receipt.body_md5.should eq("18f1072de45420e57fd22ee5bd59df9e")
+    end
+  end
+
+  describe "#body_length" do
+    it "returns the length of the body" do
+      receipt.body = 'herro'
+
+      receipt.body_length.should eq(5)
+    end
+  end
+
   describe "#headers" do
     it "defaults to an empty hash" do
       receipt.headers.should eq({})
@@ -43,18 +63,22 @@ describe Rack::Contrib::Sign::Receipt do
   describe "#preamble" do
     it "incorporates all the preamble elements in a string block" do
       receipt.api_key = 'abc'
-      receipt.api_secret = '123'
       receipt.body = 'foo=bar'
       receipt.request_method = 'post'
-      receipt.uri = 'http://example.com/123'
+      receipt.host = 'http://example.com'
+      receipt.uri = '/123?foo=bar'
+      receipt.content_type = "text/json"
 
       returned = receipt.preamble
 
-      r = "POST http://example.com/123\n"
+      r = ""
+      r << "POST\n"
+      r << "http://example.com\n"
+      r << "/123?foo=bar\n"
       r << "abc\n"
-      r << "123\n"
-      r << "foo=bar\n"
-      r << "--\n"
+      r << "text/json\n"
+      r << "7\n"
+      r << "06ad47d8e64bd28de537b62ff85357c4\n"
 
       returned.should eq(r)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-contrib-sign
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Graham Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler