ey-hmac 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfeeb93b92db1297b05223d6bb2b3e5aebc4baf
-  data.tar.gz: 4675e5002ad0686d6a819df058c6768110d442a1
+  metadata.gz: 4bf59e1087a2bb852ce1369afa06913660f30c2e
+  data.tar.gz: 93441d3b60b6a85ec126c0451c804b747a722b96
 SHA512:
-  metadata.gz: 26a224b85612a8f673894612a5e0cc130a2f0dd0bccb0c945611bc2bc30c479b088cd7d19db3425ad09350c63f0c3e6e3b3304195239966dad760deccd8c33a4
-  data.tar.gz: b977ba7137c163af67c3c2a4c5eaf49f7f8e1e7ce11e9967fd07f3aa1d39a1e399bfd4aa77af2a7ca62f477803c5fc440e3630dd3ab555bda4dfaf1962433901
+  metadata.gz: 5a9898ab08b0f02936a94bafd16e58565df0f74de3e79636647823769e1b73cbd97f99ab5e938a1379f4e12441bc1fa3ff6a7dd63ef7dbca7f74ee0ff178a8e8
+  data.tar.gz: ea32437e299a19a3a712e06f2532a32dfd89a5d03c7f3a6a8ad5983fb88d9e73ed7a92f732cc3e0a9b194c55e8393b2092784ee58e7bdde5bbc6b9ce129f6045

data/Gemfile

@@ -4,10 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 group(:test) do
-  gem 'guard-bundler'
-  gem 'guard-rspec', '~> 4.2'
   gem 'pry-nav'
-  gem 'rspec', '~> 2.99'
+  gem 'rspec', '~> 3.3'
 end
 
 group(:rack) do
@@ -17,5 +15,6 @@ group(:rack) do
 end
 
 group(:faraday) do
-  gem 'faraday', '~> 0.9.0'
+  gem 'faraday', '~> 0.9'
+  gem 'faraday_middleware'
 end

data/README.md

@@ -41,7 +41,7 @@ end
 require 'ey-hmac/faraday'
 
 connection = Faraday.new do |c|
-  c.request :hmac, key_id, key_secret
+  c.use :hmac, key_id, key_secret
   c.adapter(:rack, app)
 end
 ```

data/ey-hmac.gemspec

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ey-hmac/version'
+require File.expand_path('../lib/ey-hmac/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "ey-hmac"

data/lib/ey-hmac/adapter/faraday.rb

@@ -10,16 +10,21 @@ class Ey::Hmac::Adapter::Faraday < Ey::Hmac::Adapter
   def content_digest
     if existing = %w[CONTENT-DIGEST CONTENT_DIGEST Content-Digest Content_Digest].inject(nil) { |r,h| r || request[:request_headers][h] }
       existing
-    elsif digestable = body && Digest::MD5.hexdigest(body)
-      request[:request_headers]['Content-Digest'] = digestable
-    else nil
+    elsif body
+      digestable = if body.respond_to?(:rewind)
+                     body.rewind
+                     body.read.tap { |_| body.rewind }
+                   else
+                     body.to_s
+                   end
+
+      request[:request_headers]['Content-Digest'] = Digest::MD5.hexdigest(digestable)
     end
   end
 
   def body
     if request[:body] && request[:body].to_s != ""
       request[:body]
-    else nil
     end
   end
 
@@ -33,7 +38,8 @@ class Ey::Hmac::Adapter::Faraday < Ey::Hmac::Adapter
   end
 
   def sign!(key_id, key_secret)
-    %w[CONTENT-TYPE CONTENT_TYPE Content-Type Content_Type].inject(nil){|r,h| request[:request_headers][h]}
+    %w[CONTENT-TYPE CONTENT_TYPE Content-Type Content_Type].inject(nil) { |r,h| request[:request_headers][h] }
+
     if options[:version]
       request[:request_headers]['X-Signature-Version'] = options[:version]
     end

data/lib/ey-hmac/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Hmac
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/spec/faraday_spec.rb

@@ -2,24 +2,55 @@ require 'spec_helper'
 
 describe "faraday" do
   before(:all) { Bundler.require(:faraday) }
-  let!(:key_id)     { (0...8).map{ 65.+(rand(26)).chr}.join }
-  let!(:key_secret) { (0...16).map{ 65.+(rand(26)).chr}.join }
+
+  let!(:key_id)     { SecureRandom.hex(8) }
+  let!(:key_secret) { SecureRandom.hex(16) }
 
   describe "adapter" do
-    let!(:adapter)    { Ey::Hmac::Adapter::Faraday }
+    let!(:adapter) { Ey::Hmac::Adapter::Faraday }
 
-    it "should sign and read request" do
-      request = Faraday::Request.new.tap do |r|
-        r.method = :get
-        r.path = "/auth"
-        r.body = "{1: 2}"
+    it "signs a multipart post" do
+      app = lambda do |env|
+        authenticated = Ey::Hmac.authenticate!(env, adapter: Ey::Hmac::Adapter::Rack) do |auth_id|
+          (auth_id == key_id) && key_secret
+        end
+        [(authenticated ? 200 : 401), {"Content-Type" => "text/plain"}, []]
+      end
+
+      require 'ey-hmac/faraday'
+
+      connection = Faraday.new do |c|
+        c.request :multipart
+        c.request :json
+
+        c.use :hmac, key_id, key_secret
+
+        c.adapter(:rack, app)
+      end
+
+      tempfile = Tempfile.new("hmac")
+      tempfile.write SecureRandom.hex(512)
+      tempfile.close
+
+      expect(
+        connection.post { |req| req.body = {"output" => Faraday::UploadIO.new(tempfile.path, "text/plain")} }.status
+      ).to eq(200)
+    end
+
+    it "signs and reads a request" do
+      request = Faraday::Request.new.tap { |r|
+        r.method  = :get
+        r.path    = "/auth"
+        r.body    = "{1: 2}"
         r.headers = {"Content-Type" => "application/xml"}
-        end.to_env(Faraday::Connection.new("http://localhost"))
+      }.to_env(
+        Faraday::Connection.new("http://localhost")
+      )
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      expect(request[:request_headers]['Authorization']).to start_with("EyHmac")
-      expect(request[:request_headers]['Content-Digest']).to eq(Digest::MD5.hexdigest(request[:body]))
+      expect(request[:request_headers]['Authorization']).to        start_with("EyHmac")
+      expect(request[:request_headers]['Content-Digest']).to       eq(Digest::MD5.hexdigest(request[:body]))
       expect(Time.parse(request[:request_headers]['Date'])).not_to be_nil
 
       yielded = false
@@ -33,13 +64,15 @@ describe "faraday" do
       expect(yielded).to be_truthy
     end
 
-    it "should not set Content-Digest if body is nil" do
-      request = Faraday::Request.new.tap do |r|
-        r.method = :get
-        r.path = "/auth"
-        r.body = nil
+    it "does not set Content-Digest if body is nil" do
+      request = Faraday::Request.new.tap { |r|
+        r.method  = :get
+        r.path    = "/auth"
+        r.body    = nil
         r.headers = {"Content-Type" => "application/xml"}
-        end.to_env(Faraday::Connection.new("http://localhost"))
+      }.to_env(
+        Faraday::Connection.new("http://localhost")
+      )
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
@@ -58,19 +91,19 @@ describe "faraday" do
       expect(yielded).to be_truthy
     end
 
-    it "should not set Content-Digest if body is empty" do
+    it "does not set Content-Digest if body is empty" do
       request = Faraday::Request.new.tap do |r|
         r.method = :get
         r.path = "/auth"
         r.body = ""
         r.headers = {"Content-Type" => "application/xml"}
-        end.to_env(Faraday::Connection.new("http://localhost"))
+      end.to_env(Faraday::Connection.new("http://localhost"))
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      expect(request[:request_headers]['Authorization']).to start_with("EyHmac")
-      expect(request[:request_headers]).not_to have_key('Content-Digest')
-      expect(Time.parse(request[:request_headers]['Date'])).not_to be_nil
+      expect(request[:request_headers]['Authorization']).to        start_with("EyHmac")
+      expect(request[:request_headers]).not_to                     have_key('Content-Digest')
+      #expect(Time.parse(request[:request_headers]['Date'])).not_to be_nil
 
       yielded = false
 
@@ -84,20 +117,20 @@ describe "faraday" do
     end
 
     context "with a request" do
-    let!(:request) do
-      Faraday::Request.new.tap do |r|
-        r.method = :get
-        r.path = "/auth"
-        r.body = "{1: 2}"
-        r.headers = {"Content-Type" => "application/xml"}
-      end.to_env(Faraday::Connection.new("http://localhost"))
-    end
+      let!(:request) do
+        Faraday::Request.new.tap do |r|
+          r.method = :get
+          r.path = "/auth"
+          r.body = "{1: 2}"
+          r.headers = {"Content-Type" => "application/xml"}
+        end.to_env(Faraday::Connection.new("http://localhost"))
+      end
       include_examples "authentication"
     end
   end
 
   describe "middleware" do
-    it "should accept a SHA1 signature" do
+    it "accepts a SHA1 signature" do
       require 'ey-hmac/faraday'
       Bundler.require(:rack)
 
@@ -116,7 +149,7 @@ describe "faraday" do
       expect(connection.get("/resources").status).to eq(200)
     end
 
-    it "should accept a SHA256 signature" do # default
+    it "accepts a SHA256 signature" do # default
       require 'ey-hmac/faraday'
       Bundler.require(:rack)
 
@@ -135,7 +168,7 @@ describe "faraday" do
       expect(connection.get("/resources").status).to eq(200)
     end
 
-    it "should accept multiple digest signatures" do # default
+    it "accepts multiple digest signatures" do # default
       require 'ey-hmac/faraday'
       Bundler.require(:rack)
 
@@ -154,7 +187,7 @@ describe "faraday" do
       expect(connection.get("/resources").status).to eq(200)
     end
 
-    it "should sign empty request" do
+    it "signs empty request" do
       require 'ey-hmac/faraday'
       Bundler.require(:rack)
 
@@ -177,9 +210,9 @@ describe "faraday" do
       end
 
       expect(connection.get do |req|
-        req.path  = "/resource"
-        req.body = nil
-        req.params = {"a" => "1"}
+        req.path    = "/resource"
+        req.body    = nil
+        req.params  = {"a" => "1"}
         req.headers = {"Content-Type" => "application/x-www-form-urlencoded"}
       end.status).to eq(200)
     end

data/spec/rack_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'securerandom'
 
 describe "rack" do
   before(:all) { Bundler.require(:rack) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-hmac
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Josh Lane & Jason Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,7 +48,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -84,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Lightweight HMAC signing libraries and middleware for Farday and Rack
@@ -93,4 +92,3 @@ test_files:
 - spec/rack_spec.rb
 - spec/shared/authenticated.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/Guardfile

@@ -1,7 +0,0 @@
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^spec/(shared|support)/.*\.rb$}) { "spec" }
-  watch(%r{^lib/(.+)\.rb$})     { "spec" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-