saddle 0.0.48 → 0.0.49

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk4ZjdjM2Y4ZGM5NDk1ZjI0MzA5M2ZjY2EyZTA0ODRlMTA0YjY0MQ==
+    YmNmNGRkZmYxMGUxNjNhYWQ2MGUzNDYyMTRlODVkODg0Yjk0YjgzZQ==
   data.tar.gz: !binary |-
-    Yjk0ZWYwMjVkNmE0MDgzZmE4MDYyOWZlYjJkOTcyMTllZTcyN2E1Mw==
+    YTJjNmJmNjBlMGJkNjQxM2YyYWE5ZTQyOTk3NmNiODUyZjM3M2E1Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZjBjZWI3Y2RjZWNhZGQwMmExODY2NzVkMzRiMDBlMGQ1MzRlZWVlNzc1Y2Jm
-    NTA3MjAxODk2YjE1ZTgyYjU4MjEwODkxMWE4ZDEyZWY4ZTNmOGVmMjMyNmRl
-    MGRlMDYzNzQxMjZkNzlhMzcwNWJhMWYwYTU3OGUyZDVhMTQ5OWQ=
+    NWY5OGJmNTc3YjIyNTM4YTk4YzIyMTg1MmQ1YWQxODdlNjUyOTgyOGI1YjFl
+    OWNjNDEzNWM2MDRmYjliYWZhMWQ2OWM2Zjk4Y2U1N2RmMjE0MzFlZGNmMzIx
+    N2IyMjkxZjJhZmZlZjZiNjJiZjIxZGVmODRlNzIxZGVhNDY1M2M=
   data.tar.gz: !binary |-
-    OGFmNWY3MWY3MmMxMDM2MjBiMDY0NDMxMTEwZjZmYjFmYmY2ZWRhYTcwYmMw
-    YWEyZGJmYWJjMGFkZGVkMjRhN2Q2MDBmODFiZGZmMjY2Yzg4Y2UzZThiNWMy
-    OTI4OTI2YWUxODVjOGQ1MTM4ZjgyMjg5N2RhNjBjYjgyMjQzMmE=
+    MDdkOTMxN2MxN2VjZTY3M2U5ZDVkYWMzOGYzOTMwZGQ4MDkxZjA0OTgxNzUw
+    MTJkM2E4NTQ1NDhhNzdhYWM3ZWI3ZDA5M2JlMDZlOTYzZjI4NTZjMGViMjE0
+    ZGQ4MzkxZTQ1ZWQ4YmQ5ZTNmODQxZDQ1ZTUyMzNhZTlkNGM1ZWE=

data/.gitignore

@@ -7,6 +7,7 @@
 
 # rbenv
 .ruby-version
+.ruby-gemset
 
 # Gems
 *.gem

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.0.49
+* Support `extra_env` as a client option to load more into the env pre-adapter.
+
 # 0.0.48
 * Optionally return the full response object using `:return_full_response`
 

data/lib/saddle/middleware/extra_env.rb

@@ -0,0 +1,21 @@
+require 'faraday'
+
+
+
+module Saddle
+  module Middleware
+
+    # Public: Adds the content of `extra_env` into the env variable
+
+    class ExtraEnv < Faraday::Middleware
+      def call(env)
+        if env[:request][:client_options][:extra_env]
+          env.merge!(env[:request][:client_options][:extra_env])
+        end
+
+        @app.call env
+      end
+    end
+
+  end
+end

data/lib/saddle/options.rb

@@ -14,6 +14,7 @@ module Saddle
         :request_style => request_style,
         :num_retries => num_retries,
         :timeout => timeout,
+        :extra_env => extra_env,
         :http_adapter => http_adapter,
         :stubs => stubs,
         :return_full_response => return_full_response,
@@ -57,10 +58,15 @@ module Saddle
       30
     end
 
+    # If we need to load more into env before it passes to the adapter, use this
+    def extra_env
+      {}
+    end
+
     # Support specification of the HTTP adapter being used. Returns a symbol or
     # hash of the form { :key => :net_http, :args => [ ... ] }.
     def http_adapter
-      :net_http
+      { :key => :net_http, :args => [] }
     end
 
     # If the Typhoeus adapter is being used, pass stubs to it for testing.

data/lib/saddle/requester.rb

@@ -14,6 +14,7 @@ require 'saddle/middleware/response/default_response'
 require 'saddle/middleware/response/parse_json'
 require 'saddle/middleware/response/raise_error'
 
+require 'saddle/middleware/extra_env'
 require 'saddle/middleware/ruby_timeout'
 
 
@@ -54,6 +55,8 @@ module Saddle
       raise ':num_retries must be an integer' unless @num_retries.is_a?(Fixnum)
       @timeout = opt[:timeout]
       raise ':timeout must be nil or an integer' unless (@timeout.nil? || @timeout.is_a?(Numeric))
+      @extra_env = opt[:extra_env] || {}
+      raise 'extra_env must be a Hash' unless @extra_env.is_a?(Hash)
       @additional_middlewares = opt[:additional_middlewares] || []
       raise ':additional_middleware must be an Array' unless @additional_middlewares.is_a?(Array)
       raise 'invalid middleware found' unless @additional_middlewares.all? { |m| m[:klass] < Faraday::Middleware }
@@ -172,6 +175,9 @@ module Saddle
         # Set up instrumentation around the adapter for extensibility
         builder.use(FaradayMiddleware::Instrumentation)
 
+        # Add in extra env data if needed
+        builder.use(Saddle::Middleware::ExtraEnv)
+
         # Set up our adapter
         if @stubs.nil?
           # Use the default adapter

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.48'
+  VERSION = '0.0.49'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
 platform: ruby
 authors:
 - Mike Lewis
@@ -90,6 +90,7 @@ files:
 - lib/saddle/method_tree_builder.rb
 - lib/saddle/middleware/authentication/oauth1.rb
 - lib/saddle/middleware/authentication/oauth2.rb
+- lib/saddle/middleware/extra_env.rb
 - lib/saddle/middleware/logging/airbrake.rb
 - lib/saddle/middleware/logging/rails.rb
 - lib/saddle/middleware/logging/statsd.rb