mime-types 3.3.1 → 3.7.0

data/Rakefile

@@ -1,109 +1,102 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'hoe'
-require 'rake/clean'
-
-Hoe.plugin :doofus
-Hoe.plugin :gemspec2
-Hoe.plugin :git
-Hoe.plugin :minitest
-Hoe.plugin :travis
-Hoe.plugin :email unless ENV['CI'] or ENV['TRAVIS']
-
-spec = Hoe.spec 'mime-types' do
-  developer('Austin Ziegler', 'halostatue@gmail.com')
-  self.need_tar = true
-
-  require_ruby_version '>= 2.0'
-
-  self.history_file = 'History.md'
-  self.readme_file = 'README.rdoc'
-
-  license 'MIT'
-
-  extra_deps << ['mime-types-data', '~> 3.2015']
-
-  extra_dev_deps << ['hoe-doofus', '~> 1.0']
-  extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
-  extra_dev_deps << ['hoe-git', '~> 1.6']
-  extra_dev_deps << ['hoe-rubygems', '~> 1.0']
-  extra_dev_deps << ['hoe-travis', '~> 1.2']
-  extra_dev_deps << ['minitest', '~> 5.4']
-  extra_dev_deps << ['minitest-autotest', '~> 1.0']
-  extra_dev_deps << ['minitest-focus', '~> 1.0']
-  extra_dev_deps << ['minitest-bonus-assertions', '~> 3.0']
-  extra_dev_deps << ['minitest-hooks', '~> 1.4']
-  extra_dev_deps << ['rake', '>= 10.0', '< 13.0']
-  extra_dev_deps << ['fivemat', '~> 1.3']
-  extra_dev_deps << ['minitest-rg', '~> 5.2']
-
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0')
-    extra_dev_deps << ['simplecov', '~> 0.7']
-    # if ENV['CI'] or ENV['TRAVIS']
-    #   extra_dev_deps << ['coveralls', '~> 0.8']
-    # end
-  end
+require "rubygems"
+require "hoe"
+require "rake/clean"
+require "minitest"
+require "minitest/test_task"
+
+Hoe.plugin :halostatue
+Hoe.plugin :rubygems
+
+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", "halostatue@gmail.com")
+
+  self.trusted_release = ENV["rubygems_release_gem"] == "true"
+
+  require_ruby_version ">= 2.0"
+
+  license "MIT"
+
+  spec_extras[:metadata] = ->(val) {
+    val.merge!({"rubygems_mfa_required" => "true"})
+  }
+
+  extra_deps << ["mime-types-data", "~> 3.2025", ">= 3.2025.0507"]
+  extra_deps << ["logger", ">= 0"]
+
+  extra_dev_deps << ["hoe", "~> 4.0"]
+  extra_dev_deps << ["hoe-halostatue", "~> 2.0"]
+  extra_dev_deps << ["hoe-rubygems", "~> 1.0"]
+  extra_dev_deps << ["minitest", "~> 5.0"]
+  extra_dev_deps << ["minitest-autotest", "~> 1.0"]
+  extra_dev_deps << ["minitest-focus", "~> 1.0"]
+  extra_dev_deps << ["minitest-hooks", "~> 1.4"]
+  extra_dev_deps << ["rake", ">= 10.0", "< 14"]
+  extra_dev_deps << ["rdoc", ">= 0.0"]
+  extra_dev_deps << ["standard", "~> 1.0"]
+end
+
+Minitest::TestTask.create :test
+Minitest::TestTask.create :coverage do |t|
+  formatters = <<-RUBY.split($/).join(" ")
+    SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::LcovFormatter,
+      SimpleCov::Formatter::SimpleFormatter
+    ])
+  RUBY
+  t.test_prelude = <<-RUBY.split($/).join("; ")
+  require "simplecov"
+  require "simplecov-lcov"
+
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    config.report_with_single_file = true
+    config.lcov_file_name = "lcov.info"
+  end
+
+  SimpleCov.start "test_frameworks" do
+    enable_coverage :branch
+    primary_coverage :branch
+    formatter #{formatters}
+  end
+  RUBY
 end
 
+task default: :test
+
 namespace :benchmark do
   task :support do
-    %w(lib support).each { |path|
+    %w[lib support].each { |path|
       $LOAD_PATH.unshift(File.join(Rake.application.original_dir, path))
     }
   end
 
-  desc 'Benchmark Load Times'
-  task :load, [:repeats] => 'benchmark:support' do |_, args|
-    require 'benchmarks/load'
+  desc "Benchmark Load Times"
+  task :load, [:repeats] => "benchmark:support" do |_, args|
+    require "benchmarks/load"
     Benchmarks::Load.report(
-      File.join(Rake.application.original_dir, 'lib'),
+      File.join(Rake.application.original_dir, "lib"),
       args.repeats
     )
   end
 
-  desc 'Allocation counts'
-  task :allocations, [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
-    require 'benchmarks/load_allocations'
-    Benchmarks::LoadAllocations.report(
-      top_x: args.top_x,
-      mime_types_only: args.mime_types_only
-    )
-  end
-
-  desc 'Columnar allocation counts'
-  task 'allocations:columnar', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
-    require 'benchmarks/load_allocations'
-    Benchmarks::LoadAllocations.report(
-      columnar: true,
-      top_x: args.top_x,
-      mime_types_only: args.mime_types_only
-    )
-  end
-
-  desc 'Columnar allocation counts (full load)'
-  task 'allocations:columnar:full', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
-    require 'benchmarks/load_allocations'
-    Benchmarks::LoadAllocations.report(
-      columnar: true,
-      top_x: args.top_x,
-      mime_types_only: args.mime_types_only,
-      full: true
-    )
-  end
-
-  desc 'Memory profiler'
-  task :memory, [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
-    require 'benchmarks/memory_profiler'
+  desc "Memory profiler"
+  task :memory, [:top_x, :mime_types_only] => "benchmark:support" do |_, args|
+    require "benchmarks/profile_memory"
     Benchmarks::ProfileMemory.report(
       mime_types_only: args.mime_types_only,
       top_x: args.top_x
     )
   end
 
-  desc 'Columnar memory profiler'
-  task 'memory:columnar', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
-    require 'benchmarks/memory_profiler'
+  desc "Columnar memory profiler"
+  task "memory:columnar", [:top_x, :mime_types_only] => "benchmark:support" do |_, args|
+    require "benchmarks/profile_memory"
     Benchmarks::ProfileMemory.report(
       columnar: true,
       mime_types_only: args.mime_types_only,
@@ -111,9 +104,9 @@ namespace :benchmark do
     )
   end
 
-  desc 'Columnar allocation counts (full load)'
-  task 'memory:columnar:full', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
-    require 'benchmarks/memory_profiler'
+  desc "Columnar allocation counts (full load)"
+  task "memory:columnar:full", [:top_x, :mime_types_only] => "benchmark:support" do |_, args|
+    require "benchmarks/profile_memory"
     Benchmarks::ProfileMemory.report(
       columnar: true,
       full: true,
@@ -122,111 +115,57 @@ namespace :benchmark do
     )
   end
 
-  desc 'Object counts'
-  task objects: 'benchmark:support' do
-    require 'benchmarks/object_counts'
+  desc "Object counts"
+  task objects: "benchmark:support" do
+    require "benchmarks/object_counts"
     Benchmarks::ObjectCounts.report
   end
 
-  desc 'Columnar object counts'
-  task 'objects:columnar' => 'benchmark:support' do
-    require 'benchmarks/object_counts'
+  desc "Columnar object counts"
+  task "objects:columnar" => "benchmark:support" do
+    require "benchmarks/object_counts"
     Benchmarks::ObjectCounts.report(columnar: true)
   end
 
-  desc 'Columnar object counts (full load)'
-  task 'objects:columnar:full' => 'benchmark:support' do
-    require 'benchmarks/object_counts'
+  desc "Columnar object counts (full load)"
+  task "objects:columnar:full" => "benchmark:support" do
+    require "benchmarks/object_counts"
     Benchmarks::ObjectCounts.report(columnar: true, full: true)
   end
 end
 
 namespace :profile do
-  directory 'tmp/profile'
-
-  CLEAN.add 'tmp'
-
-  def ruby_prof(script)
-    require 'pathname'
-    output = Pathname('tmp/profile').join(script)
-    output.mkpath
-    script = Pathname('support/profile').join("#{script}.rb")
-
-    args = [
-      '-W0',
-      '-Ilib',
-      '-S', 'ruby-prof',
-      '-R', 'mime/types',
-      '-s', 'self',
-      '-p', 'multi',
-      '-f', output.to_s,
-      script.to_s
-    ]
-    ruby args.join(' ')
-  end
-
-  task full: 'tmp/profile' do
-    ruby_prof 'full'
+  task full: "benchmark:support" do
+    require "profile"
+    profile_full
   end
 
-  task columnar: :support do
-    ruby_prof 'columnar'
+  task columnar: "benchmark:support" do
+    require "profile"
+    profile_columnar
   end
 
-  task 'columnar:full' => :support do
-    ruby_prof 'columnar_full'
-  end
-end
-
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0')
-  namespace :test do
-    # Coveralls needs to be disabled for now because it transitively depends on
-    # an earlier version of mime-types.
-    # if ENV['CI'] or ENV['TRAVIS']
-    #   task :coveralls do
-    #     spec.test_prelude = [
-    #       'require "psych"',
-    #       'require "simplecov"',
-    #       'require "coveralls"',
-    #       'SimpleCov.formatter = Coveralls::SimpleCov::Formatter',
-    #       'SimpleCov.start("test_frameworks") { command_name "Minitest" }',
-    #       'gem "minitest"'
-    #     ].join('; ')
-    #     Rake::Task['test'].execute
-    #   end
-
-    #   Rake::Task['travis'].prerequisites.replace(%w(test:coveralls))
-    # end
-
-    desc 'Run test coverage'
-    task :coverage do
-      spec.test_prelude = [
-        'require "simplecov"',
-        'SimpleCov.start("test_frameworks") { command_name "Minitest" }',
-        'gem "minitest"'
-      ].join('; ')
-      Rake::Task['test'].execute
-    end
+  task "columnar:full" => "benchmark:support" do
+    require "profile"
+    profile_columnar_full
   end
 end
 
 namespace :convert do
   namespace :docs do
     task :setup do
-      gem 'rdoc'
-      require 'rdoc/rdoc'
+      gem "rdoc"
+      require "rdoc/rdoc"
       @doc_converter ||= RDoc::Markup::ToMarkdown.new
     end
 
-    FileList['*.rdoc'].each do |name|
+    FileList["*.rdoc"].each do |name|
       rdoc = name
-      mark = "#{File.basename(name, '.rdoc')}.md"
+      mark = "#{File.basename(name, ".rdoc")}.md"
 
       file mark => [rdoc, :setup] do |t|
         puts "#{rdoc} => #{mark}"
-        File.open(t.name, 'wb') { |target|
-          target.write @doc_converter.convert(IO.read(t.prerequisites.first))
-        }
+        File.binwrite(t.name, @doc_converter.convert(IO.read(t.prerequisites.first)))
       end
 
       CLEAN.add mark
@@ -235,50 +174,28 @@ namespace :convert do
     end
   end
 
-  desc 'Convert documentation from RDoc to Markdown'
-  task docs: 'convert:docs:run'
+  desc "Convert documentation from RDoc to Markdown"
+  task docs: "convert:docs:run"
 end
 
-task 'deps:top', [:number] do |_, args|
-  require 'net/http'
-  require 'json'
-
-  def rubygems_get(gem_name: '', endpoint: '')
-    path = File.join('/api/v1/gems/', gem_name, endpoint).chomp('/') + '.json'
-    Net::HTTP.start('rubygems.org', use_ssl: true) do |http|
-      JSON.parse(http.get(path).body)
-    end
-  end
-
-  results = rubygems_get(
-    gem_name: 'mime-types',
-    endpoint: 'reverse_dependencies'
-  )
-
-  weighted_results = {}
-  results.each do |name|
-    begin
-      weighted_results[name] = rubygems_get(gem_name: name)['downloads']
-    rescue => e
-      puts "#{name} #{e.message}"
-    end
-  end
+task :version do
+  require "mime/types/version"
+  puts MIME::Types::VERSION
+end
 
-  weighted_results.sort { |(_k1, v1), (_k2, v2)|
-    v2 <=> v1
-  }.first(args.number || 50).each_with_index do |(k, v), i|
-    puts "#{i}) #{k}: #{v}"
+namespace :deps do
+  task :top, [:number] => "benchmark:support" do |_, args|
+    require "deps"
+    Deps.run(args)
   end
 end
 
 task :console do
-  arguments = %w(pry)
+  arguments = %w[irb]
   arguments.push(*spec.spec.require_paths.map { |dir| "-I#{dir}" })
-  arguments.push("-r#{spec.spec.name.gsub('-', File::SEPARATOR)}")
+  arguments.push("-r#{spec.spec.name.gsub("-", File::SEPARATOR)}")
   unless system(*arguments)
     error "Command failed: #{show_command}"
     abort
   end
 end
-
-# vim: syntax=ruby

data/SECURITY.md

@@ -0,0 +1,7 @@
+# mime-types Security
+
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security). Tidelift will
+coordinate the fix and disclosure.

data/lib/mime/type/columnar.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'mime/type'
+require "mime/type"
 
 # A version of MIME::Type that works hand-in-hand with a MIME::Types::Columnar
 # container to load data by columns.
@@ -15,8 +15,10 @@ require 'mime/type'
 class MIME::Type::Columnar < MIME::Type
   def initialize(container, content_type, extensions) # :nodoc:
     @container = container
+    @__priority_penalty = nil
     self.content_type = content_type
-    self.extensions = extensions
+    @extensions = Set[*Array(extensions).flatten.compact].freeze
+    clear_sort_priority
   end
 
   def self.column(*methods, file: nil) # :nodoc:
@@ -35,8 +37,8 @@ class MIME::Type::Columnar < MIME::Type
   column :encoding, :encoding=
   column :docs, :docs=
   column :preferred_extension, :preferred_extension=
-  column :obsolete, :obsolete=, :obsolete?, :registered, :registered=,
-         :registered?, :signature, :signature=, :signature?, file: 'flags'
+  column :obsolete, :obsolete=, :obsolete?, :registered, :registered=, :registered?, :signature, :signature=,
+    :signature?, :provisional, :provisional=, :provisional?, file: "flags"
   column :xrefs, :xrefs=, :xref_urls
   column :use_instead, :use_instead=
 
@@ -51,6 +53,17 @@ class MIME::Type::Columnar < MIME::Type
     super
   end
 
+  def update_sort_priority
+    if @container.__fully_loaded?
+      super
+    else
+      obsolete = (@__sort_priority & (1 << 7)) != 0
+      registered = (@__sort_priority & (1 << 5)) == 0
+
+      @__priority_penalty = (obsolete ? 3 : 0) + (registered ? 0 : 2)
+    end
+  end
+
   class << self
     undef column
   end