mime-types 2.5 → 2.6

data/support/convert.rb

@@ -1,8 +1,16 @@
 # -*- ruby encoding: utf-8 -*-
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'true'
 require 'mime/types'
 require 'fileutils'
+require 'json'
+
+class MIME::Types
+  def self.deprecated(*_args, &_block)
+    # We are an internal tool. Silence deprecation warnings.
+  end
+end
 
 class Convert
   class << self
@@ -24,34 +32,37 @@ class Convert
 
     # Converts from YAML to JSON. Defaults to converting to a single file.
     def from_yaml_to_json(args)
-      mf = args.multiple_files || "single"
       from_yaml(yaml_path(args.source)).
-        to_json(destination:    json_path(args.destination),
-                multiple_files: multiple_files(mf))
+        to_json(
+          destination:    json_path(args.destination),
+          multiple_files: multiple_files(args.multiple_files || 'single')
+        )
     end
 
     # Converts from JSON to YAML. Defaults to converting to multiple files.
     def from_json_to_yaml(args)
-      mf = args.multiple_files || "multiple"
       from_json(json_path(args.source)).
-        to_yaml(destination:    yaml_path(args.destination),
-                multiple_files: multiple_files(mf))
+        to_yaml(
+          destination:    yaml_path(args.destination),
+          multiple_files: multiple_files(args.multiple_files || 'multiple')
+        )
     end
 
     private :new
 
     private
+
     def yaml_path(path)
-      if path.nil? or path.empty?
-        'type-lists'
-      else
-        path
-      end
+      path_or_default(path, 'type-lists'.freeze)
     end
 
     def json_path(path)
+      path_or_default(path, 'data'.freeze)
+    end
+
+    def path_or_default(path, default)
       if path.nil? or path.empty?
-        'data'
+        default
       else
         path
       end
@@ -59,7 +70,7 @@ class Convert
 
     def multiple_files(flag)
       case flag.to_s.downcase
-      when "true", "yes", "multiple"
+      when 'true', 'yes', 'multiple'
         true
       else
         false
@@ -69,10 +80,9 @@ class Convert
 
   def initialize(options = {})
     if options[:path].nil? or options[:path].empty?
-      raise ArgumentError, ':path is required'
-    end
-    if options[:from].nil? or options[:from].empty?
-      raise ArgumentError, ':from is required'
+      fail ArgumentError, ':path is required'
+    elsif options[:from].nil? or options[:from].empty?
+      fail ArgumentError, ':from is required'
     end
 
     @loader = MIME::Types::Loader.new(options[:path])
@@ -81,17 +91,18 @@ class Convert
 
   # Convert the data to JSON.
   def to_json(options = {})
-    raise ArgumentError, 'destination is required' unless options[:destination]
+    options[:destination] or require_destination!
     write_types(options.merge(format: :json))
   end
 
   # Convert the data to YAML.
   def to_yaml(options = {})
-    raise ArgumentError, 'destination is required' unless options[:destination]
+    options[:destination] or require_destination!
     write_types(options.merge(format: :yaml))
   end
 
   private
+
   def load_from(source_type)
     method = :"load_#{source_type}"
     @loader.send(method)
@@ -116,11 +127,7 @@ class Convert
 
   def write_multiple_files(options)
     d = options[:destination]
-    if File.exist?(d) and not File.directory?(d)
-      raise ArgumentError, 'Cannot write multiple files to a file.'
-    end
-
-    FileUtils.mkdir_p d unless File.exist?(d)
+    must_be_directory!(d)
 
     media_types = MIME::Types.map(&:media_type).uniq
     media_types.each { |media_type|
@@ -135,4 +142,17 @@ class Convert
   def convert(data, format)
     data.send(:"to_#{format}")
   end
+
+  def require_destination!
+    fail ArgumentError, 'Destination path is required.'
+  end
+
+  def must_be_directory!(path)
+    if File.exist?(path) and !File.directory?(path)
+      fail ArgumentError, 'Cannot write multiple files to a file.'
+    end
+
+    FileUtils.mkdir_p(path) unless File.exist?(path)
+    path
+  end
 end

data/support/convert/columnar.rb

@@ -0,0 +1,90 @@
+require 'convert'
+
+class Convert::Columnar < Convert
+  class << self
+    # Converts from YAML to Columnar format. This *always* converts to multiple
+    # files.
+    def from_yaml_to_columnar(args)
+      from_yaml(yaml_path(args.source)).
+        to_columnar(destination: columnar_path(args.destination))
+    end
+
+    private
+
+    def columnar_path(path)
+      path_or_default(path, 'data')
+    end
+  end
+
+  # Convert the data to multiple text files.
+  def to_columnar(options = {})
+    root = options[:destination] or require_destination!
+    @root = must_be_directory!(root)
+    @data = @loader.container.sort.map(&:to_h)
+
+    column_file('content_type') do |type|
+      [ type['content-type'], Array(type['extensions']).join(' ') ].
+        flatten.join(' ').strip
+    end
+
+    required_file('encoding')
+    optional_file('docs')
+    optional_file('system')
+    bool_file('obsolete')
+    bool_file('registered')
+    bool_file('signature')
+    array_file('references')
+    dict_file('xrefs')
+    dict_file('friendly')
+    optional_file('use_instead', 'use-instead')
+  end
+
+  def column_file(name, &block)
+    File.open(File.join(@root, "mime.#{name}.column"), 'wb') do |f|
+      f.puts @data.map(&block)
+    end
+  end
+
+  def bool_file(name, *fields)
+    fields = [ name ] if fields.empty?
+    column_file(name) do |type|
+      fields.map { |field|
+        type[field] ? 1 : 0
+      }.join(' ')
+    end
+  end
+
+  def required_file(name, field = name)
+    column_file(name) { |type| type[field] }
+  end
+
+  def optional_file(name, field = name)
+    column_file(name) { |type| opt(type[field]) }
+  end
+
+  def array_file(name, field = name)
+    column_file(name) { |type| arr(type[field]) }
+  end
+
+  def dict_file(name, field = name)
+    column_file(name) { |type| dict(type[field]) }
+  end
+
+  def opt(value)
+    value || '-'
+  end
+
+  def arr(value)
+    Array(opt(value)).join('|')
+  end
+
+  def dict(value)
+    if value
+      value.sort.map { |k, v|
+        [ k, Array(v).compact.join('^') ].join('^')
+      }.join('|')
+    else
+      '-'
+    end
+  end
+end

data/support/iana_registry.rb

@@ -11,6 +11,12 @@ require 'yaml'
 ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
 require 'mime/types'
 
+class MIME::Types
+  def self.deprecated(*_args, &_block)
+    # We are an internal tool. Silence deprecation warnings.
+  end
+end
+
 class IANARegistry
   DEFAULTS = {
     url: %q(https://www.iana.org/assignments/media-types/media-types.xml),
@@ -21,7 +27,7 @@ class IANARegistry
     dest = Pathname(options[:to] || DEFAULTS[:to]).expand_path
     url  = options.fetch(:url, DEFAULTS[:url])
 
-    puts "Downloading IANA MIME type assignments."
+    puts 'Downloading IANA MIME type assignments.'
     puts "\t#{url}"
     xml  = Nokogiri::XML(open(url) { |f| f.read })
 
@@ -48,7 +54,7 @@ class IANARegistry
     yield self if block_given?
   end
 
-  ASSIGNMENT_FILE_REF = "{%s=http://www.iana.org/assignments/media-types/%s}"
+  ASSIGNMENT_FILE_REF = '{%s=http://www.iana.org/assignments/media-types/%s}'
 
   def parse
     @registry.css('record').each do |record|
@@ -63,9 +69,11 @@ class IANARegistry
 
       subtype, notes = subtype.split(/ /, 2)
 
-      refs, xrefs   = parse_refs_and_files(record.css('xref'),
-                                           record.css('file'),
-                                           subtype)
+      refs, xrefs = parse_refs_and_files(
+        record.css('xref'),
+        record.css('file'),
+        subtype
+      )
 
       xrefs['notes'] << notes if notes
 
@@ -102,6 +110,7 @@ class IANARegistry
   end
 
   private
+
   def mime_types_for(file)
     if file.exist?
       MIME::Types::Loader.load_from_yaml(file)
@@ -115,7 +124,8 @@ class IANARegistry
     r  = []
 
     refs.each do |xref|
-      type, data = xref["type"], xref["data"]
+      type = xref['type']
+      data = xref['data']
 
       r << ref_from_type(type, data)
 
@@ -129,11 +139,11 @@ class IANARegistry
                     file.text
                   end
 
-      if file["type"] == "template"
+      if file['type'] == 'template'
         r << (ASSIGNMENT_FILE_REF % [ file_name, file_name ])
       end
 
-      xr[file["type"]] << file_name
+      xr[file['type']] << file_name
     end
 
     [ r, xr ]

data/test/fixture/json.json

@@ -1 +1 @@
-[{"content-type":"application/smil","encoding":"8bit","extensions":["smi","smil"],"obsolete":true,"use-instead":["application/smil+xml"],"references":["IANA","RFC4536"],"registered":true},{"content-type":"audio/vnd.qcelp","encoding":"base64","extensions":["qcp"],"obsolete":true,"use-instead":["audio/QCELP"],"references":["IANA","RFC3625"],"registered":true},{"content-type":"image/bmp","encoding":"base64","extensions":["bmp"],"obsolete":true,"use-instead":["image/x-bmp"],"registered":false},{"content-type":"application/acad","encoding":"base64","references":["LTSW"],"registered":false},{"content-type":"audio/webm","encoding":"base64","extensions":["webm"],"references":["{WebM=http://www.webmproject.org/code/specs/container/}"],"registered":false},{"content-type":"image/pjpeg","docs":"Fixes a bug with IE6 and progressive JPEGs","encoding":"base64","registered":false},{"content-type":"application/1d-interleaved-parityfec","encoding":"base64","references":["IANA","RFC6015"],"registered":true},{"content-type":"audio/1d-interleaved-parityfec","encoding":"base64","references":["IANA","RFC6015"],"registered":true},{"content-type":"application/x-apple-diskimage","encoding":"base64","extensions":["dmg"],"registered":false,"system":"mac"}]
+[{"content-type":"application/smil","encoding":"8bit","extensions":["smi","smil"],"obsolete":true,"use-instead":"application/smil+xml","references":["IANA","RFC4536"],"registered":true},{"content-type":"audio/vnd.qcelp","encoding":"base64","extensions":["qcp"],"obsolete":true,"use-instead":"audio/QCELP","references":["IANA","RFC3625"],"registered":true},{"content-type":"image/bmp","encoding":"base64","extensions":["bmp"],"obsolete":true,"use-instead":"image/x-bmp","registered":false},{"content-type":"application/acad","encoding":"base64","references":["LTSW"],"registered":false},{"content-type":"audio/webm","encoding":"base64","extensions":["webm"],"references":["{WebM=http://www.webmproject.org/code/specs/container/}"],"registered":false},{"content-type":"image/pjpeg","docs":"Fixes a bug with IE6 and progressive JPEGs","encoding":"base64","registered":false},{"content-type":"application/1d-interleaved-parityfec","encoding":"base64","references":["IANA","RFC6015"],"registered":true},{"content-type":"audio/1d-interleaved-parityfec","encoding":"base64","references":["IANA","RFC6015"],"registered":true},{"content-type":"application/x-apple-diskimage","encoding":"base64","extensions":["dmg"],"registered":false,"system":"mac"}]

data/test/fixture/yaml.yaml

@@ -6,8 +6,7 @@
   - smi
   - smil
   obsolete: true
-  use-instead:
-  - application/smil+xml
+  use-instead: application/smil+xml
   references:
   - IANA
   - RFC4536
@@ -18,8 +17,7 @@
   extensions:
   - qcp
   obsolete: true
-  use-instead:
-  - audio/QCELP
+  use-instead: audio/QCELP
   references:
   - IANA
   - RFC3625
@@ -30,8 +28,7 @@
   extensions:
   - bmp
   obsolete: true
-  use-instead:
-  - image/x-bmp
+  use-instead: image/x-bmp
   registered: false
 - !ruby/object:MIME::Type
   content-type: application/acad

data/test/minitest_helper.rb

@@ -5,18 +5,17 @@ require 'fileutils'
 
 gem 'minitest'
 require 'minitest/autorun'
+require 'minitest/focus'
 
-module MIME
-  @__deprecated = Hash.new { |h, k| h[k] = true }
+module Minitest::MIMEDeprecated
+  def assert_deprecated name, message = 'and will be removed'
+    name = Regexp.escape(name)
+    message = Regexp.escape(message)
 
-  class << self
-    attr_reader :__deprecated
+    assert_output nil, /#{name} is deprecated #{message}./ do
+      yield
+    end
   end
-end
 
-def assert_deprecated(name, message = "and will be removed")
-  MIME.__deprecated[name] = false
-  assert_output(nil, /#{Regexp.escape(name)} is deprecated #{Regexp.escape(message)}./) { yield }
-ensure
-  MIME.__deprecated[name] = true
+  Minitest::Test.send(:include, self)
 end

data/test/test_mime_type.rb

@@ -17,7 +17,9 @@ class TestMIMEType < Minitest::Test
       }
       js.encoding = '8bit'
       js.extensions = %w(js sj)
-      js.references = %w(IANA RFC4329 {application/javascript=http://www.iana.org/assignments/media-types/application/javascript})
+      assert_deprecated('MIME::Type#references=') do
+        js.references = %w(IANA RFC4329 {application/javascript=http://www.iana.org/assignments/media-types/application/javascript})
+      end
       js.registered = true
 
       yield js if block_given?
@@ -44,24 +46,30 @@ class TestMIMEType < Minitest::Test
 
   def setup
     @applzip = MIME::Type.new('x-appl/x-zip') { |t|
-      t.extensions = ['zip', 'zp']
+      t.extensions = %w(zip zp)
     }
   end
 
   def test_class_from_array
     yaml = nil
-    assert_deprecated("MIME::Type.from_array") do
-      yaml = MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit',
-                                   'd9d172f608')
+    assert_deprecated('MIME::Type.from_array') do
+      yaml = MIME::Type.from_array(
+        'text/x-yaml',
+        %w(yaml yml),
+        '8bit',
+        'd9d172f608'
+      )
     end
     assert_instance_of(MIME::Type, yaml)
     assert_equal('text/yaml', yaml.simplified)
-    assert_raises(ArgumentError) { MIME::Type.from_array }
+    assert_deprecated('MIME::Type.from_array') do
+      assert_raises(ArgumentError) { MIME::Type.from_array }
+    end
   end
 
   def test_class_from_hash
     yaml = nil
-    assert_deprecated("MIME::Type.from_hash") do
+    assert_deprecated('MIME::Type.from_hash') do
       yaml = MIME::Type.from_hash('Content-Type' => 'text/x-yaml',
                                   'Content-Transfer-Encoding' => '8bit',
                                   'System' => 'd9d172f608',
@@ -73,7 +81,7 @@ class TestMIMEType < Minitest::Test
 
   def test_class_from_mime_type
     zip2 = nil
-    assert_deprecated("MIME::Type.from_mime_type") do
+    assert_deprecated('MIME::Type.from_mime_type') do
       zip2 = MIME::Type.from_mime_type(@applzip)
     end
     assert_instance_of(MIME::Type, @applzip)
@@ -102,7 +110,7 @@ class TestMIMEType < Minitest::Test
   end
 
   def test_spaceship_compare # '<=>'
-    assert(MIME::Type.new('text/plain') == MIME::Type.new('text/plain'))
+    assert(MIME::Type.new('text/plain') == MIME::Type.new('text/plain')) # rubocop:disable Lint/UselessComparison
     assert(MIME::Type.new('text/plain') != MIME::Type.new('image/jpeg'))
     assert(MIME::Type.new('text/plain') == 'text/plain')
     assert(MIME::Type.new('text/plain') != 'image/jpeg')
@@ -148,7 +156,7 @@ class TestMIMEType < Minitest::Test
     assert_equal('text/vCard', MIME::Type.new('text/vCard').content_type)
     assert_equal('application/pkcs7-mime',
                  MIME::Type.new('application/pkcs7-mime').content_type)
-    assert_equal('x-appl/x-zip', @applzip.content_type);
+    assert_equal('x-appl/x-zip', @applzip.content_type)
     assert_equal('base64', @applzip.encoding)
   end
 
@@ -188,7 +196,7 @@ class TestMIMEType < Minitest::Test
 
   def test_docs_equals
     yaml = make_yaml_mime_type
-    assert_nil(yaml.docs)
+    assert_equal [], yaml.docs
     yaml.docs = 'YAML docs'
     assert_equal('YAML docs', yaml.docs)
   end
@@ -267,14 +275,18 @@ class TestMIMEType < Minitest::Test
 
   def test_platform_eh
     yaml = nil
-    assert_deprecated("MIME::Type#platform?") do
+    assert_deprecated('MIME::Type#platform?') do
       yaml = make_yaml_mime_type
       refute(yaml.platform?)
     end
     yaml.system = nil
-    refute(yaml.platform?)
+    assert_deprecated('MIME::Type#platform?') do
+      refute(yaml.platform?)
+    end
     yaml.system = %r{#{RUBY_PLATFORM}}
-    assert(yaml.platform?)
+    assert_deprecated('MIME::Type#platform?') do
+      assert(yaml.platform?)
+    end
   end
 
   def assert_priority(l, e, r)
@@ -381,7 +393,7 @@ class TestMIMEType < Minitest::Test
   end
 
   def test_system
-    assert_deprecated("MIME::Type#system") do
+    assert_deprecated('MIME::Type#system') do
       yaml = make_yaml_mime_type
       assert_equal(%r{d9d172f608}, yaml.system)
     end
@@ -390,31 +402,37 @@ class TestMIMEType < Minitest::Test
   def test_system_equals
     yaml = make_yaml_mime_type
     yaml.system = /win32/
-    assert_equal(%r{win32}, yaml.system)
+    assert_deprecated('MIME::Type#system') do
+      assert_equal(%r{win32}, yaml.system)
+    end
     yaml.system = nil
-    assert_nil(yaml.system)
+    assert_deprecated('MIME::Type#system') do
+      assert_nil(yaml.system)
+    end
   end
 
   def test_system_eh
     yaml = make_yaml_mime_type
-    assert_deprecated("MIME::Type#system?") do
+    assert_deprecated('MIME::Type#system?') do
       assert(yaml.system?)
     end
     yaml.system = nil
-    refute(yaml.system?)
+    assert_deprecated('MIME::Type#system?') do
+      refute(yaml.system?)
+    end
   end
 
   def test_to_a
     yaml = make_yaml_mime_type
-    assert_deprecated("MIME::Type#to_a") do
+    assert_deprecated('MIME::Type#to_a') do
       assert_equal(['text/x-yaml', %w(yaml yml), '8bit', /d9d172f608/,
-                    false, nil, [], false], yaml.to_a)
+                    false, [], [], false], yaml.to_a)
     end
   end
 
   def test_to_hash
     yaml = make_yaml_mime_type
-    assert_deprecated("MIME::Type#to_hash") do
+    assert_deprecated('MIME::Type#to_hash') do
       assert_equal(
         {
           'Content-Type'              => 'text/x-yaml',
@@ -424,7 +442,7 @@ class TestMIMEType < Minitest::Test
           'Registered'                => false,
           'URL'                       => [],
           'Obsolete'                  => false,
-          'Docs'                      => nil
+          'Docs'                      => []
         },
         yaml.to_hash)
     end
@@ -432,7 +450,7 @@ class TestMIMEType < Minitest::Test
 
   def assert_type_has_keys(type, *keys)
     hash = type.to_h
-    keys.flatten.each { |key| assert(hash.has_key?(key)) }
+    keys.flatten.each { |key| assert(hash.key?(key)) }
   end
 
   def test_to_h
@@ -441,9 +459,13 @@ class TestMIMEType < Minitest::Test
     assert_type_has_keys(make(t) { |v| v.docs = 'Something' }, 'docs')
     assert_type_has_keys(make(t) { |v| v.extensions = %w(b) }, 'extensions')
     assert_type_has_keys(make(t) { |v| v.obsolete = true }, 'obsolete')
-    assert_type_has_keys(make(t) { |v| v.obsolete = true; v.use_instead = 'c/d' },
-                         'obsolete', 'use-instead')
-    assert_type_has_keys(make(t) { |v| v.references = 'IANA' }, 'references')
+    assert_type_has_keys(make(t) { |v|
+      v.obsolete = true
+      v.use_instead = 'c/d'
+    }, 'obsolete', 'use-instead')
+    assert_type_has_keys(make(t) { |v|
+      assert_deprecated('MIME::Type#references=') { v.references = 'IANA' }
+    }, 'references')
     assert_type_has_keys(make(t) { |v| v.signature = true }, 'signature')
     assert_type_has_keys(make(t) { |v| v.system = /xyz/ }, 'system')
   end
@@ -468,7 +490,7 @@ class TestMIMEType < Minitest::Test
     begin
       MIME::Type.new(nil)
     rescue MIME::Type::InvalidContentType => ex
-      assert_equal("Invalid Content-Type nil", ex.message)
+      assert_equal('Invalid Content-Type nil', ex.message)
     end
   end
 
@@ -477,16 +499,26 @@ class TestMIMEType < Minitest::Test
   end
 
   def test_references
-    assert_empty(make_yaml_mime_type.references)
+    assert_deprecated('MIME::Type#references') do
+      assert_empty(make_yaml_mime_type.references)
+    end
   end
 
   def test_references_equals
     yaml = make_yaml_mime_type
-    yaml.references = "IANA"
-    assert_equal(%W(IANA), yaml.references)
+    assert_deprecated('MIME::Type#references=') do
+      yaml.references = 'IANA'
+    end
+    assert_deprecated('MIME::Type#references') do
+      assert_equal(%w(IANA), yaml.references)
+    end
 
-    yaml.references = %w(IANA IANA)
-    assert_equal(%W(IANA), yaml.references)
+    assert_deprecated('MIME::Type#references=') do
+      yaml.references = %w(IANA IANA)
+    end
+    assert_deprecated('MIME::Type#references') do
+      assert_equal(%w(IANA), yaml.references)
+    end
   end
 
   def test_xrefs
@@ -501,58 +533,90 @@ class TestMIMEType < Minitest::Test
 
   def test_xref_urls
     js = make_javascript do |j|
-      j.xrefs = j.xrefs.merge({
+      j.xrefs = j.xrefs.merge(
         'draft'      => [ 'RFC-ietf-appsawg-json-merge-patch-07' ],
         'person'     => [ 'David_Singer' ],
         'rfc-errata' => [ '3245' ],
         'uri'        => [ 'http://exmple.org' ],
         'text'       => [ 'text' ]
-      })
+      )
     end
     assert_equal(
       [
-        "http://www.iana.org/go/rfc4239",
-        "http://www.iana.org/assignments/media-types/application/javascript",
-        "http://www.iana.org/go/draft-ietf-appsawg-json-merge-patch-07",
-        "http://www.iana.org/assignments/media-types/media-types.xhtml#David_Singer",
-        "http://www.rfc-editor.org/errata_search.php?eid=3245",
-        "http://exmple.org",
-        "text"
+        'http://www.iana.org/go/rfc4239',
+        'http://www.iana.org/assignments/media-types/application/javascript',
+        'http://www.iana.org/go/draft-ietf-appsawg-json-merge-patch-07',
+        'http://www.iana.org/assignments/media-types/media-types.xhtml#David_Singer',
+        'http://www.rfc-editor.org/errata_search.php?eid=3245',
+        'http://exmple.org',
+        'text'
       ],
       js.xref_urls
     )
   end
 
   def test_url
-    assert_deprecated("MIME::Type#url", "and has been renamed to #references") do
+    assert_deprecated('MIME::Type#url') do
       assert_empty(make_yaml_mime_type.url)
     end
   end
 
   def test_url_equals
     yaml = make_yaml_mime_type
-    assert_deprecated("MIME::Type#url=") do
-      yaml.url = "IANA"
+    assert_deprecated('MIME::Type#url=') do
+      yaml.url = 'IANA'
+    end
+    assert_deprecated('MIME::Type#url') do
+      assert_equal(%w(IANA), yaml.url)
     end
-    assert_equal(%W(IANA), yaml.url)
   end
 
   def test_urls
     yaml = make_yaml_mime_type
-    assert_empty(yaml.urls)
-    yaml.references = %w(IANA RFC123 DRAFT:xyz [abc])
-    assert_equal(%w(http://www.iana.org/assignments/media-types/text/yaml
-                    http://rfc-editor.org/rfc/rfc123.txt
-                    http://datatracker.ietf.org/public/idindex.cgi?command=id_details&filename=xyz
-                    http://www.iana.org/assignments/contact-people.htm#abc),
-                 yaml.urls)
-    yaml.references = '[def=lax]'
-    assert_equal([%w(def http://www.iana.org/assignments/contact-people.htm#lax)],
-                 yaml.urls)
-    yaml.references = '{mno=pqr}'
-    assert_equal([%w(mno pqr)], yaml.urls)
-    yaml.references = 'hoge'
-    assert_equal(%w(hoge), yaml.urls)
+    assert_deprecated('MIME::Type#urls') do
+      assert_empty(yaml.urls)
+    end
+
+    assert_deprecated('MIME::Type#references=') do
+      yaml.references = %w(IANA RFC123 DRAFT:xyz [abc])
+    end
+
+    assert_deprecated('MIME::Type#urls') do
+      assert_equal(
+        %w(
+          http://www.iana.org/assignments/media-types/text/yaml
+          http://rfc-editor.org/rfc/rfc123.txt
+          http://datatracker.ietf.org/public/idindex.cgi?command=id_details&filename=xyz
+          http://www.iana.org/assignments/contact-people.htm#abc
+        ),
+        yaml.urls
+      )
+    end
+
+    assert_deprecated('MIME::Type#references=') do
+      yaml.references = '[def=lax]'
+    end
+
+    assert_deprecated('MIME::Type#urls') do
+      assert_equal([%w(def http://www.iana.org/assignments/contact-people.htm#lax)],
+                   yaml.urls)
+    end
+
+    assert_deprecated('MIME::Type#references=') do
+      yaml.references = '{mno=pqr}'
+    end
+
+    assert_deprecated('MIME::Type#urls') do
+      assert_equal([%w(mno pqr)], yaml.urls)
+    end
+
+    assert_deprecated('MIME::Type#references=') do
+      yaml.references = 'hoge'
+    end
+
+    assert_deprecated('MIME::Type#urls') do
+      assert_equal(%w(hoge), yaml.urls)
+    end
   end
 
   def test_use_instead
@@ -581,7 +645,7 @@ class TestMIMEType < Minitest::Test
   end
 
   def test_friendly_set
-    assert_equal({ 'en' => 'Zip' }, @applzip.friendly([ 'en', 'Zip' ]))
+    assert_equal({ 'en' => 'Zip' }, @applzip.friendly(%w(en Zip)))
     assert_equal({ 'en' => 'Zip Archive' }, @applzip.friendly('en' => 'Zip Archive'))
   end
 
@@ -596,7 +660,7 @@ class TestMIMEType < Minitest::Test
     assert_output(nil, /MIME::InvalidContentType/) do
       assert_same(MIME::InvalidContentType, MIME::Type::InvalidContentType)
     end
-    assert_silent do
+    assert_output(nil, /MIME::InvalidContentType/) do
       assert_same(MIME::InvalidContentType, MIME::Type::InvalidContentType)
     end
     assert_raises(NameError) { MIME::Foo }