sequel-honeycomb 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48500ccad4e9926d90a6f5e7d113680f599af1dd4d438ec70733b9b07a377bf8
-  data.tar.gz: 9930ce6b12ef0bfb4982e8522d898eece22b454b7ee0dc82b7a71b37be5096ca
+  metadata.gz: f65f45f97eb6323a3505d0d1d617ce6a4eeb4738ef284f79f3741f302b076d4d
+  data.tar.gz: 3f965ee5b5a402a3d2120a97d14620f3f590731339d7c94b0581f1a22906be94
 SHA512:
-  metadata.gz: 06acd7ce8c4100e06efbe9726fb4df04d30d82981a3cfd9b7e7292b39cf94f2a86b1632dfcd7936ccaa7e8e5da503607e29d1747d998812a83fc3dd3ce31922f
-  data.tar.gz: ac0167afb29ca3cf072858f1fecf54cfb9e6595919cdf9d58badee03513957cd476849c0efcdf785fb8b569900d1b530a55a0c5acff5f247bfa5257af0c62c2e
+  metadata.gz: f37ad84cc4896478523b863e37f36375ef411d16a718ce62f8d89d27befd796f0863538fdfb02092f549b37dd8b5eb98abd9532eb869afb525f15183f7b20618
+  data.tar.gz: 292683937a9bf87c0b6715f0fe99ce1d8638a08186dfad842e5cba7ce7117953816de0154888271682d044704c2591d440e0c7d8dccd0dfd7cd2dd2e40acb62f

data/lib/sequel/extensions/honeycomb.rb

@@ -3,31 +3,37 @@ module Sequel
     module Honeycomb
       class << self
         attr_accessor :client
+        attr_reader :builder
+        attr_accessor :logger
 
-        def included(mod)
-          # TODO ugh clean this up
-          @client ||= begin
-            if defined?(::Honeycomb.client)
-              ::Honeycomb.client
-            else
-              raise "Can't work without magic global Honeycomb.client at the moment"
-            end
-          end
-          mod.class_exec(@client) do |honeycomb_|
-            define_method(:builder) do
-              honeycomb_.builder.add(
-                'meta.package' => 'sequel',
-                'meta.package_version' => Sequel::VERSION,
-                'type' => 'db',
-              )
-            end
+        def included(klazz)
+          if @client
+            debug "initialized with #{@client.class.name} explicitly provided"
+          elsif defined?(::Honeycomb.client)
+            debug "initialized with #{::Honeycomb.client.class.name} from honeycomb-beeline"
+            @client = ::Honeycomb.client
+          else
+            raise "Please set #{self.name}.client before using this extension"
           end
+
+          @builder ||= @client.builder.add(
+            'meta.package' => 'sequel',
+            'meta.package_version' => Sequel::VERSION,
+            'type' => 'db',
+          )
+        end
+
+        private
+        def debug(msg)
+          @logger.debug("#{self.name}: #{msg}") if @logger
         end
       end
 
-      def execute(sql, opts=OPTS, &block)
-        raise 'something went horribly wrong' unless builder # TODO
+      def builder
+        Sequel::Extensions::Honeycomb.builder
+      end
 
+      def execute(sql, opts=OPTS, &block)
         event = builder.event
 
         event.add_field 'db.table', first_source_table.to_s rescue nil

data/lib/sequel/honeycomb/version.rb

@@ -1,6 +1,6 @@
 module Sequel
   module Honeycomb
     GEM_NAME = 'sequel-honeycomb'
-    VERSION = '0.2.1'
+    VERSION = '0.3.1'
   end
 end

data/lib/sequel/honeycomb.rb

@@ -4,10 +4,13 @@ require 'sequel/extensions/honeycomb'
 module Sequel
   module Honeycomb
     class << self
-      def register!(client: nil, logger: nil)
+      def install!(client: nil, logger: nil)
         if client
           Sequel::Extensions::Honeycomb.client = client
         end
+        if logger
+          Sequel::Extensions::Honeycomb.logger = logger
+        end
 
         Sequel::Database.extension :honeycomb
       end

data/lib/sequel-honeycomb/auto_install.rb

@@ -2,17 +2,19 @@ module Sequel
   module Honeycomb
     module AutoInstall
       class << self
-        def available?(**_)
+        def available?(logger: nil)
           gem 'sequel'
+          logger.debug "#{self.name}: detected sequel, okay to autoinitialise" if logger
           true
-        rescue Gem::LoadError
+        rescue Gem::LoadError => e
+          logger.debug "Didn't detect Sequel (#{e.class}: #{e.message}), not autoinitialising sequel-honeycomb" if logger
           false
         end
 
         def auto_install!(honeycomb_client:, logger: nil)
           require 'sequel/honeycomb'
 
-          Sequel::Honeycomb.register!(client: honeycomb_client, logger: logger)
+          Sequel::Honeycomb.install!(client: honeycomb_client, logger: logger)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-honeycomb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney