vertebrae 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6553709d307b6343edc5ba9f95d9746bc7011d2b766cfa71f004ac058aa31df3
-  data.tar.gz: c3e633375938b93ebe9ea4fd5471f132cefe424ddf8f414bf56b21d6be05d040
+  metadata.gz: 30786cc1ab2fa6f4d9f8e268f4815de51f7d5054a98cdae1989070e1804946aa
+  data.tar.gz: 03a1316928f1a52ce36163207b9170f79340edda31c63fcaca030bb6aa89d029
 SHA512:
-  metadata.gz: 875b777a7944ac034d03d1222d1adc32c611eff136772a6f22a1d4d60824ced6d57b93e7ab1dd2411cdf231bf1fcebbe2569aae8ea808f49c093c4058f0e0438
-  data.tar.gz: 98a03fd19a9a5407c40185c3216bda550d2fd118e67bbb9ee7f16c37080337db3d42a7b494ef18ef15ea1088ced62f01ad8f5c8998c0221318a146cf0d5a87e1
+  metadata.gz: e74729c49769b94026a591f9dcc99dc0518ded6c1e24ef55bf7f987b5b2c57750c5965e8dc740c11aac7d1f1cd33c9402ca0f3734b0cccb7c48ae7f63b72b64d
+  data.tar.gz: 62a58a594ee8197884be5e8ee2c56b2d9e92c5a2a87d1617c3d6b7e73de8ab57962c6a7f67a9aa4e9b3456a24dc7fc43e6841857f8a9f134d65052786e77099d

data/lib/vertebrae/configuration.rb

@@ -71,7 +71,7 @@ module Vertebrae
     end
 
     def adapter
-      options[:adapter] || auto_detect_adapter
+      options[:adapter] || ::Faraday.default_adapter
     end
 
     def adapter=(value)
@@ -90,7 +90,6 @@ module Vertebrae
       end
     end
 
-
     def faraday_options
       {
         :headers => {
@@ -117,33 +116,8 @@ module Vertebrae
       end
     end
 
-
     def endpoint
       "#{self.scheme}://#{self.host}#{self.port.present? ? ":#{self.port}" : ''}#{self.prefix}"
     end
-
-    private
-
-    # Auto-detect the best adapter (HTTP "driver") available, based on libraries
-    # loaded by the user, preferring those with persistent connections
-    # ("keep-alive") by default
-    #
-    # @return [Symbol]
-    #
-    #
-    def auto_detect_adapter
-      case
-        when defined?(::Typhoeus)
-          :typhoeus
-        when defined?(::Patron)
-          :patron
-        when defined?(::HTTPClient)
-          :httpclient
-        when defined?(::Net::HTTP::Persistent)
-          :net_http_persistent
-        else
-          ::Faraday.default_adapter
-      end
-    end
   end
 end

data/lib/vertebrae/connection.rb

@@ -34,45 +34,23 @@ module Vertebrae
       @configuration = Vertebrae::Configuration.new(options)
     end
 
-    # Default middleware stack that uses default adapter as specified at
-    # configuration stage.
+    # Returns a Faraday::Connection object
     #
-    def default_middleware
-      Proc.new do |builder|
-        builder.use Faraday::Multipart::Middleware
-        builder.use Faraday::Request::UrlEncoded
+    def connection
+      self.faraday_connection ||= Faraday.new(configuration.faraday_options) do |f|
         if configuration.authenticated?
-          builder.use Faraday::Request::Authorization, :basic, configuration.username, configuration.password
+          f.request :authorization, :basic, configuration.username, configuration.password
         end
-
-        builder.use Faraday::Response::Logger if ENV['DEBUG']
-
+        f.request :multipart
+        f.request :url_encoded
         unless options[:raw]
-          builder.use Faraday::Mashify::Middleware
-          builder.use Faraday::Response::Json
+          f.response :mashify
+          f.response :json
         end
-        builder.use Vertebrae::Response::RaiseError
-        builder.adapter configuration.adapter
-      end
-    end
 
-    # Exposes middleware builder to facilitate custom stacks and easy
-    # addition of new extensions such as cache adapter.
-    #
-    def stack(&block)
-      @stack ||= begin
-        if block_given?
-          Faraday::RackBuilder.new(&block)
-        else
-          Faraday::RackBuilder.new(&default_middleware)
-        end
+        f.response :raise_error
+        f.adapter configuration.adapter
       end
     end
-
-    # Returns a Faraday::Connection object
-    #
-    def connection
-      self.faraday_connection ||= Faraday.new(configuration.faraday_options.merge(:builder => stack))
-    end
   end
 end

data/lib/vertebrae/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vertebrae
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vertebrae
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Nathan Woodhull