ey-hmac 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4701be0a713277cd0ad6813838340929d9914728
-  data.tar.gz: 616a0673853d637b92c53c9d2c8d9e68ed820ab7
+  metadata.gz: 8dfeeb93b92db1297b05223d6bb2b3e5aebc4baf
+  data.tar.gz: 4675e5002ad0686d6a819df058c6768110d442a1
 SHA512:
-  metadata.gz: 07abea674ae77af416e7cf69caeab71c8a5e249a8fd2dc073f6f8966096428a4caaa373c904072f5579d28aad798ea9bc32270f5da05654c3b34e63a96be43f7
-  data.tar.gz: 80c00e2ef84e5c56bf99971eaa2301dde1e1e7811dc94b78f2d38be331c5e8f3b72c438b6b89a5b2f20ebd7c82e5e7c771088d0fcfaf34d2f875f42de4614828
+  metadata.gz: 26a224b85612a8f673894612a5e0cc130a2f0dd0bccb0c945611bc2bc30c479b088cd7d19db3425ad09350c63f0c3e6e3b3304195239966dad760deccd8c33a4
+  data.tar.gz: b977ba7137c163af67c3c2a4c5eaf49f7f8e1e7ce11e9967fd07f3aa1d39a1e399bfd4aa77af2a7ca62f477803c5fc440e3630dd3ab555bda4dfaf1962433901

data/Gemfile

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

data/lib/ey-hmac/faraday.rb

@@ -1,17 +1,8 @@
 require 'ey-hmac'
 require 'faraday'
 
-if Faraday.respond_to? :register_middleware
-  Faraday.register_middleware(:request, {:hmac => lambda { Ey::Hmac::Faraday }})
-end
-
-# Request middleware that performs HMAC request signing
-require 'faraday_middleware/response_middleware'
-
-class Ey::Hmac::Faraday < FaradayMiddleware::ResponseMiddleware
-  dependency do
-    require 'ey-hmac' unless defined?(Ey::Hmac)
-  end
+class Ey::Hmac::Faraday < Faraday::Response::Middleware
+  dependency("ey-hmac")
 
   attr_reader :key_id, :key_secret, :options
 
@@ -27,4 +18,4 @@ class Ey::Hmac::Faraday < FaradayMiddleware::ResponseMiddleware
   end
 end
 
-Faraday::Request.register_middleware(:hmac => lambda { Ey::Hmac::Faraday })
+Faraday::Middleware.register_middleware :hmac => Ey::Hmac::Faraday

data/lib/ey-hmac/version.rb

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

data/spec/faraday_spec.rb

@@ -18,19 +18,19 @@ describe "faraday" do
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      request[:request_headers]['Authorization'].should start_with("EyHmac")
-      request[:request_headers]['Content-Digest'].should == Digest::MD5.hexdigest(request[:body])
-      Time.parse(request[:request_headers]['Date']).should_not be_nil
+      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
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
-        key_id.should == key_id
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
+        expect(key_id).to eq(key_id)
         yielded = true
         key_secret
-      end.should be_true
+      end).to be_truthy
 
-      yielded.should be_true
+      expect(yielded).to be_truthy
     end
 
     it "should not set Content-Digest if body is nil" do
@@ -43,19 +43,19 @@ describe "faraday" do
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      request[:request_headers]['Authorization'].should start_with("EyHmac")
-      request[:request_headers].should_not have_key('Content-Digest')
-      Time.parse(request[:request_headers]['Date']).should_not 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
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
-        key_id.should == key_id
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
+        expect(key_id).to eq(key_id)
         yielded = true
         key_secret
-      end.should be_true
+      end).to be_truthy
 
-      yielded.should be_true
+      expect(yielded).to be_truthy
     end
 
     it "should not set Content-Digest if body is empty" do
@@ -68,19 +68,19 @@ describe "faraday" do
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      request[:request_headers]['Authorization'].should start_with("EyHmac")
-      request[:request_headers].should_not have_key('Content-Digest')
-      Time.parse(request[:request_headers]['Date']).should_not 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
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
-        key_id.should == key_id
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
+        expect(key_id).to eq(key_id)
         yielded = true
         key_secret
-      end.should be_true
+      end).to be_truthy
 
-      yielded.should be_true
+      expect(yielded).to be_truthy
     end
 
     context "with a request" do
@@ -108,13 +108,12 @@ describe "faraday" do
         [(authenticated ? 200 : 401), {"Content-Type" => "text/plain"}, []]
       end
 
-      request_env = nil
       connection = Faraday.new do |c|
-        c.request :hmac, key_id, key_secret, sign_with: :sha1
+        c.use :hmac, key_id, key_secret, sign_with: :sha1
         c.adapter(:rack, app)
       end
 
-      connection.get("/resources").status.should == 200
+      expect(connection.get("/resources").status).to eq(200)
     end
 
     it "should accept a SHA256 signature" do # default
@@ -128,13 +127,12 @@ describe "faraday" do
         [(authenticated ? 200 : 401), {"Content-Type" => "text/plain"}, []]
       end
 
-      request_env = nil
       connection = Faraday.new do |c|
-        c.request :hmac, key_id, key_secret
+        c.use :hmac, key_id, key_secret
         c.adapter(:rack, app)
       end
 
-      connection.get("/resources").status.should == 200
+      expect(connection.get("/resources").status).to eq(200)
     end
 
     it "should accept multiple digest signatures" do # default
@@ -148,13 +146,12 @@ describe "faraday" do
         [(authenticated ? 200 : 401), {"Content-Type" => "text/plain"}, []]
       end
 
-      request_env = nil
       connection = Faraday.new do |c|
-        c.request :hmac, key_id, key_secret
+        c.use :hmac, key_id, key_secret
         c.adapter(:rack, app)
       end
 
-      connection.get("/resources").status.should == 200
+      expect(connection.get("/resources").status).to eq(200)
     end
 
     it "should sign empty request" do
@@ -174,18 +171,17 @@ describe "faraday" do
         })
       end
 
-      request_env = nil
       connection = Faraday.new do |c|
-        c.request :hmac, key_id, key_secret
+        c.use :hmac, key_id, key_secret
         c.adapter(:rack, app)
       end
 
-      connection.get do |req|
+      expect(connection.get do |req|
         req.path  = "/resource"
         req.body = nil
         req.params = {"a" => "1"}
         req.headers = {"Content-Type" => "application/x-www-form-urlencoded"}
-      end.status.should == 200
+      end.status).to eq(200)
     end
   end
 end

data/spec/rack_spec.rb

@@ -16,19 +16,19 @@ describe "rack" do
       )
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      request.env['HTTP_AUTHORIZATION'].should start_with("EyHmac")
-      request.env['HTTP_CONTENT_DIGEST'].should == Digest::MD5.hexdigest(request.body.tap(&:rewind).read)
-      Time.parse(request.env['HTTP_DATE']).should_not be_nil
+      expect(request.env['HTTP_AUTHORIZATION']).to start_with("EyHmac")
+      expect(request.env['HTTP_CONTENT_DIGEST']).to eq(Digest::MD5.hexdigest(request.body.tap(&:rewind).read))
+      expect(Time.parse(request.env['HTTP_DATE'])).not_to be_nil
 
       yielded = false
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
-        key_id.should == key_id
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
+        expect(key_id).to eq(key_id)
         yielded = true
         key_secret
-      end.should be_true
+      end).to be_truthy
 
-      yielded.should be_true
+      expect(yielded).to be_truthy
     end
 
     it "should not set Content-Digest if body is nil" do
@@ -38,19 +38,19 @@ describe "rack" do
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      request.env['HTTP_AUTHORIZATION'].should start_with("EyHmac")
-      request.env.should_not have_key('HTTP_CONTENT_DIGEST')
-      Time.parse(request.env['HTTP_DATE']).should_not be_nil
+      expect(request.env['HTTP_AUTHORIZATION']).to start_with("EyHmac")
+      expect(request.env).not_to have_key('HTTP_CONTENT_DIGEST')
+      expect(Time.parse(request.env['HTTP_DATE'])).not_to be_nil
 
       yielded = false
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
-        key_id.should == key_id
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
+        expect(key_id).to eq(key_id)
         yielded = true
         key_secret
-      end.should be_true
+      end).to be_truthy
 
-      yielded.should be_true
+      expect(yielded).to be_truthy
     end
 
     it "should not set Content-Digest if body is empty" do
@@ -61,19 +61,19 @@ describe "rack" do
 
       Ey::Hmac.sign!(request, key_id, key_secret, adapter: adapter)
 
-      request.env['HTTP_AUTHORIZATION'].should start_with("EyHmac")
-      request.env.should_not have_key('HTTP_CONTENT_DIGEST')
-      Time.parse(request.env['HTTP_DATE']).should_not be_nil
+      expect(request.env['HTTP_AUTHORIZATION']).to start_with("EyHmac")
+      expect(request.env).not_to have_key('HTTP_CONTENT_DIGEST')
+      expect(Time.parse(request.env['HTTP_DATE'])).not_to be_nil
 
       yielded = false
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
-        key_id.should == key_id
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |key_id|
+        expect(key_id).to eq(key_id)
         yielded = true
         key_secret
-      end.should be_true
+      end).to be_truthy
 
-      yielded.should be_true
+      expect(yielded).to be_truthy
     end
 
     context "with a request" do
@@ -103,7 +103,7 @@ describe "rack" do
         run app
       end
 
-      client.get("/resource").status.should == 200
+      expect(client.get("/resource").status).to eq(200)
     end
 
     it "should accept a SHA256 signature" do # default
@@ -120,7 +120,7 @@ describe "rack" do
         run app
       end
 
-      client.get("/resource").status.should == 200
+      expect(client.get("/resource").status).to eq(200)
     end
 
     it "should accept multiple digest signatures" do # default
@@ -134,13 +134,12 @@ describe "rack" do
         [(authenticated ? 200 : 401), {"Content-Type" => "text/plain"}, []]
       end
 
-      request_env = nil
       connection = Faraday.new do |c|
-        c.request :hmac, key_id, key_secret, digest: [:sha1, :sha256]
+        c.use :hmac, key_id, key_secret, digest: [:sha1, :sha256]
         c.adapter(:rack, app)
       end
 
-      connection.get("/resources").status.should == 200
+      expect(connection.get("/resources").status).to eq(200)
     end
   end
 end

data/spec/shared/authenticated.rb

@@ -3,23 +3,23 @@ shared_examples_for "authentication" do
     it "should not authenticate invalid secret" do
       Ey::Hmac.sign!(request, key_id, "#{key_secret}bad", adapter: adapter)
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |auth_id|
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |auth_id|
         (auth_id == key_id) && key_secret
-      end.should be_false
+      end).to be_falsey
     end
 
     it "should not authenticate invalid id" do
       Ey::Hmac.sign!(request, "what#{key_id}", key_secret, adapter: adapter)
 
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |auth_id|
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |auth_id|
         (auth_id == key_id) && key_secret
-      end.should be_false
+      end).to be_falsey
     end
 
     it "should not authenticate missing header" do
-      Ey::Hmac.authenticated?(request, adapter: adapter) do |auth_id|
+      expect(Ey::Hmac.authenticated?(request, adapter: adapter) do |auth_id|
         (auth_id == key_id) && key_secret
-      end.should be_false
+      end).to be_falsey
     end
   end
 
@@ -27,29 +27,29 @@ shared_examples_for "authentication" do
     it "should not authenticate invalid secret" do
       Ey::Hmac.sign!(request, key_id, "#{key_secret}bad", adapter: adapter)
 
-      lambda {
+      expect {
         Ey::Hmac.authenticate!(request, adapter: adapter) do |auth_id|
           (auth_id == key_id) && key_secret
         end
-      }.should raise_exception(Ey::Hmac::SignatureMismatch)
+      }.to raise_exception(Ey::Hmac::SignatureMismatch)
     end
 
     it "should not authenticate invalid id" do
       Ey::Hmac.sign!(request, "what#{key_id}", key_secret, adapter: adapter)
 
-      lambda {
+      expect {
         Ey::Hmac.authenticate!(request, adapter: adapter) do |auth_id|
           (auth_id == key_id) && key_secret
         end
-      }.should raise_exception(Ey::Hmac::MissingSecret)
+      }.to raise_exception(Ey::Hmac::MissingSecret)
     end
 
     it "should not authenticate missing header" do
-      lambda {
-        Ey::Hmac.authenticate!(request, adapter: adapter) do |auth_id|
+      expect {
+        expect(Ey::Hmac.authenticate!(request, adapter: adapter) do |auth_id|
           (auth_id == key_id) && key_secret
-        end.should be_false
-      }.should raise_exception(Ey::Hmac::MissingAuthorization)
+        end).to be_falsey
+      }.to raise_exception(Ey::Hmac::MissingAuthorization)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-hmac
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Josh Lane & Jason Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake