connection.rb in berkshelf-api-client-1.2.0.rc2

- old
+ new

@@ -27,14 +27,14 @@
     #   how long to wait (in seconds) between each retry
     def initialize(url, options = {})
       options         = options.reverse_merge(retries: 3, retry_interval: 0.5,
         open_timeout: 3, timeout: 30)
       @url            = url
-      @retries        = options[:retries]
-      @retry_interval = options[:retry_interval]
+      @retries        = options.delete(:retries)
+      @retry_interval = options.delete(:retry_interval)
 
-      options[:builder] ||= Faraday::Builder.new do |b|
+      options[:builder] ||= Faraday::RackBuilder.new do |b|
         b.response :parse_json
         b.response :gzip
         b.request :retry,
           max: self.retries,
           interval: self.retry_interval,
@@ -44,12 +44,14 @@
           ]
 
         b.adapter :net_http
       end
 
+      open_timeout = options.delete(:open_timeout)
+      timeout      = options.delete(:timeout)
       super(self.url, options)
-      @options[:open_timeout] = options[:open_timeout]
-      @options[:timeout]      = options[:timeout]
+      @options[:open_timeout] = open_timeout
+      @options[:timeout]      = timeout
     end
 
     # Retrieves the entire universe of known cookbooks from the API source
     #
     # @raise [APIClient::TimeoutError]