From b7f2e279fa4b2c5110e12360ea8c7eb6fef62b47 Mon Sep 17 00:00:00 2001 From: Aaron Craig Date: Tue, 2 Feb 2016 22:09:07 -0800 Subject: [PATCH] use hash interface --- lib/searchkick/middleware.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/lib/searchkick/middleware.rb b/lib/searchkick/middleware.rb index b307300..1d57f58 100644 --- a/lib/searchkick/middleware.rb +++ b/lib/searchkick/middleware.rb @@ -3,21 +3,10 @@ require "faraday/middleware" module Searchkick class Middleware < Faraday::Middleware def call(env) - is_search = env_value(env, :url).path.to_s.end_with?("/_search") - - if env_value(env, :method) == :get && is_search - r = env_value(env, :request) - if r.is_a?(Hash) - r[:timeout] = Searchkick.search_timeout - else - r.timeout = Searchkick.search_timeout - end + if env[:method] == :get && env[:url][:path].to_s.end_with?("/_search") + env[:request][:timeout] = Searchkick.search_timeout end @app.call(env) end - - def env_value(env, key) - env.is_a?(Hash) ? env[key] : env.send(key) - end end end -- libgit2 0.21.0