lorekeeper 2.6.2 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6870cd9dbaba0f1a82e90805f8177a689cb8f1d8e3ff194ae403c8e68f85cfb
-  data.tar.gz: 3f98d3e87de6f7a0c06fb3ba29405984f9aa74b105971f6bfcfb4786b2b6255f
+  metadata.gz: e282bfe416e749c799f15f0536b549564a754c772046e31ac718eb765c9883df
+  data.tar.gz: 002bee464879dc13c440b5fa835e844352f4f19bbf137926328e1f410e635dc8
 SHA512:
-  metadata.gz: dabdb1a460cc3eddb6c1ae00cb99c3cb9ac044a62b5bb2b9f12ebc149d23978e513ee30e8b43bb5922b2976f90e7e942407a5a2b54635704c98c9dbcd586741d
-  data.tar.gz: ec89d09e5daee804a3745a3c858b1305da2ba08d543b5d3766abfe66ba86d3c2e55d77a56e61d7f0273b82592627263f71aacada6265b18bc66f6fef7efb070c
+  metadata.gz: babd0aa08447fc53c1430c588439bb5743dbee7e0dbdfb8fc4d2f70e1a9fa231cf46e74e05e1b905515239f06573a33e59ecfacc7c8138c152de24bc234647b2
+  data.tar.gz: 2951023ec3da1084c90b0c2ac156ba98617c9b28cdded020dc179cd63c9345215b22fdfe732dbcc16c9d4e7c8d7e4eff39fe2089ebff6c756c6e9dc0120683ec

data/.github/workflows/build.yml

@@ -14,14 +14,32 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
+        rails: ['5.2.8', '6.0.6', '6.1.7', '7.0.8', '7.1.4', '7.2.1']
+        include:
+          - rails: '4.0.13'
+            ruby: '2.7'
+          - rails: '4.1.16'
+            ruby: '2.7'
+          - rails: '4.2.11'
+            ruby: '2.7'
+          - rails: '5.0.7'
+            ruby: '2.7'
+          - rails: '5.1.7'
+            ruby: '2.7'
+        exclude:
+          - rails: '7.2.1'
+            ruby: '2.7'
+          - rails: '7.2.1'
+            ruby: '3.0'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: ${{ matrix.ruby }}
+        cache-version: rails-${{ matrix.rails }} # for the cache key
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run rubocop
       run: bundle exec rubocop
@@ -29,3 +47,6 @@ jobs:
       run: bundle exec rspec
     - name: Run benchmark
       run: bundle exec rake benchmark
+
+    env:
+      RAILS_VER: ${{ matrix.rails }}

data/.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 require:
   - rubocop-performance
 
@@ -12,16 +14,20 @@ AllCops:
   #
     - 'vendor/bundle/**/*'
 
-Lint/ConstantDefinitionInBlock:
-  Exclude:
-    - 'spec/**/*'
-
 Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/**/*'
+
+Lint/StructNewOverride:
+  Exclude:
+    - spec/lib/lorekeeper/backtrace_cleaner_spec.rb
+
 Metrics/ParameterLists:
   CountKeywordArgs: false
 

data/.rubocop_todo.yml

@@ -0,0 +1,28 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-10-30 07:24:07 UTC using RuboCop version 1.24.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: space, no_space
+Layout/SpaceAroundEqualsInParameterDefault:
+  Exclude:
+    - 'lib/lorekeeper/multi_logger.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/lorekeeper/multi_logger.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantFreeze:
+  Exclude:
+    - 'lib/lorekeeper/backtrace_cleaner.rb'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.6.4
+* Reorder the exception fields to have the `data` field before the `exception` field
+
+# 2.6.3
+* Fix Lorekeeper::BacktraceCleaner to support BacktraceLocation
+
 # 2.6.2
 * Fix respond_to? method signature
 

data/Gemfile

@@ -4,3 +4,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in lorekeeper.gemspec
 gemspec
+
+gem 'activesupport', "~> #{ENV.fetch('RAILS_VER', '7.1.1')}"

data/lib/lorekeeper/backtrace_cleaner.rb

@@ -38,6 +38,7 @@ module Lorekeeper
       last_index = nil
       result = []
       backtrace.each_with_index do |line, idx|
+        line = line.to_s
         if line.start_with?(@rails_root) && @gem_path.none? { |path| line.start_with?(path) }
           result << line[@rails_root_size..]
           last_index = idx

data/lib/lorekeeper/json_logger.rb

@@ -10,7 +10,7 @@ module Lorekeeper
       reset_state
       @base_fields = { TIMESTAMP => '', MESSAGE => '', LEVEL => '' }
 
-      super(file)
+      super
     end
 
     def current_fields
@@ -28,10 +28,10 @@ module Lorekeeper
     # Delegates methods to the existing Logger instance
     # We are extending the logger API with methods error_with_data, etc
     LOGGING_METHODS.each do |method_name|
-      define_method "#{method_name}_with_data", ->(message_param = nil, data = {}, &block) {
+      define_method :"#{method_name}_with_data", ->(message_param = nil, data = {}, &block) {
         return true if METHOD_SEVERITY_MAP[method_name] < @level
 
-        extra_fields = { DATA => (data || {}) }
+        extra_fields = { DATA => data || {} }
         with_extra_fields(extra_fields) do
           add(METHOD_SEVERITY_MAP[method_name], message_param, nil, &block)
         end
@@ -77,17 +77,18 @@ module Lorekeeper
       if exception.is_a?(Exception)
         backtrace = clean_backtrace(exception.backtrace || [])
         exception_fields = {
+          DATA => param_data,
           EXCEPTION => "#{exception.class}: #{exception.message}",
           STACK => backtrace
         }
-        exception_fields[DATA] = param_data if param_data
+        exception_fields.compact!
 
         message = param_message || exception.message
         with_extra_fields(exception_fields) { log_data(log_level, message) }
       else
         log_data(METHOD_SEVERITY_MAP[:warn], 'Logger exception called without exception class.')
         message = "#{exception.class}: #{exception.inspect} #{param_message}"
-        with_extra_fields(DATA => (param_data || {})) { log_data(log_level, message) }
+        with_extra_fields(DATA => param_data || {}) { log_data(log_level, message) }
       end
     end
 

data/lib/lorekeeper/simple_logger.rb

@@ -38,7 +38,7 @@ module Lorekeeper
 
     # Extending the logger API with methods error_with_data, etc
     LOGGING_METHODS.each do |method_name|
-      define_method "#{method_name}_with_data", ->(message_param = nil, data = {}) {
+      define_method :"#{method_name}_with_data", ->(message_param = nil, data = {}) {
         return true if METHOD_SEVERITY_MAP[method_name] < @level
 
         log_data(METHOD_SEVERITY_MAP[method_name], "#{message_param}, data: #{data}")

data/lib/lorekeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lorekeeper
-  VERSION = '2.6.2'
+  VERSION = '2.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorekeeper
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.4
 platform: ruby
 authors:
 - Jordi Polo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -215,6 +215,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -234,7 +235,7 @@ homepage: https://github.com/JordiPolo/lorekeeper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -249,8 +250,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Very fast JSON logger
 test_files: []