peak_flow_utils 0.1.19 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb8a48ea294481df8df3c87b5b17eca7c7b2715027a512655f66a318acb8e2e
-  data.tar.gz: 1970d5b4843db5df6396e12d6cacfa70049af0ac8946f4e7243d3a7f70b5d981
+  metadata.gz: 228e66c09e2025f5df9ad150b660a3a8dabac0e1eececf027383206c3231714d
+  data.tar.gz: 6e245675c567304fbdcace379d668b1683a94999e80b3473e35a970e3d20c5dc
 SHA512:
-  metadata.gz: d1866c116955f38e9f2dc3c2e06fbeca908ed4c0bb425348a82fa8f1522fcfb1e47d1c96fe1a32328bd44f439f26dfddb97285dd0c19b0725f5241dcdb671d51
-  data.tar.gz: ac9fa1d930c30b5d32d450b10bd2af6ec95ead713b64e686ab07de7cbec5db94e5b4048e0a16e13657d06f1d483a5d4252d1c3d4068e188cfcd4586cc55a1349
+  metadata.gz: 0cbaad9919787a02b65b6e84413ef6a1f193ade8cf2b8d650f73138af2dfb7fd42b7850f988cd3459621ac10659a1eb2a562ea1184a41d87b78ded1b68c3b460
+  data.tar.gz: ea68e773ede1c61dbe304ddc29ba9b4626f215572455f5da7c8ba9ebf71a9974ad09473b96837f85243596a387649e5250b72540c6dfa8611052c55aa6d585ae

data/app/handlers/peak_flow_utils/file_handler.rb

@@ -2,7 +2,7 @@ class PeakFlowUtils::FileHandler < PeakFlowUtils::ApplicationHandler
   def groups
     ArrayEnumerator.new do |yielder|
       erb_inspector.files.each do |file|
-        id = file.file_path.gsub(/[^A-z0-9]/, "_")
+        id = file.file_path.gsub(/[^A-Za-z0-9]/, "_")
 
         group = PeakFlowUtils::GroupService.new(
           id: id,

data/app/handlers/peak_flow_utils/validations_handler.rb

@@ -79,7 +79,7 @@ private
     yielder << PeakFlowUtils::TranslationService.new(
       key: "activerecord.errors.models.#{snake_clazz_name}.attributes.#{attribute_name}.#{key}",
       key_show: "#{attribute_name}.#{key}",
-      dir: "#{Rails.root}/config/locales/awesome_translations/models/#{snake_clazz_name}"
+      dir: Rails.root.join("config/locales/awesome_translations/models/#{snake_clazz_name}").to_s
     )
   end
 end

data/app/services/peak_flow_utils/active_record_query.rb

@@ -0,0 +1,33 @@
+class PeakFlowUtils::ActiveRecordQuery
+  class SlowSQLError < RuntimeError; end
+
+  attr_reader :event
+
+  def initialize(event)
+    @event = event
+  end
+
+  def perform
+    report_slow_sql if duration_seconds >= 3
+  end
+
+  def duration_seconds
+    @duration_seconds ||= event.duration / 1000
+  end
+
+  def report_slow_sql
+    PeakFlowUtils::Notifier.with_parameters(sql: sql, duration_seconds: duration_seconds) do
+      raise SlowSQLError, "Slow SQL: #{sql_as_single_line}"
+    rescue StandardError => e
+      PeakFlowUtils::Notifier.notify(error: e)
+    end
+  end
+
+  def sql
+    @sql ||= event.payload.fetch(:sql)
+  end
+
+  def sql_as_single_line
+    @sql_as_single_line ||= sql.tr("\n", " ")
+  end
+end

data/app/services/peak_flow_utils/application_migration.rb

@@ -1,5 +1,3 @@
 class PeakFlowUtils::ApplicationMigration < ActiveRecord::Migration[5.1]
-  def connection
-    PeakFlowUtils::ApplicationRecord.connection
-  end
+  delegate :connection, to: :"PeakFlowUtils::ApplicationRecord"
 end

data/app/services/peak_flow_utils/database_initializer_service.rb

@@ -3,7 +3,7 @@ class PeakFlowUtils::DatabaseInitializerService < PeakFlowUtils::ApplicationServ
     path = File.realpath("#{__dir__}/../../../lib/peak_flow_utils/migrations")
     create_schema_table unless schema_table_exists?
 
-    Dir["#{path}/[0-9]*_*.rb"].sort.map do |filename|
+    Dir["#{path}/[0-9]*_*.rb"].map do |filename|
       match = filename.match(/migrations\/(\d+)_(.+)\.rb\Z/)
       next unless match
 

data/app/services/peak_flow_utils/erb_inspector/file_inspector.rb

@@ -132,6 +132,6 @@ private
   end
 
   def translation_with_key_exists?(translations_found, translation_full_key)
-    translations_found.select { |t| t.full_key == translation_full_key }.any?
+    translations_found.any? { |t| t.full_key == translation_full_key }
   end
 end

data/app/services/peak_flow_utils/erb_inspector/translation_inspector.rb

@@ -92,7 +92,7 @@ private
   def generate_dir
     parts = %w[config locales awesome_translations]
 
-    key_parts = @full_key.split(".").reject(&:blank?)
+    key_parts = @full_key.split(".").compact_blank
     key_parts.pop
 
     @dir = Rails.root.join(*(parts + key_parts)).to_s

data/app/services/peak_flow_utils/erb_inspector.rb

@@ -3,11 +3,7 @@ class PeakFlowUtils::ErbInspector
     @args = args
     @args[:exts] ||= [".erb", ".haml", ".liquid", ".markerb", ".rb", ".rake", ".slim", "."] + PeakFlowUtils::ErbInspector::FileInspector::JS_FILE_EXTS
 
-    if @args[:dirs]
-      @dirs = @args[:dirs]
-    else
-      @dirs = PeakFlowUtils::ConfigurationService.current.paths_to_translate
-    end
+    @dirs = @args[:dirs] || PeakFlowUtils::ConfigurationService.current.paths_to_translate
   end
 
   # Yields all relevant .erb- and .haml-files.

data/app/services/peak_flow_utils/model_inspector.rb

@@ -6,7 +6,7 @@ class PeakFlowUtils::ModelInspector
   # Yields a model-inspector for each model found in the application.
   def self.model_classes
     # Make sure all models are loaded.
-    load_models
+    load_models!
 
     @scanned = {}
     @yielded = {}
@@ -92,20 +92,20 @@ class PeakFlowUtils::ModelInspector
     to_s
   end
 
-  def self.find_subclasses(clazz, &blk)
+  def self.find_subclasses(clazz, &)
     return if @scanned[clazz.name]
 
     @scanned[clazz.name] = true
 
     clazz.subclasses.each do |subclass|
-      blk.call ::PeakFlowUtils::ModelInspector.new(subclass)
-      find_subclasses(subclass, &blk)
+      yield ::PeakFlowUtils::ModelInspector.new(subclass)
+      find_subclasses(subclass, &)
     end
   end
 
   # Preloads all models for Rails app and all engines (if they aren't loaded, then they cant be inspected).
-  def self.load_models
-    return false if PeakFlowUtils::ModelInspector.models_loaded
+  def self.load_models!
+    return if PeakFlowUtils::ModelInspector.models_loaded
 
     PeakFlowUtils::ModelInspector.models_loaded = true
 
@@ -113,8 +113,6 @@ class PeakFlowUtils::ModelInspector
     engines.each do |engine|
       load_models_for(engine.root)
     end
-
-    true
   end
 
   def self.engines
@@ -123,7 +121,7 @@ class PeakFlowUtils::ModelInspector
 
   # Loads models for the given app-directory (Rails-root or engine).
   def self.load_models_for(root)
-    Dir.glob("#{root}/app/models/**/*.rb").sort.each do |model_path|
+    Dir.glob("#{root}/app/models/**/*.rb").each do |model_path|
       require model_path
     rescue StandardError => e
       warn "Could not load model in #{model_path}"

data/app/services/peak_flow_utils/translations_parser_service.rb

@@ -100,7 +100,7 @@ class PeakFlowUtils::TranslationsParserService < PeakFlowUtils::ApplicationServi
 private
 
   def debug(message)
-    puts message.to_s if @debug # rubocop:disable Rails/Output
+    puts message if @debug # rubocop:disable Rails/Output
   end
 
   def perform_migrations

data/lib/peak_flow_utils/engine.rb

@@ -2,6 +2,6 @@ require "rails"
 
 module PeakFlowUtils; end
 
-class PeakFlowUtils::Engine < ::Rails::Engine
+class PeakFlowUtils::Engine < Rails::Engine
   isolate_namespace PeakFlowUtils
 end

data/lib/peak_flow_utils/inherited_local_var.rb

@@ -2,7 +2,9 @@ require "monitor"
 require_relative "thread_callbacks_patch"
 
 Thread.on_initialize do |parent:, thread:|
-  thread.instance_variable_set(:@_inherited_local_vars, parent.instance_variable_get(:@_inherited_local_vars))
+  parent_vars = parent.instance_variable_get(:@_inherited_local_vars)
+  new_cloned_vars = PeakFlowUtils::DeepMerger.execute!(hashes: [parent_vars])
+  thread.instance_variable_set(:@_inherited_local_vars, new_cloned_vars)
 end
 
 Thread.class_eval do
@@ -57,8 +59,13 @@ end
 class PeakFlowUtils::InheritedLocalVar
   attr_reader :identifier
 
+  def self.identifier_for_object_id(object_id)
+    "inherited_local_var_#{object_id}"
+  end
+
   def self.finalize(inherited_local_var_object_id)
-    Thread.inherited_local_vars_delete("inherited_local_var_#{inherited_local_var_object_id}")
+    identifier = PeakFlowUtils::InheritedLocalVar.identifier_for_object_id(inherited_local_var_object_id)
+    Thread.inherited_local_vars_delete(identifier)
   rescue Exception => e # rubocop:disable Lint/RescueException
     puts e.inspect # rubocop:disable Rails/Output
     puts e.backtrace # rubocop:disable Rails/Output
@@ -68,9 +75,7 @@ class PeakFlowUtils::InheritedLocalVar
 
   def initialize(new_value = nil)
     ObjectSpace.define_finalizer(self, PeakFlowUtils::InheritedLocalVar.method(:finalize))
-
-    @identifier = "inherited_local_var_#{__id__}"
-
+    @identifier = PeakFlowUtils::InheritedLocalVar.identifier_for_object_id(__id__)
     Thread.inherited_local_vars_set(identifier => new_value)
   end
 

data/lib/peak_flow_utils/models/group.rb

@@ -6,7 +6,7 @@ class PeakFlowUtils::Group < PeakFlowUtils::ApplicationRecord
   has_many :handler_translations, dependent: :destroy
   has_many :translation_keys, dependent: :destroy
 
-  validates :name, :handler, presence: true
+  validates :name, presence: true
 
   def at_handler
     @at_handler ||= handler.at_handler

data/lib/peak_flow_utils/models/handler_text.rb

@@ -3,7 +3,6 @@ class PeakFlowUtils::HandlerText < PeakFlowUtils::ApplicationRecord
   belongs_to :handler
   belongs_to :translation_key
 
-  validates :handler, :translation_key, presence: true
 
   delegate :key, :last_key, to: :translation_key
   delegate :value, to: :translation, prefix: true

data/lib/peak_flow_utils/models/translation_value.rb

@@ -1,7 +1,6 @@
 class PeakFlowUtils::TranslationValue < PeakFlowUtils::ApplicationRecord
   belongs_to :translation_key
 
-  validates :translation_key, presence: true
 
   delegate :key, to: :translation_key
 
@@ -10,7 +9,9 @@ class PeakFlowUtils::TranslationValue < PeakFlowUtils::ApplicationRecord
   end
 
   def handler_translation
-    @handler_translation ||= PeakFlowUtils::HandlerText
+    return @handler_translation if defined?(@handler_translation)
+
+    @handler_translation = PeakFlowUtils::HandlerText
       .find_by(translation_key_id: translation_key_id)
   end
 

data/lib/peak_flow_utils/notifier.rb

@@ -13,12 +13,12 @@ class PeakFlowUtils::Notifier
     @current
   end
 
-  def self.notify(*args, **opts, &blk)
-    PeakFlowUtils::Notifier.current&.notify(*args, **opts, &blk)
+  def self.notify(...)
+    PeakFlowUtils::Notifier.current&.notify(...)
   end
 
-  def self.notify_message(*args, **opts, &blk)
-    PeakFlowUtils::Notifier.current&.notify_message(*args, **opts, &blk)
+  def self.notify_message(...)
+    PeakFlowUtils::Notifier.current&.notify_message(...)
   end
 
   def self.reset_parameters
@@ -54,6 +54,7 @@ class PeakFlowUtils::Notifier
   def initialize(auth_token:)
     @auth_token = auth_token
     @mutex = ::Mutex.new
+    @on_notify_callbacks = []
     @parameters = ::PeakFlowUtils::InheritedLocalVar.new({})
   end
 
@@ -80,6 +81,7 @@ class PeakFlowUtils::Notifier
   end
 
   def notify(error:, environment: nil, parameters: nil)
+    error = normalize_error(error, fallback_backtrace: caller(2))
     error_parser = ::PeakFlowUtils::NotifierErrorParser.new(
       backtrace: error.backtrace,
       environment: environment,
@@ -90,6 +92,10 @@ class PeakFlowUtils::Notifier
 
     uri = URI("https://www.peakflow.io/errors/reports")
 
+    @on_notify_callbacks.each do |on_notify_callback|
+      on_notify_callback.call(parameters: merged_parameters)
+    end
+
     data = {
       auth_token: auth_token,
       error: {
@@ -109,10 +115,14 @@ class PeakFlowUtils::Notifier
     send_notify_request(data: PeakFlowUtils::ParseJson.new(data).parse, uri: uri)
   end
 
-  def notify_message(message, **opts)
+  def notify_message(message, **)
     raise NotifyMessageError, message
   rescue NotifyMessageError => e
-    notify(error: e, **opts)
+    notify(error: e, **)
+  end
+
+  def on_notify(&blk)
+    @on_notify_callbacks << blk
   end
 
   def send_notify_request(data:, uri:)
@@ -138,4 +148,18 @@ class PeakFlowUtils::Notifier
       url: response_data["url"]
     )
   end
+
+private
+
+  def normalize_error(error, fallback_backtrace:)
+    error = RuntimeError.new(error) if error.is_a?(String)
+
+    if error.backtrace.blank?
+      backtrace = fallback_backtrace
+      backtrace = caller(1) if backtrace.blank?
+      error.set_backtrace(backtrace)
+    end
+
+    error
+  end
 end

data/lib/peak_flow_utils/notifier_active_record.rb

@@ -0,0 +1,8 @@
+class PeakFlowUtils::NotifierActiveRecord
+  def self.configure
+    ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
+      event = ActiveSupport::Notifications::Event.new(*args)
+      PeakFlowUtils::ActiveRecordQuery.new(event).perform
+    end
+  end
+end

data/lib/peak_flow_utils/notifier_error_parser.rb

@@ -11,7 +11,7 @@ class PeakFlowUtils::NotifierErrorParser
 
   def detect_file_path_and_line_number
     backtrace.each do |trace|
-      match = trace.match(/^((.+)\.([A-z]{2,4})):(\d+)(:|$)/)
+      match = trace.match(/^((.+)\.([A-Za-z]{2,4})):(\d+)(:|$)/)
       next unless match
 
       file_path = match[1]

data/lib/peak_flow_utils/thread_callbacks_patch.rb

@@ -12,12 +12,12 @@ class Thread
     count_to_use
   end
 
-  def initialize(*args, &block)
+  def initialize(*, &)
     @@on_initialize_callbacks ||= {} # rubocop:disable Style/ClassVars
     @@on_initialize_callbacks.each_value do |callback|
       callback.call(parent: Thread.current, thread: self)
     end
 
-    _initialize(*args, &block)
+    _initialize(*, &)
   end
 end

data/lib/peak_flow_utils/version.rb

@@ -1,3 +1,3 @@
 module PeakFlowUtils
-  VERSION = "0.1.19".freeze
+  VERSION = "0.1.21".freeze
 end

data/lib/peak_flow_utils.rb

@@ -10,6 +10,7 @@ module PeakFlowUtils
 
   autoload :InheritedLocalVar, "#{path}/inherited_local_var"
   autoload :Notifier, "#{path}/notifier"
+  autoload :NotifierActiveRecord, "#{path}/notifier_active_record"
   autoload :NotifierErrorParser, "#{path}/notifier_error_parser"
   autoload :NotifierRack, "#{path}/notifier_rack"
   autoload :NotifierRails, "#{path}/notifier_rails"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: peak_flow_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.21
 platform: ruby
 authors:
 - kaspernj
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,41 +52,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: service_pattern
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: appraisal
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,13 +66,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: drb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,13 +80,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: mutex_m
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -123,19 +94,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo-data
+  name: service_pattern
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 description: Utilities to be used with PeakFlow.
 email:
 - k@spernj.org
@@ -158,6 +129,7 @@ files:
 - app/handlers/peak_flow_utils/validations_handler.rb
 - app/handlers/peak_flow_utils/will_paginate_handler.rb
 - app/services/peak_flow_utils/active_job_parameters_logging.rb
+- app/services/peak_flow_utils/active_record_query.rb
 - app/services/peak_flow_utils/application_migration.rb
 - app/services/peak_flow_utils/application_service.rb
 - app/services/peak_flow_utils/attribute_service.rb
@@ -193,6 +165,7 @@ files:
 - lib/peak_flow_utils/models/translation_key.rb
 - lib/peak_flow_utils/models/translation_value.rb
 - lib/peak_flow_utils/notifier.rb
+- lib/peak_flow_utils/notifier_active_record.rb
 - lib/peak_flow_utils/notifier_error_parser.rb
 - lib/peak_flow_utils/notifier_rack.rb
 - lib/peak_flow_utils/notifier_rails.rb
@@ -204,8 +177,8 @@ files:
 homepage: https://github.com/kaspernj/peak_flow_utils
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -213,15 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Utilities to be used with PeakFlow.
 test_files: []