activerecord-honeycomb 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1686f5b56b0a372f7af11190a4206f6aa69e2e88efc761306db4de3bc96340ca
-  data.tar.gz: 14dcd90cb80a06bf4c4d8eb30ae8bb75af36bc5a92a2403cd05004bc9ea7b1d8
+  metadata.gz: 09fbe7feddc8d469cf58d65b096dfafedc9f2829c11ce22899bc4768c4df382f
+  data.tar.gz: 60012d9f52988eb0b5aaf479366b7a4e85a7cb85d05fb077eb5954bd389ce1eb
 SHA512:
-  metadata.gz: 682f11006a356983eba992dd7fe89459f3765b4ec645732be97d20a252bf5ffd42ab7920dee3e9ecbbfebd1d9773106363608098313f7bf3d52e4c2afa2f5016
-  data.tar.gz: 31a130980f993521081dc276e3d622bc9e62fddba25db982d1a53e231086aaafa1053b4c99aeef8e2ac30c73a2a0d1d160898b07eba77e7a53f1a3716e1cf4f4
+  metadata.gz: b8bf9645b2c1bf23184d6a957b639c794e8b6e871cf1a8ea334116d0c2bf36d145df13898c57a67ecdeb9aaf30ebd1be6a7f331df766144df73e685900df6984
+  data.tar.gz: 115d629a81825a47c9ce8da8d69d90245dbf0fe03a68d76b1bc01862d78b6b0ea68cf4360dfea675e035241c6d349df748e8a7ccd5a86c3085891b169c823d38

data/lib/active_record/honeycomb.rb

@@ -2,15 +2,33 @@ require 'active_record'
 
 module ActiveRecord
   module Honeycomb
-    def self.munge_config(config, client: nil, logger: nil)
-      munged = config.merge(
-        'adapter' => 'honeycomb',
-        'real_adapter' => config.fetch('adapter'),
-      )
-      munged['honeycomb_client'] = client if client
-      munged['honeycomb_logger'] = logger if logger
-      logger.debug "#{self.name}: injected HoneycombAdapter config, original adapter was #{munged['real_adapter'].inspect}" if logger
-      munged
+    class << self
+      def munge_config(config, client: nil, logger: nil)
+        config = resolve_config(config)
+
+        munged = config.merge(
+          'adapter' => 'honeycomb',
+          'real_adapter' => config.fetch('adapter'),
+        )
+        munged['honeycomb_client'] = client if client
+        munged['honeycomb_logger'] = logger if logger
+        logger.debug "#{self.name}: injected HoneycombAdapter config, original adapter was #{munged['real_adapter'].inspect}" if logger
+        munged
+      end
+
+      def resolve_config(config)
+        # ActiveRecord allows `config` to be a hash, an URL or a Symbol (the
+        # latter representing a key into ActiveRecord::Base.configurations,
+        # initialized elsewhere) - or even `nil` (in which case it checks the
+        # RAILS_ENV global and then falls back to the Symbol path). Rather than
+        # handle this mess, we use the same mechanism as
+        # ActiveRecord::Base.establish_connection to resolve it into a hash so
+        # we can munge it: see
+        # https://github.com/rails/rails/blob/9700dac/activerecord/lib/active_record/connection_handling.rb#L56-L57
+
+        resolver = ::ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(::ActiveRecord::Base.configurations)
+        resolver.resolve(config)
+      end
     end
   end
 end

data/lib/active_record/honeycomb/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module Honeycomb
     GEM_NAME = 'activerecord-honeycomb'
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/lib/activerecord-honeycomb/auto_install.rb

@@ -16,9 +16,9 @@ module ActiveRecord
           require 'activerecord-honeycomb'
 
           ActiveRecord::Base.extend(Module.new do
-            define_method :establish_connection do |config, *args|
+            define_method :establish_connection do |config=nil|
               munged_config = ActiveRecord::Honeycomb.munge_config(config, client: honeycomb_client, logger: logger)
-              super(munged_config, *args)
+              super(munged_config)
             end
           end)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sam Stokes