spring_onion 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adf8950ce1f2d7c9c7d7c0d41d3472a833d37a046b9aa31848257a879c261c38
-  data.tar.gz: 23f8d10722ac30ce2a7c0c01236001ecde43c31ec47c81ad2fe0225495282252
+  metadata.gz: b2d9e6e733aeeb720b7b7dea0721c11b5892bc88ae8a48cdeec608028c8aae9d
+  data.tar.gz: d8f89788023aeb586e6df258c013a970fd28fe3c320741f41b20fd1ff5475d86
 SHA512:
-  metadata.gz: 4508747cc4ba4b0f4b2bea885b14877e6f7128afad83d0731cbe87b4160159acf13f39e8872d41c9c49328df80e92026900cde9280f8979de03d979a1d7d168e
-  data.tar.gz: 1a6634398984d1c7d317ed9685f9df6beca9c1377d564f90c70904aa646c90ef7d9b80586b79ff65d73253b327d1b711fdd7b7639eee10087ba4c2aa35a9d969
+  metadata.gz: 79e0052abddb1704f8e0f8d0d1faa4cc9ea180db04fd178917f0100c5857985ed91f219b106574409b447deb7b61efb14a3e9f8f353d15caa643edf592d6d0b0
+  data.tar.gz: 9bff4e63e15a9911eccc6d9f4d1614eb55c28e98d055b95f720b4653db7dbc38927c2c263ab95a1508c70f287f4ac20cb75d561a8943a64f81eb4ceb489e791b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spring_onion (1.0.1)
+    spring_onion (1.1.0)
       activerecord
       coderay
       mysql2
@@ -28,7 +28,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.6)
     diff-lcs (1.4.4)
-    i18n (1.8.3)
+    i18n (1.8.4)
       concurrent-ruby (~> 1.0)
     minitest (5.14.1)
     mysql2 (0.5.3)

data/README.md

@@ -36,7 +36,8 @@ ActiveRecord::Base.establish_connection(
 )
 
 SpringOnion.enabled = true # or `SPRING_ONION_ENABLED=1`
-SpringOnion.connection = ActiveRecord::Base.connection.raw_connection
+# `SPRING_ONION_DATABASE_URL=mysql2://...`
+# default: SpringOnion.connection = ActiveRecord::Base.connection.raw_connection
 SpringOnion.source_filter_re = //
 
 class Employee < ActiveRecord::Base; end

data/lib/spring_onion.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require 'logger'
-require 'coderay'
+
 require 'active_support'
+require 'coderay'
+require 'mysql2'
 
 require 'spring_onion/config'
 require 'spring_onion/error'
@@ -11,6 +13,12 @@ require 'spring_onion/json_logger'
 require 'spring_onion/version'
 
 ActiveSupport.on_load :active_record do
+  if ENV['SPRING_ONION_DATABASE_URL'] && !SpringOnion.connection
+    SpringOnion.connection = Mysql2::Client.new(
+      ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(ENV['SPRING_ONION_DATABASE_URL']).to_hash
+    )
+  end
+
   require 'active_record/connection_adapters/abstract_mysql_adapter'
   ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend SpringOnion::Explainer
 end

data/lib/spring_onion/config.rb

@@ -59,15 +59,16 @@ module SpringOnion
     idx ? backtrace_lines.slice(idx..-1) : []
   end
 
-  @logger = Logger.new($stdout).tap do |logger|
+  @logger = Logger.new(ENV['SPRING_ONION_LOG'] || $stdout).tap do |logger|
     logger.formatter = lambda do |severity, datetime, _progname, msg|
       "\n#{self}\t#{severity}\t#{datetime}\t#{msg}\n"
     end
   end
 
+  @log_all = (/\A(1|true)\z/i =~ ENV['SPRING_ONION_LOG_ALL'])
   @trace_len = 3
   @json_pretty = (/\A(1|true)\z/i =~ ENV['SPRING_ONION_JSON_PRETTY'])
-  @color = /\A(1|true)\z/i =~ ENV.fetch('SPRING_ONION_COLOR', $stdout.tty?.to_s)
+  @color = /\A(1|true)\z/i =~ ENV.fetch('SPRING_ONION_COLOR', @logger.instance_variable_get(:@logdev)&.dev&.tty?&.to_s)
 
   class << self
     attr_accessor :enabled,
@@ -76,6 +77,7 @@ module SpringOnion
                   :sql_filter_re, :ignore_sql_filter_re, :sql_filter,
                   :source_filter_re, :ignore_source_filter_re, :source_filter,
                   :logger,
+                  :log_all,
                   :trace_len,
                   :json_pretty,
                   :color

data/lib/spring_onion/explainer.rb

@@ -16,18 +16,14 @@ module SpringOnion
           trace = SpringOnion.source_filter.call(caller)
 
           unless trace.length.zero?
-            conn = SpringOnion.connection
-            raise SpringOnion::Error, 'MySQL connection is not set' unless conn
-
+            conn = SpringOnion.connection || raw_connection
             exp = conn.query("EXPLAIN #{sql}", as: :hash).to_a
             exp.each { |r| r.delete('id') }
             _validate_explain(sql: sql, exp: exp, trace: trace)
           end
         end
-      rescue SpringOnion::Error
-        raise
       rescue StandardError => e
-        SpringOnion.logger.error(e)
+        SpringOnion.logger.error("#{e}\n\t#{e.backtrace.join("\n\t")}")
       end
 
       yield
@@ -45,7 +41,7 @@ module SpringOnion
         warning_names_by_index[i] = warning_names unless warning_names.empty?
       end
 
-      return if warning_names_by_index.empty?
+      return if !SpringOnion.log_all && warning_names_by_index.empty?
 
       SpringOnion::JsonLogger.log(
         sql: sql,

data/lib/spring_onion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpringOnion
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring_onion
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord