timberio 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7561d4af5b30a06c3964a04ff0ff21d3f36bca31
-  data.tar.gz: 5072e0329ba5799c2c73622b483f2301d2055797
+  metadata.gz: 32fd0ba50fea7cd8da1add4c1f49f59dee59113b
+  data.tar.gz: 2cbcd235d1736bacdd6d43b9b15cf370b5a49e98
 SHA512:
-  metadata.gz: 977a6aff51b60657619677e63892a129fbe43fe90cdbffcb1678a3c19434676b264b79853a046a9e1aa3596f2d66d09cc6185d9755bc48a3499409a3670269e8
-  data.tar.gz: f17d76bef300091e365087f7c8c892f0ef5407fdee4fc12b7f739c23fc0255386636c21e6d636e324b5fb183ddf60ff32c3f07628345602505b458ebe39dc40b
+  metadata.gz: fa949521e0eacfc590499dcc31c85decab9ce2b615a72307608221ec66061e20a569833f9bc8b604495c0c168b67e562bd216577d8c37961c80a4e2035f3edc0
+  data.tar.gz: cb004c12ed2fa4cd7f36b9d1472945a5bf5dcba4bec62fe15d139737b80ba1a977aec9636106b8464083b9a09da63e6587986bbad382163e32706dafd450cbe0

data/lib/timber/probes/active_record_log_subscriber/log_subscriber.rb

@@ -7,64 +7,21 @@ module Timber
       # default behavior / log messages.
       class LogSubscriber < ::ActiveRecord::LogSubscriber #:nodoc:
         def sql(event)
-          return unless logger.debug?
-
-          self.class.runtime += event.duration
+          super(event)
 
           payload = event.payload
-
-          return if defined?(IGNORE_PAYLOAD_NAMES) && IGNORE_PAYLOAD_NAMES.include?(payload[:name])
-
-          name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
-          sql   = payload[:sql]
-          binds = nil
-
-          unless (payload[:binds] || []).empty?
-            binds = "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
-          end
-
-          name = colorize_payload_name(name, payload[:name])
-          sql  = color(sql, sql_color(sql), true)
-
-          message = "  #{name}  #{sql}#{binds}"
-
           event = Events::SQLQuery.new(
             sql: payload[:sql],
             time_ms: event.duration,
-            message: message
+            message: @message
           )
 
-          debug event
+          logger.debug event
         end
 
         private
-          def colorize_payload_name(name, payload_name)
-            if payload_name.blank? || payload_name == "SQL" # SQL vs Model Load/Exists
-              color(name, MAGENTA, true)
-            else
-              color(name, CYAN, true)
-            end
-          end
-
-          def sql_color(sql)
-            case sql
-            when /\A\s*rollback/mi
-              RED
-            when /select .*for update/mi, /\A\s*lock/mi
-              WHITE
-            when /\A\s*select/i
-              BLUE
-            when /\A\s*insert/i
-              GREEN
-            when /\A\s*update/i
-              YELLOW
-            when /\A\s*delete/i
-              RED
-            when /transaction\s*\Z/i
-              CYAN
-              else
-              MAGENTA
-            end
+          def debug(message)
+            @message = message
           end
       end
     end

data/lib/timber/version.rb

@@ -1,3 +1,3 @@
 module Timber
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/timber/probes/active_record_log_subscriber_spec.rb

@@ -34,13 +34,16 @@ describe Timber::Probes::ActiveRecordLogSubscriber do
             logger.level = old_level
           end
 
-          it "should log the controller call event" do
+          it "should log the sql query" do
             User.order("users.id DESC").all.collect # collect kicks the sql because it is lazily executed
             message = "  \e[1m\e[36mUser Load (0.0ms)\e[0m  \e[1m\e[34mSELECT \"users\".* FROM \"users\" ORDER BY users.id DESC\e[0m @timber.io {\"level\":\"debug\",\"dt\":\"2016-09-01T12:00:00.000000Z\",\"event\":{\"sql_query\":{\"sql\":\"SELECT \\\"users\\\".* FROM \\\"users\\\" ORDER BY users.id DESC\",\"time_ms\":0.0}}}\n"
             # Rails 4.X adds random spaces :/
             string = io.string.gsub("   ORDER BY", " ORDER BY")
             string = string.gsub("  ORDER BY", " ORDER BY")
-            expect(string).to eq(message)
+            expect(string).to include("users.id DESC")
+            expect(string).to include("@timber.io")
+            expect(string).to include("\"level\":\"debug\"")
+            expect(string).to include("\"sql\":")
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timberio
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Timber Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack