clientele 0.3.16 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e00adee7beb377011ab43eb243b79d8d41a3416
-  data.tar.gz: 1ab8f9447b8a70ba9103c0d30089105a99192d10
+  metadata.gz: 8883fe8e83325ba29feba69b372db4059172982c
+  data.tar.gz: ae9551c35f4af01e6ad7fcb55c9549f5de79a08a
 SHA512:
-  metadata.gz: ef06a52d69b52013569dd4c265d4c95b95ad9e2afb1950fc1372bd43064a94ba5c858305e136c8d6ad1cde028e6b631055bf466b0a331ab79b1d10f7796557f3
-  data.tar.gz: 0bc3f5d3d8e658639cf28f979c744998bd5f8df4f58b185719c7058ae2a99b9f745ed000db1d0d3c1fa9f2acaeae3871e54da4b8aeeb27197ddc04dafe42e11e
+  metadata.gz: 6626b0ba7562c975a10910a354225aee14e91780dbc716be6c012e4cb49846252437e121d9ac5afe2b1652ee21f7add922316e85bb5dd0cb1248b52b41cdb6f3
+  data.tar.gz: 11e8b331d8066b620199b6ef2d2e63bb99acf32e73177ec6809b37b6c991faa67380fcc27992a47d9dd8799a3126b9815693b4ddecccabe092f87c7451c0ecac

data/lib/clientele/configuration.rb

@@ -6,7 +6,7 @@ require 'faraday_middleware'
 module Clientele
   class Configuration < BlockParty::Configuration
 
-    attr_accessor :logger, :adapter, :headers, :hashify_content_type, :root_url, :follow_redirects, :redirect_limit, :ensure_trailing_slash, :faraday_configuration
+    attr_accessor :logger, :adapter, :headers, :hashify_content_type, :root_url, :follow_redirects, :redirect_limit, :ensure_trailing_slash, :connection
 
     def initialize
       self.logger                = Logger.new($stdout)
@@ -17,11 +17,11 @@ module Clientele
       self.redirect_limit        = 5
       self.ensure_trailing_slash = true
 
-      self.faraday_configuration = default_faraday_configuration
+      self.connection            = default_connection
     end
 
-    def default_faraday_configuration
-      @default_faraday_configuration ||= Proc.new do |conn, options|
+    def default_connection
+      Proc.new do |conn, options|
 
         conn.use FaradayMiddleware::FollowRedirects, limit: options[:redirect_limit] if options[:follow_redirects]
 
@@ -31,10 +31,12 @@ module Clientele
         conn.response :logger, options[:logger], bodies: true
         conn.response :json, content_type: options[:hashify_content_type], preserve_raw: true
 
-        conn.adapter options[:adapter] if options[:adapter]
-
         conn.options.params_encoder = options[:params_encoder] if options[:params_encoder]
 
+        yield(conn, options) if block_given?
+
+        conn.adapter options[:adapter] if options[:adapter]
+
       end
     end
 

data/lib/clientele/request.rb

@@ -90,21 +90,10 @@ module Clientele
     end
 
     def faraday_client
-      Faraday.new(options[:root_url]) do |conn|
-
-        conn.use FaradayMiddleware::FollowRedirects, limit: options[:redirect_limit] if options[:follow_redirects]
-
-        conn.request  :url_encoded
-
-        conn.response :rashify
-        conn.response :logger, options[:logger], bodies: true
-        conn.response :json, content_type: options[:hashify_content_type], preserve_raw: true
-
-        conn.adapter options[:adapter] if options[:adapter]
-
-        conn.options.params_encoder = options[:params_encoder] if options[:params_encoder]
-
-        options[:faraday_configuration].call conn, options
+      Faraday.new(options[:root_url]) do |connection|
+        if options[:connection]
+          options[:connection].call connection, options
+        end
       end
     end
 

data/lib/clientele/version.rb

@@ -1,3 +1,3 @@
 module Clientele
-  VERSION = "0.3.16"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clientele
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Keele