time_bandits 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14e3f3974575197ad97649241f327dbf69824c354044bde8bd55ff421d9c21a
-  data.tar.gz: 4115bb4f9820a3227a62d6b4ea66c5f045c59cacb019fd89be71ff9da6b2f790
+  metadata.gz: d5b75c63570dfa36709209cb0e1abe7fd8842bc795c7e0c5dd15a285af090bf6
+  data.tar.gz: afb24d0ea48efe0ec1505be1550ece1cb31af9c4b1eb5df55b96e2c1898e90b4
 SHA512:
-  metadata.gz: abc74cb6ae11bdf9388f8d113a3df89d61e6403cd614ebdd8d73aaa5be84c8a2d9d50d746b57a2eb4079140e1a34c9e1e3c172428e1065d15893ad94e99330b6
-  data.tar.gz: bd2347a6f49613abd7359524c1a08cb609acf501180b1deeb5b093318b664ff330c7a0bd8b2a577b1dee303d62ea8481162485b704d4f9041000cc58b3dd77a2
+  metadata.gz: 05a7d021d2b0242a5289450fa385dc86d6c3e2512c4a331e40a3428d7d5ab19be347544a32bac8df2a1ba726c898a6ba8b51a698312107a5a7730995a45cfacd
+  data.tar.gz: 953e21a301535b9384263fd1d686e5dd4eea45ca25bd5b64191f979b6b83dde73e439f38428114e54e6ee83ce7baffc2fa16e7c492cabd070a0dcb29b409a4e3

data/.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.2.0, 3.1.3, 3.0.5, 2.7.7]
+        ruby-version: [3.2.2, 3.1.4, 3.0.6, 2.7.8]
 
     steps:
       - uses: actions/checkout@v3

data/Appraisals

@@ -1,10 +1,11 @@
 appraisals = [
-  "6.0.6",
-  "6.1.6",
+  "6.0.6.1",
+  "6.1.7.6",
+  "7.0.8",
+  "7.1.0"
 ]
 
 appraisals.insert(0, "5.2.8.1") if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.0.0")
-appraisals << "7.0.4" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
 
 appraisals.each do |rails_version|
   %w(4.0 5.0).each do |redis_version|

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.14.0
+
+* Support Rails 7.1.0.
+
 ## 0.13.1
 * Fixed last place that tried to log a monotonic clock timestamp
   instead of a Time instance.

data/Gemfile

@@ -4,6 +4,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "hiredis-client"
-
-# Use patched appraisal gem until it is fixed upstream.
-gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git", ref: "0c855ae0da89fec74b4d1a01801c55b0e72496d4"

data/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
   mysql:
     container_name: mysql
-    image: mysql:5.7
+    image: mysql:8
     ports:
       - "3601:3306"
     environment:

data/lib/time_bandits/monkey_patches/active_record.rb

@@ -9,6 +9,18 @@ module ActiveRecord
   class LogSubscriber
     IGNORE_PAYLOAD_NAMES = ["SCHEMA", "EXPLAIN"] unless defined?(IGNORE_PAYLOAD_NAMES)
 
+    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("7.1.0")
+      def self.reset_runtime
+        ActiveRecord::RuntimeRegistry.reset
+      end
+      def self.runtime
+        ActiveRecord::RuntimeRegistry.sql_runtime
+      end
+      def self.runtime=(value)
+        ActiveRecord::RuntimeRegistry.sql_runtime = value
+      end
+    end
+
     def self.call_count=(value)
       Thread.current.thread_variable_set(:active_record_sql_call_count, value)
     end
@@ -56,23 +68,64 @@ module ActiveRecord
 
     private
     def log_sql_statement(payload, event)
-      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      name = if payload[:async]
+        "ASYNC #{payload[:name]} (#{payload[:lock_wait].round(1)}ms) (db time #{event.duration.round(1)}ms)"
+      else
+        "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      end
       name  = "CACHE #{name}" if payload[:cached]
       sql   = payload[:sql]
-      binds = nil
-
-      unless (payload[:binds] || []).empty?
-        casted_params = type_casted_binds(payload[:type_casted_binds])
-        binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
-          render_bind(attr, value)
-        }.inspect
-      end
+      binds = render_binds(payload)
 
       name = colorize_payload_name(name, payload[:name])
-      sql  = color(sql, sql_color(sql), true)
+      sql  = colorize_sql(sql) if colorize_logging
 
       debug "  #{name}  #{sql}#{binds}"
     end
+
+    if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("7.1.0")
+      def render_binds(payload)
+        binds = nil
+        if payload[:binds]&.any?
+          casted_params = type_casted_binds(payload[:type_casted_binds])
+
+          binds = []
+          payload[:binds].each_with_index do |attr, i|
+            attribute_name = if attr.respond_to?(:name)
+              attr.name
+            elsif attr.respond_to?(:[]) && attr[i].respond_to?(:name)
+              attr[i].name
+            else
+              nil
+            end
+
+            filtered_params = filter(attribute_name, casted_params[i])
+
+            binds << render_bind(attr, filtered_params)
+          end
+          binds = binds.inspect
+          binds.prepend("  ")
+        end
+        return binds
+      end
+      def colorize_sql(sql)
+        color(sql, sql_color(sql), bold: true)
+      end
+    else
+      def render_binds(payload)
+        binds = nil
+        unless (payload[:binds] || []).empty?
+          casted_params = type_casted_binds(payload[:type_casted_binds])
+          binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
+            render_bind(attr, value)
+          }.inspect
+        end
+        return binds
+      end
+      def colorize_sql(sql)
+        color(sql, sql_color(sql), true)
+      end
+    end
   end
 
   require "active_record/railties/controller_runtime"

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/test/test_helper.rb

@@ -23,6 +23,7 @@ ActiveSupport::LogSubscriber.logger =::Logger.new("/dev/null")
 # fake Rails
 module Rails
   extend self
+  ActiveSupport::Cache.format_version = 7.1 if Gem::Version.new(ActiveSupport::VERSION::STRING) >= Gem::Version.new("7.1.0")
   def cache
     @cache ||= ActiveSupport::Cache.lookup_store(:mem_cache_store)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-28 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Custom performance logging for Rails