Merge pull request #280 from lylo/gem-3.5.0-deprecation-warning

Fix deprecation warnings in 3.5.0
rails · Oct 10, 2023 · 6f2e748 · 6f2e748
2 parents 8d2230c + a5dd494
commit 6f2e748
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/tailwindcss/commands.rb b/lib/tailwindcss/commands.rb
@@ -3,6 +3,7 @@
 module Tailwindcss
   module Commands
     DEFAULT_DIR = File.expand_path(File.join(__dir__, "..", "..", "exe"))
+    GEM_NAME = "tailwindcss-rails"
 
     # raised when the host platform is not supported by upstream tailwindcss's binary releases
     class UnsupportedPlatformException < StandardError
@@ -34,15 +35,15 @@ def executable(exe_path: DEFAULT_DIR)
             MESSAGE
           end
         else
-          if Tailwindcss::Upstream::NATIVE_PLATFORMS.keys.none? { |p| Gem::Platform.match(Gem::Platform.new(p)) }
+          if Tailwindcss::Upstream::NATIVE_PLATFORMS.keys.none? { |p| Gem::Platform.match_gem?(Gem::Platform.new(p), GEM_NAME) }
             raise UnsupportedPlatformException, <<~MESSAGE
               tailwindcss-rails does not support the #{platform} platform
               Please install tailwindcss following instructions at https://tailwindcss.com/docs/installation
             MESSAGE
           end
 
           exe_file = Dir.glob(File.expand_path(File.join(exe_path, "*", "tailwindcss"))).find do |f|
-            Gem::Platform.match(Gem::Platform.new(File.basename(File.dirname(f))))
+            Gem::Platform.match_gem?(Gem::Platform.new(File.basename(File.dirname(f))), GEM_NAME)
           end
         end
 

diff --git a/test/lib/tailwindcss/commands_test.rb b/test/lib/tailwindcss/commands_test.rb
@@ -7,7 +7,7 @@ def mock_exe_directory(platform)
       FileUtils.mkdir(File.join(dir, platform))
       path = File.join(dir, platform, "tailwindcss")
       FileUtils.touch(path)
-      Gem::Platform.stub(:match, true) do
+      Gem::Platform.stub(:match_gem?, true) do
         yield(dir, path)
       end
     end
@@ -35,7 +35,7 @@ def mock_local_tailwindcss_install
   end
 
   test ".executable raises UnsupportedPlatformException when we're not on a supported platform" do
-    Gem::Platform.stub(:match, false) do # nothing is supported
+    Gem::Platform.stub(:match_gem?, false) do # nothing is supported
       assert_raises(Tailwindcss::Commands::UnsupportedPlatformException) do
         Tailwindcss::Commands.executable
       end
@@ -66,7 +66,7 @@ def mock_local_tailwindcss_install
   end
 
   test ".executable returns the executable in TAILWINDCSS_INSTALL_DIR when we're not on a supported platform" do
-    Gem::Platform.stub(:match, false) do # nothing is supported
+    Gem::Platform.stub(:match_gem?, false) do # nothing is supported
       mock_local_tailwindcss_install do |local_install_dir, expected|
         result = nil
         begin