mime-types 3.6.0 → 3.7.0

data/test/test_mime_type.rb

@@ -175,11 +175,6 @@ describe MIME::Type do
       refute_equal text_plain, "text/html"
       assert_operator text_plain, :>, "text/html"
     end
-
-    it "correctly compares against nil" do
-      refute_equal text_html, nil
-      assert_operator text_plain, :<, nil
-    end
   end
 
   describe "#ascii?" do
@@ -326,41 +321,56 @@ describe MIME::Type do
   end
 
   describe "#priority_compare" do
+    def priority(type)
+      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)
-      assert_equal(-1, left.priority_compare(right))
+      assert_equal(-1, left.priority_compare(right), "#{priority(left)} is not less than #{priority(right)}")
     end
 
     def assert_priority_same(left, right)
-      assert_equal 0, left.priority_compare(right)
+      assert_equal 0, left.priority_compare(right), "#{priority(left)} is not equal to #{priority(right)}"
     end
 
     def assert_priority_more(left, right)
-      assert_equal 1, left.priority_compare(right)
+      assert_equal 1, left.priority_compare(right), "#{priority(left)} is not more than #{priority(right)}"
     end
 
     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") }
     let(:text_1p) { mime_type("content-type" => "text/1") }
     let(:text_2) { mime_type("content-type" => "text/2") }
 
-    it "sorts (1) based on the simplified type" do
+    it "sorts based on the simplified type when the sort priorities are the same" do
       assert_priority text_1, text_1p, text_2
     end
 
-    it "sorts (2) based on extensions" do
-      text_1.extensions = ["foo", "bar"]
-      text_2.extensions = ["foo"]
+    it "sorts obsolete types higher than non-obsolete types" do
+      text_1.obsolete = text_1p.obsolete = false
+      text_1b = mime_type(text_1) { |t| t.obsolete = true }
+
+      assert_priority_less text_1, text_1b
 
-      assert_priority_same text_1, text_2
+      assert_priority text_1, text_1p, text_1b
+    end
 
-      text_2.registered = true
+    it "sorts provisional types higher than non-provisional types" do
+      text_1.provisional = text_1p.provisional = false
+      text_1b = mime_type(text_1) { |t| t.provisional = true }
 
-      assert_priority_more text_1, text_2
+      assert_priority text_1, text_1p, text_1b
     end
 
     it "sorts (3) based on the registration state" do
@@ -377,23 +387,11 @@ describe MIME::Type do
       assert_priority text_1, text_1p, text_1b
     end
 
-    it "sorts (5) based on obsolete status" do
-      text_1.obsolete = text_1p.obsolete = false
-      text_1b = mime_type(text_1) { |t| t.obsolete = true }
-
-      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"
+    it "sorts based on extensions (more extensions sort lower)" do
+      text_1.extensions = ["foo", "bar"]
+      text_2.extensions = ["foo"]
 
-      assert_priority text_1, text_1p, text_1b
+      assert_priority_less text_1, text_2
     end
   end
 
@@ -502,10 +500,10 @@ describe MIME::Type do
 
   describe "#to_json" do
     let(:expected_1) {
-      '{"content-type":"a/b","encoding":"base64","registered":false}'
+      '{"content-type":"a/b","encoding":"base64","registered":false,"sort-priority":48}'
     }
     let(:expected_2) {
-      '{"content-type":"a/b","encoding":"base64","registered":true,"provisional":true}'
+      '{"content-type":"a/b","encoding":"base64","registered":true,"provisional":true,"sort-priority":80}'
     }
 
     it "converts to JSON when requested" do

data/test/test_mime_types.rb

@@ -12,7 +12,8 @@ describe MIME::Types do
         MIME::Type.new("content-type" => "application/x-wordperfect6.1"),
         MIME::Type.new("content-type" => "application/x-www-form-urlencoded", "registered" => true),
         MIME::Type.new("content-type" => "application/x-gzip", "extensions" => %w[gz]),
-        MIME::Type.new("content-type" => "application/gzip", "extensions" => "gz", "registered" => true)
+        MIME::Type.new("content-type" => "application/gzip", "extensions" => "gz", "registered" => true),
+        *MIME::Types.type_for("foo.webm")
       )
     }
   end
@@ -33,8 +34,8 @@ describe MIME::Types do
     end
 
     it "is countable with an enumerator" do
-      assert_equal 6, mime_types.each.count
-      assert_equal 6, mime_types.lazy.count
+      assert_equal 8, mime_types.each.count
+      assert_equal 8, mime_types.lazy.count
     end
   end
 
@@ -139,7 +140,7 @@ describe MIME::Types do
     end
 
     it "finds multiple extensions" do
-      assert_equal %w[image/jpeg text/plain],
+      assert_equal %w[text/plain image/jpeg],
         mime_types.type_for(%w[foo.txt foo.jpeg])
     end
 
@@ -158,11 +159,15 @@ describe MIME::Types do
     it "handles newline characters correctly" do
       assert_includes mime_types.type_for("test.pdf\n.txt"), "text/plain"
     end
+
+    it "returns a stable order for types with equal priority" do
+      assert_equal %w[text/x-vcalendar text/x-vcard], MIME::Types[/text\/x-vca/]
+    end
   end
 
   describe "#count" do
     it "can count the number of types inside" do
-      assert_equal 6, mime_types.count
+      assert_equal 8, mime_types.count
     end
   end
 end

data/test/test_mime_types_class.rb

@@ -47,7 +47,7 @@ describe MIME::Types, "registry" do
       }
       # This is this way because of a new type ending with gzip that only
       # appears in some data files.
-      assert_equal %w[application/gzip application/x-gzip multipart/x-gzip], types
+      assert_equal %w[application/gzip multipart/x-gzip application/x-gzip], types
       assert_equal 3, types.size
     end
 
@@ -86,9 +86,11 @@ describe MIME::Types, "registry" do
       assert_equal %w[image/jpeg], MIME::Types.of(["foo.jpeg", "bar.jpeg"])
     end
 
-    it "finds multiple extensions" do
-      assert_equal %w[image/jpeg text/plain],
-        MIME::Types.type_for(%w[foo.txt foo.jpeg])
+    it "finds multiple extensions ordered by the filename list" do
+      result = MIME::Types.type_for(%w[foo.txt foo.jpeg])
+
+      # assert_equal %w[text/plain image/jpeg], MIME::Types.type_for(%w[foo.txt foo.jpeg])
+      assert_equal %w[text/plain image/jpeg], result
     end
 
     it "does not find unknown extensions" do
@@ -105,6 +107,10 @@ describe MIME::Types, "registry" do
       assert_includes MIME::Types.type_for("test.pdf\n.txt"), "text/plain"
       assert_includes MIME::Types.type_for("test.txt\n.pdf"), "application/pdf"
     end
+
+    it "returns a stable order for types with equal priority" do
+      assert_equal %w[text/x-vcalendar text/x-vcard], MIME::Types[/text\/x-vca/]
+    end
   end
 
   describe ".count" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Austin Ziegler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types-data
@@ -16,14 +15,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2015'
+        version: '3.2025'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2025.0507
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2015'
+        version: '3.2025'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2025.0507
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -38,96 +43,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.25'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.25'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-gemspec2
+  name: hoe-halostatue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-git2
+  name: hoe-rubygems
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-rubygems
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +150,7 @@ dependencies:
         version: '10.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,55 +160,35 @@ dependencies:
         version: '10.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.0'
 description: |-
   The mime-types library provides a library and registry for information about
   MIME content type definitions. It can be used to determine defined filename
@@ -247,30 +198,32 @@ description: |-
   Version 3.0 is a major release that requires Ruby 2.0 compatibility and removes
   deprecated functions. The columnar registry format introduced in 2.6 has been
   made the primary format; the registry data has been extracted from this library
-  and put into {mime-types-data}[https://github.com/mime-types/mime-types-data].
-  Additionally, mime-types is now licensed exclusively under the MIT licence and
-  there is a code of conduct in effect. There are a number of other smaller
-  changes described in the History file.
+  and put into [mime-types-data][data]. Additionally, mime-types is now licensed
+  exclusively under the MIT licence and there is a code of conduct in effect.
+  There are a number of other smaller changes described in the History file.
 email:
 - halostatue@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- Code-of-Conduct.md
-- Contributing.md
-- History.md
-- Licence.md
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- CONTRIBUTORS.md
+- LICENCE.md
 - Manifest.txt
-- README.rdoc
+- README.md
+- SECURITY.md
 files:
-- ".standard.yml"
-- Code-of-Conduct.md
-- Contributing.md
-- History.md
-- Licence.md
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- CONTRIBUTORS.md
+- LICENCE.md
 - Manifest.txt
-- README.rdoc
+- README.md
 - Rakefile
+- SECURITY.md
 - lib/mime-types.rb
 - lib/mime/type.rb
 - lib/mime/type/columnar.rb
@@ -284,6 +237,7 @@ files:
 - lib/mime/types/loader.rb
 - lib/mime/types/logger.rb
 - lib/mime/types/registry.rb
+- lib/mime/types/version.rb
 - test/bad-fixtures/malformed
 - test/fixture/json.json
 - test/fixture/old-data
@@ -300,14 +254,13 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/mime-types/ruby-mime-types/
-  source_code_uri: https://github.com/mime-types/ruby-mime-types/
   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
+  source_code_uri: https://github.com/mime-types/ruby-mime-types/
+  changelog_uri: https://github.com/mime-types/ruby-mime-types/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -321,8 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.6
 specification_version: 4
 summary: The mime-types library provides a library and registry for information about
   MIME content type definitions

data/.standard.yml

@@ -1,4 +0,0 @@
-parallel: true
-ruby_version: 2.3
-ignore:
-  - 'mime-types.gemspec'

data/Contributing.md

@@ -1,133 +0,0 @@
-# Contributing
-
-I value any contribution to mime-types you can provide: a bug report, a feature
-request, or code contributions.
-
-There are a few guidelines for contributing to mime-types:
-
-- Code changes _will_ _not_ be accepted without tests. The test suite is
-  written with [minitest][].
-- Match my coding style.
-- Use a thoughtfully-named topic branch that contains your change. Rebase your
-  commits into logical chunks as necessary.
-- Use [quality commit messages][].
-- Do not change the version number; when your patch is accepted and a release
-  is made, the version will be updated at that point.
-- Submit a GitHub pull request with your changes.
-- New or changed behaviours require new or updated documentation.
-
-## Adding or Modifying MIME Types
-
-The mime-types registry is no longer contained in mime-types, but in
-[mime-types-data][]. Please see that project for contributions there.
-
-### Test Dependencies
-
-mime-types uses Ryan Davis’s [Hoe][] to manage the release process, and it adds
-a number of rake tasks. You will mostly be interested in `rake`, which runs the
-tests the same way that `rake test` will do.
-
-To assist with the installation of the development dependencies for
-mime-types, I have provided the simplest possible Gemfile pointing to the
-(generated) `mime-types.gemspec` file. This will permit you to do `bundle install` to get the development dependencies. If you already have `hoe`
-installed, you can accomplish the same thing with `rake newb`.
-
-This task will install any missing dependencies, run the tests/specs, and
-generate the RDoc.
-
-You can run tests with code coverage analysis by running `rake test:coverage`.
-
-## Benchmarks
-
-mime-types offers several benchmark tasks to measure different measures of
-performance.
-
-There is a repeated load test, measuring how long it takes to start and load
-mime-types with its full registry. By default, it runs fifty loops and uses the
-built-in benchmark library:
-
-- `rake benchmark:load`
-
-There are two allocation tracing benchmarks (for normal and columnar loads).
-These can only be run on Ruby 2.1 or better and requires the
-[allocation\_tracer][] gem (not installed by default).
-
-- `rake benchmark:allocations`
-- `rake benchmark:allocations:columnar`
-
-There are two loaded object count benchmarks (for normal and columnar loads).
-These use `ObjectSpace.count_objects`.
-
-- `rake benchmark:objects`
-- `rake benchmark:objects:columnar`
-
-## Workflow
-
-Here's the most direct way to get your work merged into the project:
-
-- Fork the project.
-- Clone down your fork (`git clone git://github.com/<username>/ruby-mime-types.git`).
-- Create a topic branch to contain your change (`git checkout -b my_awesome_feature`).
-- Hack away, add tests. Not necessarily in that order.
-- Make sure everything still passes by running `rake`.
-- If necessary, rebase your commits into logical chunks, without errors.
-- Push the branch up (`git push origin my_awesome_feature`).
-- Create a pull request against mime-types/ruby-mime-types and describe what
-  your change does and the why you think it should be merged.
-
-## Contributors
-
-- Austin Ziegler created mime-types.
-
-Thanks to everyone else who has contributed to mime-types over the years:
-
-- Aaron Patterson
-- Aggelos Avgerinos
-- Al Snow
-- Alex Vondrak
-- Andre Pankratz
-- Andy Brody
-- Arnaud Meuret
-- Brandon Galbraith
-- Burke Libbey
-- Chris Gat
-- David Genord
-- Dillon Welch
-- Edward Betts
-- Eric Marden
-- Garret Alfert
-- Godfrey Chan
-- Greg Brockman
-- Hans de Graaff
-- Henrik Hodne
-- Igor Victor
-- Janko Marohnić
-- Jean Boussier
-- Jeremy Evans
-- Juanito Fatas
-- Jun Aruga
-- Keerthi Siva
-- Ken Ip
-- Kevin Menard
-- Koichi ITO
-- Łukasz Śliwa
-- Martin d'Allens
-- Masato Nakamura
-- Mauricio Linhares
-- Nicholas La Roux
-- Nicolas Leger
-- nycvotes-dev
-- Olle Jonsson
-- Postmodern
-- Richard Hirner
-- Richard Hurt
-- Richard Schneeman
-- Robb Shecter
-- Tibor Szolár
-- Todd Carrico
-
-[minitest]: https://github.com/seattlerb/minitest
-[quality commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[mime-types-data]: https://github.com/mime-types/mime-types-data
-[hoe]: https://github.com/seattlerb/hoe
-[allocation\_tracer]: https://github.com/ko1/allocation_tracer