spring_onion 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81f2b07f2a586b8e02444106908d6d8eb8631d772db5bff80dd0fa6ee72b550
-  data.tar.gz: 0e23da7945c119c5c5dcf90f2ead4985647536d0c7f3cb091b47e8f2c94ae168
+  metadata.gz: 54ea2a17b7ab30f6e646ed61b125dcc22e82cf304c946d26c70222a6e5a78341
+  data.tar.gz: af308c44d05e7b58048e5c29bd8f708a14d7067111210338ec52296ae9e00f16
 SHA512:
-  metadata.gz: 115c03712806b8b97d9ff1e65f512db06e8ebc9f4e555b743d97c57b9159c58dc4f43410b7fb73db178a584425e22b403f6005ed3be6cb9a01c57b3295c686e3
-  data.tar.gz: 4aa1951677c97b2fa2b45e2eeb3d49b51543e1632537c316a9d73d775b73b95472ced9074e06adc32d4c523bef5f069b9c4826c1f4bdf0a1e638e61d458dc2e1
+  metadata.gz: 1d5fcd164189c1a47126b009f0d058baffc306958cb2dcbd3bbf8e0f0bd4d54f49b9f862204b0d46bb4f68e44cd24257a2f62dced99f93b900d620f7871f2cc4
+  data.tar.gz: 0cae3be0dc5e774d092b3e2624bc943604dc8a0aac30dadf645a86f736f13f80978d0ec5a4a5bf595c7eff150f047f79a95769ab9d344bc15917d2ca4dd9b0c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spring_onion (0.2.1)
+    spring_onion (0.2.2)
       activerecord
       coderay
       mysql2

data/lib/spring_onion.rb

@@ -7,6 +7,7 @@ require 'active_support'
 require 'spring_onion/config'
 require 'spring_onion/error'
 require 'spring_onion/explainer'
+require 'spring_onion/json_logger'
 require 'spring_onion/version'
 
 ActiveSupport.on_load :active_record do

data/lib/spring_onion/config.rb

@@ -60,9 +60,9 @@ module SpringOnion
   end
 
   @logger = Logger.new($stdout).tap do |logger|
-    logger.formatter = lambda { |severity, datetime, _progname, msg|
+    logger.formatter = lambda do |severity, datetime, _progname, msg|
       "\n#{self}\t#{severity}\t#{datetime}\t#{msg}\n"
-    }
+    end
   end
 
   @trace_len = 3

data/lib/spring_onion/explainer.rb

@@ -19,7 +19,7 @@ module SpringOnion
 
             exp = conn.query("EXPLAIN #{sql}", as: :hash).to_a
             exp.each { |r| r.delete('id') }
-            _validate(exp, sql, trace)
+            _validate_explain(exp, sql, trace)
           end
         end
       rescue StandardError => e
@@ -29,35 +29,26 @@ module SpringOnion
       yield
     end
 
-    def _validate(exp, sql, trace)
+    def _validate_explain(exp, sql, trace)
       warnings = SpringOnion.warnings
-      warning_names_by_line = {}
+      warning_names_by_index = {}
 
       exp.each_with_index do |row, i|
         warning_names = warnings.select do |_name, validator|
           validator.call(row)
         end.keys
 
-        warning_names_by_line["line #{i + 1}"] = warning_names unless warning_names.empty?
+        warning_names_by_index[i] = warning_names unless warning_names.empty?
       end
 
-      return if warning_names_by_line.empty?
+      return if warning_names_by_index.empty?
 
-      h = {
+      SpringOnion::JsonLogger.log(
         sql: sql,
-        explain: exp.each_with_index.map { |r, i| { line: i + 1 }.merge(r) },
-        warnings: warning_names_by_line,
-        backtrace: trace.slice(0, SpringOnion.trace_len),
-      }
-
-      line = if SpringOnion.json_pretty
-               JSON.pretty_generate(h)
-             else
-               JSON.dump(h)
-             end
-
-      line = CodeRay.scan(line, :json).terminal if SpringOnion.color
-      SpringOnion.logger.info(line)
+        explain: exp,
+        warnings: warning_names_by_index,
+        trace: trace
+      )
     end
   end
 end

data/lib/spring_onion/json_logger.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module SpringOnion
+  module JsonLogger
+    module_function
+
+    def log(sql:, explain:, warnings:, trace:)
+      h = {
+        sql: sql,
+        explain: explain.each_with_index.map { |r, i| { line: i + 1 }.merge(r) },
+        warnings: warnings.transform_keys { |i| "line #{i + 1}" },
+        backtrace: trace.slice(0, SpringOnion.trace_len),
+      }
+
+      line = if SpringOnion.json_pretty
+               JSON.pretty_generate(h)
+             else
+               JSON.dump(h)
+             end
+
+      line = CodeRay.scan(line, :json).terminal if SpringOnion.color
+      SpringOnion.logger.info(line)
+    end
+  end
+end

data/lib/spring_onion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spring_onion
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - winebarrel
@@ -142,6 +142,7 @@ files:
 - lib/spring_onion/config.rb
 - lib/spring_onion/error.rb
 - lib/spring_onion/explainer.rb
+- lib/spring_onion/json_logger.rb
 - lib/spring_onion/version.rb
 - spring_onion.gemspec
 homepage: https://github.com/winebarrel/spring_onion