faraday-honeycomb 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3f5f4e6835284d3e0dcb3c6a0bf6ed865d7b8ede86effb953be5d81f222f767f
-  data.tar.gz: a1ee3f1c33b1dda61e728004fe9d0c5a28af38ee82e8b54745dac8c7daeda2d0
+SHA1:
+  metadata.gz: 5ab9e86fc18813b1af2006e63efc7c1194ffabf5
+  data.tar.gz: 26d1540af6203758683a8083963f9b227bdab16b
 SHA512:
-  metadata.gz: 9c516370d6ca1313616cec77a3702793bab508e2695e4af49de936f700fbd684de093ea95150a9c075a51272c13ad51a4ac767e3b20369635ebe4e8a828cf787
-  data.tar.gz: 4d9d7e340b23112ba86e9c1dc1642073aa17cb0f17e8c7616761ef96ead942b763cc5d6bec9aac11fca256976d941dccac69cc760492eb87ad2399ffe4950a6c
+  metadata.gz: d37866d1e54e453ed2926e5cee15675b697d0c86eb8cb4c2698096ad03f069cde6e08af2758249f204dd33dd0ec36b4de0023321c40912c4d49276e04ecdf209
+  data.tar.gz: a38b48bf26a8aa686237b23fec1e100e1b98959dd0165cef4c1c45888af000a0e3969e89ae7d554fcdc6cfadd50bb25d8f0ab403b59501aeeb91ddda81cb7b17

data/lib/faraday/honeycomb/version.rb

@@ -1,7 +1,7 @@
 module Faraday
   module Honeycomb
     GEM_NAME = 'faraday-honeycomb'
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
 
     MIN_FARADAY_VERSION = '0.8'
   end

data/lib/faraday-honeycomb/auto_install.rb

@@ -14,26 +14,73 @@ module Faraday
           false
         end
 
+        def ensure_middleware_in_builder!(builder, client, logger)
+          if builder.handlers.any? { |m| m.klass == ::Faraday::Honeycomb::Middleware }
+            logger.debug "Faraday::Honeycomb::Middleware already exists in Faraday middleware" if logger
+            return
+          end
+
+          # In faraday < 1.0 the adapter is added directly to handlers, so we
+          # need to find it in the stack and insert honeycomb's middleware
+          # before it
+          #
+          # In faraday >= 1.0 the adapter will never be in the list of
+          # handlers, and will _always_ be the last thing called in the
+          # middleware stack, so we need to handle it not being present.
+          # https://github.com/lostisland/faraday/pull/750
+          index_of_first_adapter = (builder.handlers || [])
+            .find_index { |h| h.klass.ancestors.include? Faraday::Adapter }
+
+          if index_of_first_adapter
+            logger.debug "Adding Faraday::Honeycomb::Middleware before adapter" if logger
+            builder.insert_before(
+              index_of_first_adapter,
+              Faraday::Honeycomb::Middleware,
+              client: client, logger: logger
+            )
+          else
+            logger.debug "Appending Faraday::Honeycomb::Middleware to stack" if logger
+            builder.use Faraday::Honeycomb::Middleware, client: client, logger: logger
+          end
+        end
+
         def auto_install!(honeycomb_client:, logger: nil)
           require 'faraday'
           require 'faraday-honeycomb'
 
           Faraday::Connection.extend(Module.new do
             define_method :new do |*args, &orig_block|
-              block = if orig_block
-                proc do |b|
-                  logger.debug "Adding Faraday::Honeycomb::Middleware in #{self}.new{}" if logger
-                  b.use :honeycomb, client: honeycomb_client, logger: logger
-                  orig_block.call(b)
-                end
-              else
-                proc do |b|
-                  logger.debug "Adding Faraday::Honeycomb::Middleware in #{self}.new" if logger
-                  b.use :honeycomb, client: honeycomb_client, logger: logger
-                  b.request :url_encoded
-                  b.adapter Faraday.default_adapter
+              # If there are two arguments the first argument might be an
+              # options hash, or a URL. The last argument in the array is
+              # always an instance of `ConnectionOptions`.
+              options = args.reduce({}) do |out, arg|
+                out.merge!(arg.to_hash) if arg.respond_to? :to_hash
+                out
+              end
+
+              builder = options["builder"] || options[:builder]
+
+              if !builder
+                # This is the configuration that would be applied if someone
+                # created faraday without a config block/builder. We need to specify it
+                # here because our monkeypatch causes a block to _always_ be
+                # passed to Faraday
+                # https://github.com/lostisland/faraday/blob/v0.15.4/lib/faraday/rack_builder.rb#L56-L60
+                orig_block ||= proc do |c|
+                  c.request :url_encoded
+                  c.adapter Faraday.default_adapter
                 end
               end
+
+              # Always add honeycomb middleware after the middleware stack has
+              # been resolved by the original block/any defaults that are
+              # applied by Faraday
+              block = proc do |b|
+                orig_block.call(b) if orig_block
+
+                Honeycomb::AutoInstall.ensure_middleware_in_builder!(b.builder, honeycomb_client, logger)
+              end
+
               super(*args, &block)
             end
           end)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "    TO DO *is* a description\n"
 email:
 - support@honeycomb.io
@@ -127,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Instrument your Faraday HTTP requests with Honeycomb