vertebrae 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6553709d307b6343edc5ba9f95d9746bc7011d2b766cfa71f004ac058aa31df3
-  data.tar.gz: c3e633375938b93ebe9ea4fd5471f132cefe424ddf8f414bf56b21d6be05d040
+  metadata.gz: b16228cd60f59bb053ae8ebbdd28301615a1f6ade77566e3b054a157d0f484ae
+  data.tar.gz: 7c8db822e05cdce4987aac0c36c21fd4d5f132999a2d90a54012154d39732578
 SHA512:
-  metadata.gz: 875b777a7944ac034d03d1222d1adc32c611eff136772a6f22a1d4d60824ced6d57b93e7ab1dd2411cdf231bf1fcebbe2569aae8ea808f49c093c4058f0e0438
-  data.tar.gz: 98a03fd19a9a5407c40185c3216bda550d2fd118e67bbb9ee7f16c37080337db3d42a7b494ef18ef15ea1088ced62f01ad8f5c8998c0221318a146cf0d5a87e1
+  metadata.gz: 616886b82ccababdda3957bbd06e7c42367093e63a0b371211b969755f533c38db20da868bd2f14a5bc6cf1ab34dc80f14d8137aa10c529cdd75671c5a5840ca
+  data.tar.gz: 3bacb516caac9af5d8d1022f5add4ea9a45b8f4b2b3fe1ea1e8a804466d2b3e4bc1124c17039d64333398fdea9d6a10308befb9dab64338e7d85f861eb39ceb2

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.5'
 end

data/lib/vertebrae.rb

@@ -13,7 +13,7 @@ require 'vertebrae/base'
 require 'vertebrae/model'
 require 'vertebrae/version'
 
-require 'railties' if defined? Rails
+require 'vertebrae/railties' if defined? Rails
 
 module Vertebrae
 

metadata

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