warn needs to match Kernel's signature (#40)

Fixes #11
Betterment · Jan 22, 2025 · 2a01d9d · 2a01d9d
1 parent 3294090
commit 2a01d9d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uncruft (0.6.0)
+    uncruft (0.6.1)
       railties (>= 6.1.0)
 
 GEM

diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    uncruft (0.6.0)
+    uncruft (0.6.1)
       railties (>= 6.1.0)
 
 GEM

diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    uncruft (0.6.0)
+    uncruft (0.6.1)
       railties (>= 6.1.0)
 
 GEM

diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    uncruft (0.6.0)
+    uncruft (0.6.1)
       railties (>= 6.1.0)
 
 GEM

diff --git a/gemfiles/rails_7_2.gemfile.lock b/gemfiles/rails_7_2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    uncruft (0.6.0)
+    uncruft (0.6.1)
       railties (>= 6.1.0)
 
 GEM

diff --git a/gemfiles/rails_8_0.gemfile.lock b/gemfiles/rails_8_0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    uncruft (0.6.0)
+    uncruft (0.6.1)
       railties (>= 6.1.0)
 
 GEM

diff --git a/lib/uncruft/version.rb b/lib/uncruft/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uncruft
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end
diff --git a/lib/uncruft/warning.rb b/lib/uncruft/warning.rb
@@ -4,12 +4,12 @@ module Uncruft
   module Warning
     DEPRECATION_PATTERN = /(deprecation|deprecated)/i
 
-    def warn(str, *args, **kwargs)
+    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
         Uncruft.deprecator.warn(message)
-      elsif RUBY_VERSION < '2.7' && kwargs.empty?
-        super(str, *args)
       else
         super
       end

diff --git a/spec/uncruft/warning_spec.rb b/spec/uncruft/warning_spec.rb
@@ -9,13 +9,17 @@
 
   it "doesn't block generic warnings" do
     expect(Uncruft.deprecator).not_to receive(:warn)
+    warn
     warn('oh no, you should worry')
+    Kernel.warn
     Kernel.warn('oh no, you should worry')
     Warning.warn('oh no, you should worry')
   end
 
   it "accepts kwargs from Kernel.warn" do # rubocop:disable RSpec/NoExpectationExample
+    warn(uplevel: 1)
     warn('oh no, you should worry', uplevel: 1)
+    Kernel.warn(uplevel: 1)
     Kernel.warn('oh no, you should worry', uplevel: 1)
   end