saddle 0.0.22 → 0.0.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njg5M2M1ODIxZjAxMmQ1NGRiOWU5MDMyN2RhMWNhOGZhNjc4NjRkMQ==
+    ZWZjMDk3MDczMTlkYjllMDk3MmQ2NDRlNWY1ODE3Yjk5NTFiNmQ0Mw==
   data.tar.gz: !binary |-
-    OWViOGE0MThmNGU1OGYwM2VhZWFkNjY0NGJjNjhiMTIwMDZhNmRkOQ==
+    ODlkYTE3OGJhNjU3Mjc3ODUwYmVjODEyNWRhMzNlMTA0MzczOGEzZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mjg3MDI3ZTA2MDRjNzMyODM5MzM5YmE0NDA0MzI5NDQwNDBhMTY1ZDc5ZjEz
-    NWE5OGZhZGE4NGM4OTQyMGZkODMyMTkzNmE4ZTRhM2M5YWJhYjVlYWYzZTBj
-    ZjE3MGM1MGQ3MTE5ODE1YmJhYjg3ODQwYjBkNTI4ZDk2NjQ3ZDQ=
+    OTY1MTFiZmIxYTIyOWZhNWZhZGY5ZTA5NTE5ZDdjMWExOGNmNGU0M2Q5ODUx
+    NjFjYzM0MjFhOGVjNjkxZTYyYTkyMzc0MTY2YTEzYzBiMDVlYTAyMTBlMmEz
+    OTdlNjc0OWFmNGU4OWVhMTY5MTg0ODUzODBiM2JlNTY5M2U2MzI=
   data.tar.gz: !binary |-
-    OWNjZDVjZGQ0MTA3NGZhYmNmYTc3YmFiYjE3N2FmOGY0NDI3NzVmOGRkMDE4
-    MTlmYjU1YzY1YTk5MWVmY2YxOTY0ZWUxMmE5NmFlZGU5ZDBjMDg0NTYxY2Vj
-    ZmIxYWJkZTVmNjBkMGM3NTNjMTJhZjQ3Y2E3YTU0YzIyMDg5YzY=
+    Y2QyNTVjMjllZGY3MTlmYjI5NmQ2ZDYzODhmM2ZkYmFjYmNkN2RjYjljNjc3
+    MjdmYjc5ZDE1N2MyM2Q2ZDRkMDVhMzhiM2RmNjhkOWZiM2U5ODRlMGQ1MTM2
+    NDkyYzFlZTE1M2IyYjZlZTRhY2M1NGUxYWUwMGQ1ODk5OGZhZmE=

data/lib/saddle/requester.rb

@@ -30,6 +30,8 @@ module Saddle
     ##                       - each middleware consists of hash of klass, and optionally args (an array)
     ## stubs - test stubs for specs
     def initialize(opt={})
+      # Store the options for later use
+      @options = opt
       @host = opt[:host] || 'localhost'
       raise ':host must be a string' unless @host.is_a?(String)
       @port = opt[:port] || 80
@@ -58,8 +60,8 @@ module Saddle
     # Make a GET request
     def get(url, params={}, options={})
       response = connection.get do |req|
-        req.options.merge! options
-        req.url url, params
+        req.options.merge!(options)
+        req.url(url, params)
       end
       response.body
     end
@@ -67,8 +69,8 @@ module Saddle
     # Make a POST request
     def post(url, data={}, options={})
       response = connection.post do |req|
-        req.options.merge! options
-        req.url url
+        req.options.merge!(options)
+        req.url(url)
         req.body = data
       end
       response.body
@@ -77,8 +79,8 @@ module Saddle
     # Make a PUT request
     def put(url, data={}, options={})
       response = connection.put do |req|
-        req.options.merge! options
-        req.url url
+        req.options.merge!(options)
+        req.url(url)
         req.body = data
       end
       response.body
@@ -87,8 +89,8 @@ module Saddle
     # Make a DELETE request
     def delete(url, params={}, options={})
       response = connection.delete do |req|
-        req.options.merge! options
-        req.url url, params
+        req.options.merge!(options)
+        req.url(url, params)
       end
       response.body
     end
@@ -105,6 +107,9 @@ module Saddle
     # Build a connection instance, wrapped in the middleware that we want
     def connection
       @connection ||= Faraday.new(base_url) do |builder|
+        # Include the requester level options
+        builder.options[:client_options] = @options
+
         # Config options
         unless @timeout.nil?
           builder.options[:timeout] = @timeout

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Mike Lewis