uncruft 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e548761723a5ef0bf1e9f5ab10ec4b415270ccf22b2961c7b24cfa0e25992d
-  data.tar.gz: 52ff06d81f84337a23ab913f23d792c9875b12ab863d2ff501f38dbd1b790986
+  metadata.gz: 7268553c4497135263a268db1cab0869a74d6a6ca53598419f68890922690780
+  data.tar.gz: bb8807475bc2da7fce185fe23857b773bd3a8e23f4e67680e8917bfd74e44421
 SHA512:
-  metadata.gz: 390695412c3992cce207fc9d16847e42bd7d4788ae3d9b45d0bcfcdf324909883077a73ed350b75f26ab99eae635af2b813541f6b563e7395aaaaca2c55c6e2a
-  data.tar.gz: 86c23923dfc8aa15ca9d965af0b4b63f0592044c3d39a7b921a98e6a4bf1517d2746b26691752332c705b65c57e2e2fe4583d728a0f133c8834b5cd9ac3466ec
+  metadata.gz: 269f6f73bff75e390ee02bcea4e0961077f4195be0f9df397bc3750aecbfce598e76c62d48b446177f25a1441e8dadb129e3fba9133f921e994f4d704ab5b70f
+  data.tar.gz: ff2e3c840c0d2bbc4b2fc10aa8433606039f764a8f99719952ca1a3ce32a6c318eabf395914221b7932e93cc0ae8e4a0b91fabef173bc3b1d917c95188ab71b9

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

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

data/lib/uncruft/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uncruft
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Nathan Griffith
 - Chris Zega
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties