uncruft 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccffb31a8b4462a1b8c95d3d114f9b7d8753169d188f1f60dc374c4719260f6
-  data.tar.gz: 84c1eee3cb5a038d5e150edf912782d3cb667c158cb272e1de8e1db2fe7b2286
+  metadata.gz: 256094a00a05b46db9837a089a6e3616a080bedf9c1a4490f11ead3d6b0733f3
+  data.tar.gz: 68dacd30c473ff88afc14b5d15f060c74601e33c7144694ed7536b58f1139a45
 SHA512:
-  metadata.gz: 267903bc264c332443e14cf85de2290cc11193223b2cde454d7e8b0246f0e2c1cd4e97f6917291926d35b0a9ee4b5cd453a3ed447867bd0506f98ca24666e59d
-  data.tar.gz: c16db25cb5ebb80a9001c8db78b1621cc6e2b88a196fc2673430e6d1a8248d9a7d09242912503af9caeae4b615253c49c969dc38c7ee43ed4ec290b19ca608f9
+  metadata.gz: 76217512c4706492767404883a02a2901284e4cbf80c6dc011f8e4fded6f9259de55cb324e82a7a9f79c6fb02a324796559e96b3948a44f63f6e56017e191a1e
+  data.tar.gz: 85beda4fa922f7a9208820e3e99d016f9fb5858f4876b16b4387091d38e71cad16bb2a2c156b43f97dc75a0c198630be7eb9528ae4c9effe46cde9ddbe07e4b8

data/lib/uncruft/deprecation_handler.rb

@@ -30,7 +30,7 @@ module Uncruft
     end
 
     def line_number(message)
-      message.match(/called from( .+ at)? .+:(\d+)/)&.[](2)
+      message[/called from( .+ at)? .+:(\d+)/, 2]
     end
 
     # Rails deprecation message formats found here:
@@ -40,12 +40,8 @@ module Uncruft
     end
 
     def normalize_callstack_path(message)
-      if (gem_home = gem_home(message)).present?
-        message.gsub!(gem_home, '$GEM_PATH')
-      end
-
-      if (user_install = user_install(message)).present?
-        message.gsub!(user_install, '$GEM_PATH')
+      if (gem_path = gem_path(message)).present?
+        message.gsub!(gem_path, '$GEM_PATH')
       end
 
       if message.include?(bin_dir)
@@ -73,16 +69,13 @@ module Uncruft
       message.sub(/(called from( .+ at)? .+):\d+/, '\1')
     end
 
-    def gem_home(message)
-      message.match(%r{(?i:c)alled from( .+ at)? (#{ENV.fetch('GEM_HOME', nil)}/(.+/)*gems)})&.[](2).presence
-    end
-
-    def user_install(message)
-      message.match(%r{(?i:c)alled from( .+ at)? (#{Gem.user_dir}/(.+/)*gems)})&.[](2).presence
+    def gem_path(message)
+      paths = [ENV.fetch('GEM_HOME', nil), Bundler.home.to_s, Gem.user_dir].compact
+      message[%r{(?i:c)alled from( .+ at)? (#{Regexp.union(paths)}/(.+/)*gems)}, 2].presence
     end
 
     def absolute_path(message)
-      message.match(/called from( .+ at)? (.+):\d/)&.[](2)
+      message[/called from( .+ at)? (.+):\d/, 2]
     end
 
     def relative_path(absolute_path)

data/lib/uncruft/railtie.rb

@@ -11,12 +11,16 @@ module Uncruft
         strategies.unshift(DeprecationHandler.new)
         config.active_support.deprecation = strategies
       end
+    end
 
-      if Rails.gem_version >= Gem::Version.new('7.1')
-        initializer "uncruft.deprecator" do |app|
-          app.deprecators[:uncruft] = Uncruft.deprecator
-        end
+    if Rails.gem_version >= Gem::Version.new('7.1')
+      initializer "uncruft.deprecator" do |app|
+        app.deprecators[:uncruft] = Uncruft.deprecator
       end
     end
+
+    initializer 'uncruft.deprecator.behavior' do |app|
+      Uncruft.deprecator.behavior = app.config.active_support.deprecation
+    end
   end
 end

data/lib/uncruft/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uncruft
-  VERSION = '0.6.2'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uncruft
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Nathan Griffith
 - Chris Zega
 bindir: bin
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A library to assist with Rails upgrades
 test_files: []