Fix last tests

Author: halostatue

CHANGELOG.md

@@ -1,29 +1,28 @@
 # Changelog
 
-## NEXT / YYYY-MM-DD
+## 4.0.0 / YYYY-MM-DD
 
-- 1 deprecation:
+- The minimum supported Ruby version for mime-types 4 is Ruby 3.2. All backport
+  support for older versions of Ruby have been removed.
 
-  - Deprecated `MIME::Type#priority_compare`. In a future release, this will be
-    will be renamed to `MIME::Type#<=>`. This method is used in tight loops, so
-    there is no warning message for either `MIME::Type#priority_compare` or
-    `MIME::Type#<=>`.
+## 3.7.0 / YYYY-MM-DD
 
-- 1 enhancement:
+- Deprecated `MIME::Type#priority_compare`. In a future release, this will be
+  will be renamed to `MIME::Type#<=>`. This method is used in tight loops, so
+  there is no warning message for either `MIME::Type#priority_compare` or
+  `MIME::Type#<=>`.
 
-  - Improved the performance of sorting by eliminating the complex comparison
-    flow from `MIME::Type#priority_compare`. The old version shows under 600
-    i/s, and the new version shows over 900 i/s. In sorting the full set of MIME
-    data, there are three differences between the old and new versions; after
-    comparison, these differences are considered acceptable.
+- Improved the performance of sorting by eliminating the complex comparison flow
+  from `MIME::Type#priority_compare`. The old version shows under 600 i/s, and
+  the new version shows over 900 i/s. In sorting the full set of MIME data,
+  there are three differences between the old and new versions; after
+  comparison, these differences are considered acceptable.
 
-- 1 bug fix:
-
-  - Simplified the default compare implementation (`MIME::Type#<=>`) to use the
-    new `MIME::Type#priority_compare` operation and simplify the fallback to
-    `String` comparison. This _may_ result in exceptions where there had been
-    none, as explicit support for several special values (which should have
-    caused errors in any case) have been removed.
+- Simplified the default compare implementation (`MIME::Type#<=>`) to use the
+  new `MIME::Type#priority_compare` operation and simplify the fallback to
+  `String` comparison. This _may_ result in exceptions where there had been
+  none, as explicit support for several special values (which should have caused
+  errors in any case) have been removed.
 
 ## 3.6.2 / 2025-03-25
 

Rakefile

@@ -2,6 +2,7 @@ require "rubygems"
 require "hoe"
 require "rake/clean"
 require "minitest"
+require "minitest/test_task"
 
 Hoe.plugin :halostatue
 Hoe.plugin :rubygems
@@ -10,6 +11,7 @@ Hoe.plugins.delete :debug
 Hoe.plugins.delete :newb
 Hoe.plugins.delete :publish
 Hoe.plugins.delete :signing
+Hoe.plugins.delete :test
 
 spec = Hoe.spec "mime-types" do
   developer("Austin Ziegler", "[email protected]")
@@ -65,6 +67,8 @@ Minitest::TestTask.create :coverage do |t|
   RUBY
 end
 
+task default: :test
+
 namespace :benchmark do
   task :support do
     %w[lib support].each { |path|

mime-types.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.version = "3.6.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.metadata = { "bug_tracker_uri" => "https://github.com/mime-types/ruby-mime-types/issues", "changelog_uri" => "https://github.com/mime-types/ruby-mime-types/blob/master/History.md", "homepage_uri" => "https://github.com/mime-types/ruby-mime-types/", "rubygems_mfa_required" => "true", "source_code_uri" => "https://github.com/mime-types/ruby-mime-types/" } if s.respond_to? :metadata=
+  s.metadata = { "bug_tracker_uri" => "https://github.com/mime-types/ruby-mime-types/issues", "changelog_uri" => "https://github.com/mime-types/ruby-mime-types/blob/main/CHANGELOG.md", "homepage_uri" => "https://github.com/mime-types/ruby-mime-types/", "rubygems_mfa_required" => "true", "source_code_uri" => "https://github.com/mime-types/ruby-mime-types/" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Austin Ziegler".freeze]
-  s.date = "2025-03-24"
+  s.date = "2025-04-04"
   s.description = "The mime-types library provides a library and registry for information about\nMIME content type definitions. It can be used to determine defined filename\nextensions for MIME types, or to use filename extensions to look up the likely\nMIME type definitions.\n\nVersion 3.0 is a major release that requires Ruby 2.0 compatibility and removes\ndeprecated functions. The columnar registry format introduced in 2.6 has been\nmade the primary format; the registry data has been extracted from this library\nand put into {mime-types-data}[https://github.com/mime-types/mime-types-data].\nAdditionally, mime-types is now licensed exclusively under the MIT licence and\nthere is a code of conduct in effect. There are a number of other smaller\nchanges described in the History file.".freeze
   s.email = ["[email protected]".freeze]
   s.extra_rdoc_files = ["CHANGELOG.md".freeze, "CODE_OF_CONDUCT.md".freeze, "CONTRIBUTING.md".freeze, "CONTRIBUTORS.md".freeze, "LICENCE.md".freeze, "Manifest.txt".freeze, "README.md".freeze, "SECURITY.md".freeze]
@@ -18,20 +18,21 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "3.6.2".freeze
+  s.rubygems_version = "3.6.6".freeze
   s.summary = "The mime-types library provides a library and registry for information about MIME content type definitions".freeze
 
   s.specification_version = 4
 
   s.add_runtime_dependency(%q<mime-types-data>.freeze, ["~> 3.2015".freeze])
   s.add_runtime_dependency(%q<logger>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<minitest>.freeze, ["~> 5.25".freeze])
   s.add_development_dependency(%q<hoe>.freeze, ["~> 4.0".freeze])
   s.add_development_dependency(%q<hoe-halostatue>.freeze, ["~> 2.0".freeze])
   s.add_development_dependency(%q<hoe-rubygems>.freeze, ["~> 1.0".freeze])
+  s.add_development_dependency(%q<minitest>.freeze, ["~> 5.0".freeze])
   s.add_development_dependency(%q<minitest-autotest>.freeze, ["~> 1.0".freeze])
   s.add_development_dependency(%q<minitest-focus>.freeze, ["~> 1.0".freeze])
   s.add_development_dependency(%q<minitest-hooks>.freeze, ["~> 1.4".freeze])
-  s.add_development_dependency(%q<rake>.freeze, [">= 10.0".freeze, "< 14.0".freeze])
+  s.add_development_dependency(%q<rake>.freeze, [">= 10.0".freeze, "< 14".freeze])
+  s.add_development_dependency(%q<rdoc>.freeze, [">= 0.0".freeze])
   s.add_development_dependency(%q<standard>.freeze, ["~> 1.0".freeze])
 end

test/minitest_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+$debug = false
+
 gem "minitest"
 require "minitest/focus"
 require "minitest/hooks"

test/test_mime_type.rb

@@ -322,7 +322,13 @@ def mime_type(content_type)
 
   describe "#priority_compare" do
     def priority(type)
-      "#{type} (#{("%08b" % type.__sort_priority).chars.join(" ")})"
+      priority = "OpRceXtN"
+        .chars
+        .zip(("%08b" % type.__sort_priority).chars)
+        .map { |e| e.join(":") }
+        .join(" ")
+
+      "#{type} (#{priority} / #{type.__sort_priority})"
     end
 
     def assert_priority_less(left, right)
@@ -340,7 +346,7 @@ def assert_priority_more(left, right)
     def assert_priority(left, middle, right)
       assert_priority_less left, right
       assert_priority_same left, middle
-      assert_priority_more right, left
+      assert_priority_more right, middle
     end
 
     let(:text_1) { mime_type("content-type" => "text/1") }
@@ -361,8 +367,8 @@ def assert_priority(left, middle, right)
     end
 
     it "sorts provisional types higher than non-provisional types" do
-      text_1.provisional = text_1p.provisional = true
-      text_1b = mime_type(text_1) { |t| t.provisional = false }
+      text_1.provisional = text_1p.provisional = false
+      text_1b = mime_type(text_1) { |t| t.provisional = true }
 
       assert_priority text_1, text_1p, text_1b
     end
@@ -381,18 +387,6 @@ def assert_priority(left, middle, right)
       assert_priority text_1, text_1p, text_1b
     end
 
-    it "sorts (5) based on the use-instead value" do
-      text_1.obsolete = text_1p.obsolete = true
-      text_1.use_instead = text_1p.use_instead = "abc/xyz"
-      text_1b = mime_type(text_1) { |t| t.use_instead = nil }
-
-      assert_priority text_1, text_1p, text_1b
-
-      text_1b.use_instead = "abc/zzz"
-
-      assert_priority text_1, text_1p, text_1b
-    end
-
     it "sorts based on extensions (more extensions sort lower)" do
       text_1.extensions = ["foo", "bar"]
       text_2.extensions = ["foo"]