lib/ur.rb in ur-0.2.1 vs lib/ur.rb in ur-0.2.2
- old
+ new
@@ -17,10 +17,11 @@
autoload :RequestAndResponse, 'ur/request_and_response'
autoload :Middleware, 'ur/middleware'
autoload :FaradayMiddleware, 'ur/middleware'
autoload :RackMiddleware, 'ur/middleware'
autoload :Faraday, 'ur/faraday'
+ autoload :Weblink, 'ur/weblink'
Request = self.properties['request']
Response = self.properties['response']
Metadata = self.properties['metadata']
require 'ur/request'
@@ -49,11 +50,11 @@
else
rack_request = Rack::Request.new(request_env)
env = request_env
end
- new({'bound' => 'inbound'}, options).tap do |ur|
+ new({'bound' => 'inbound'}, **options).tap do |ur|
ur.request['method'] = rack_request.request_method
ur.request.addressable_uri = Addressable::URI.new(
:scheme => rack_request.scheme,
:host => rack_request.host,
@@ -80,11 +81,11 @@
env["rack.input"].rewind
end
end
def from_faraday_request(request_env, **options)
- new({'bound' => 'outbound'}, options).tap do |ur|
+ new({'bound' => 'outbound'}, **options).tap do |ur|
ur.request['method'] = request_env[:method].to_s
ur.request.uri = request_env[:url].normalize.to_s
ur.request.headers = request_env[:request_headers]
ur.request.set_body_from_faraday(request_env)
end
@@ -112,10 +113,10 @@
yield
end
[status, response_headers, response_body_proxy]
end
- def faraday_on_complete(app, request_env, &block)
+ def faraday_on_complete(app, request_env)
app.call(request_env).on_complete do |response_env|
response.status = response_env[:status]
response.headers = response_env[:response_headers]
response.set_body_from_faraday(response_env)