summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZack Hobson2013-12-27 08:26:26 -0800
committerZack Hobson2013-12-27 08:26:26 -0800
commit4d3f9711509543addef173b5c6ac87abc861330a (patch)
tree618b1902d3734deb170f87f60873d93222c9d2db
parent4011b46ecbfb627317cc9a16d5e27244b076ec4e (diff)
downloadhcl-4d3f9711509543addef173b5c6ac87abc861330a.tar.bz2
middleware fixes
-rw-r--r--lib/hcl/harvest_middleware.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/hcl/harvest_middleware.rb b/lib/hcl/harvest_middleware.rb
index adb9427..1af6ce0 100644
--- a/lib/hcl/harvest_middleware.rb
+++ b/lib/hcl/harvest_middleware.rb
@@ -1,6 +1,6 @@
require 'faraday'
-class HCl::HarvestMiddleware < Faraday::Middleware
+class HCl::HarvestMiddleware < Faraday::Request::BasicAuthentication
Faraday.register_middleware harvest: ->{ self }
MIME_TYPE = 'application/json'.freeze
@@ -9,22 +9,14 @@ class HCl::HarvestMiddleware < Faraday::Middleware
require 'escape_utils'
end
- def initialize app, user, password
- super app
- @auth = Faraday::Request::BasicAuthentication.new app, user, password
- end
-
def call(env)
# encode with and accept json
env[:request_headers]['Accept'] = MIME_TYPE
env[:request_headers]['Content-Type'] = MIME_TYPE
env[:body] = Yajl::Encoder.encode(env[:body])
- # basic authentication
- @auth.call(env)
-
# response processing
- @app.call(env).on_complete do |env|
+ super(env).on_complete do |env|
case env[:status]
when 200..299
begin