uncruft 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c608624f22e89cb234de45de1a3247c70f0282b22725a6d214bc4c9dd8582dd
-  data.tar.gz: 9597fc8b80850971a68b64791e331cd10ae1c74362de9a6c7e4fa646886c4fb9
+  metadata.gz: b7438d7362fc0084592b5bee3b2e2f36e48ad824a61b9ae39decad086d339527
+  data.tar.gz: 7c5d6e1cf564fd51df31b0b6562ccf5e92dc68d6a482341bc364f1698d045673
 SHA512:
-  metadata.gz: e954a2ef6610cbefaa31d9eca450bc77797b67b4ea7e976165e75911f1a496a60ac0d1207b6ca78979ec3dbc5d210d4b8f7f6165413ff32be5364f4e63418184
-  data.tar.gz: 703afa875346fd2b792886808920b00300ad38258738bcacf451a046edf22e441017d9d88c6ab055e1905b8ad6c2d006b6320852bd5520a0ce687774eb7a231b
+  metadata.gz: 753a2bbf179895c6f71c156bbf5dae6d3740c8b8988a21f4ee9b46a776434d8733a945be63e23b305e9073d2fc306d4dde4e77ab9c3ee162a29ad03fa63224c2
+  data.tar.gz: 0eb9160172952bf5977b2877c4d7e31e0a0442e6bbb5d7c25105bc1110710e28592f74aee63a53937ea268f9cf040f9e80c8a6115cc0304523165ae2f107177f

data/lib/uncruft/deprecatable.rb

@@ -15,7 +15,10 @@ module Uncruft
 
         prepended_method.module_eval do
           define_method method do |*args, **kwargs, &block|
-            Uncruft.deprecator.warn(message)
+            Uncruft.deprecator.warn(
+              message,
+              caller_locations(1).reject { |loc| loc.path.start_with?(Uncruft::GEM_ROOT) },
+            )
             super(*args, **kwargs, &block)
           end
         end

data/lib/uncruft/version.rb

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

data/lib/uncruft/warning.rb

@@ -4,11 +4,29 @@ module Uncruft
   module Warning
     DEPRECATION_PATTERN = /(deprecation|deprecated)/i
 
+    # Version-pinned: which internal frames are allowed at clocs[0].
+    # Empty array = no internal frames expected. Missing key = unknown combo.
+    EXPECTED_INTERNAL_FRAMES = {
+      ["3.2", "7.2"] => [],
+      ["3.2", "8.0"] => [],
+      ["3.3", "7.2"] => [],
+      ["3.3", "8.0"] => [],
+      ["3.4", "7.2"] => [],
+      ["3.4", "8.0"] => ['prism/polyfill/warn.rb'],
+    }.freeze
+
+    def self.expected_internal_frames
+      ruby_minor = RUBY_VERSION.split('.')[0..1].join('.')
+      rails_minor = Rails::VERSION::STRING.split('.')[0..1].join('.')
+      EXPECTED_INTERNAL_FRAMES[[ruby_minor, rails_minor]]
+    end
+
     def warn(*args, **kwargs)
       str = args[0]
 
       if str =~ DEPRECATION_PATTERN # rubocop:disable Performance/RegexpMatch
-        message = strip_caller_info(str, caller_locations(1..1).first).strip
+        cloc = find_caller_location(caller_locations(1..5))
+        message = strip_caller_info(str, cloc).strip
         Uncruft.deprecator.warn(message)
       else
         super
@@ -17,6 +35,16 @@ module Uncruft
 
     private
 
+    def find_caller_location(clocs)
+      first = clocs.first
+      expected = Uncruft::Warning.expected_internal_frames
+      if first && expected&.any? { |pattern| first.path.include?(pattern) }
+        clocs[1] || first
+      else
+        first
+      end
+    end
+
     def strip_caller_info(str, cloc)
       str.sub(cloc.to_s, '') # try full caller information first
         .gsub(/#{cloc.path}(:#{cloc.lineno})?:?\s*/, '') # try path with optional line

data/lib/uncruft.rb

@@ -10,6 +10,8 @@ require 'uncruft/deprecatable'
 require 'uncruft/warning'
 
 module Uncruft
+  GEM_ROOT = "#{File.expand_path('..', __dir__)}/".freeze
+
   class << self
     # http://api.rubyonrails.org/classes/ActiveModel/Type/Boolean.html
     FALSE_VALUES = [false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uncruft
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nathan Griffith
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.9
 specification_version: 4
 summary: A library to assist with Rails upgrades
 test_files: []