mime-types 2.6.2 → 2.99

data/lib/mime/type/columnar.rb

@@ -39,11 +39,6 @@ class MIME::Type::Columnar < MIME::Type
     super
   end
 
-  def references(*) # :nodoc:
-    @container.send(:load_references) unless defined?(@references)
-    super if @references
-  end
-
   def registered? # :nodoc:
     @container.send(:load_registered) unless defined?(@registered)
     super
@@ -54,16 +49,6 @@ class MIME::Type::Columnar < MIME::Type
     super
   end
 
-  def system?(*) # :nodoc:
-    @container.send(:load_system) unless defined?(@system)
-    super
-  end
-
-  def system # :nodoc:
-    @container.send(:load_system) unless defined?(@system)
-    @system
-  end
-
   def xrefs # :nodoc:
     @container.send(:load_xrefs) unless defined?(@xrefs)
     @xrefs
@@ -81,30 +66,23 @@ class MIME::Type::Columnar < MIME::Type
 
   def to_a # :nodoc:
     @container.send(:load_encoding) unless defined?(@encoding)
-    @container.send(:load_system) unless defined?(@system)
     @container.send(:load_docs) unless defined?(@docs)
-    @container.send(:load_references) unless defined?(@references)
     super
   end
 
   def to_hash # :nodoc:
     @container.send(:load_encoding) unless defined?(@encoding)
-    @container.send(:load_system) unless defined?(@system)
     @container.send(:load_docs) unless defined?(@docs)
-    @container.send(:load_references) unless defined?(@references)
     super
   end
 
   def encode_with(coder) # :nodoc:
     @container.send(:load_friendly) unless defined?(@friendly)
     @container.send(:load_encoding) unless defined?(@encoding)
-    @container.send(:load_system) unless defined?(@system)
     @container.send(:load_docs) unless defined?(@docs)
-    @container.send(:load_references) unless defined?(@references)
     @container.send(:load_obsolete) unless defined?(@obsolete)
     @container.send(:load_use_instead) unless defined?(@use_instead)
     @container.send(:load_xrefs) unless defined?(@xrefs)
-    @container.send(:load_system) unless defined?(@system)
     @container.send(:load_registered) unless defined?(@registered)
     @container.send(:load_signature) unless defined?(@signature)
     super

data/lib/mime/types.rb

@@ -130,17 +130,15 @@ class MIME::Types
   #   1. Complete definitions sort before incomplete ones;
   #   2. IANA-registered definitions sort before LTSW-recorded
   #      definitions.
-  #   3. Generic definitions sort before platform-specific ones;
-  #   4. Current definitions sort before obsolete ones;
-  #   5. Obsolete definitions with use-instead clauses sort before those
+  #   3. Current definitions sort before obsolete ones;
+  #   4. Obsolete definitions with use-instead clauses sort before those
   #      without;
-  #   6. Obsolete definitions use-instead clauses are compared.
-  #   7. Sort on name.
+  #   5. Obsolete definitions use-instead clauses are compared.
+  #   6. Sort on name.
   #
-  # An additional flag of :platform (finds only MIME::Types for the current
-  # platform) is currently supported but deprecated.
+  # The previously supported (but deprecated) <tt>:platform</tt> flag is now ignored.
   def [](type_id, flags = {})
-    if flags[:platform]
+    if flags.key?(:platform)
       MIME::Types.deprecated(self, __method__, 'using the :platform flag')
     end
 
@@ -169,19 +167,16 @@ class MIME::Types
   #   puts MIME::Types.type_for(%w(citydesk.xml citydesk.gif))
   #     => [application/xml, image/gif, text/xml]
   #
-  # If +platform+ is +true+, then only file types that are specific to the
-  # current platform will be returned. This parameter has been deprecated.
-  def type_for(filename, platform = false)
+  # The deprecated +platform+ flag is ignored.
+  def type_for(filename, platform = :deprecated)
     types = Array(filename).flat_map { |fn|
       @extension_index[fn.chomp.downcase[/\.?([^.]*?)$/, 1]]
     }.compact.sort { |a, b| a.priority_compare(b) }.uniq
 
-    if platform
+    unless platform == :deprecated
       MIME::Types.deprecated(self, __method__, 'using the platform parameter')
-      types.select(&:platform?)
-    else
-      types
     end
+    types
   end
   alias_method :of, :type_for
 
@@ -253,7 +248,7 @@ Type #{type} is already registered as a variant of #{type.simplified}.
     end
 
     # MIME::Types#type_for against the default MIME::Types registry.
-    def type_for(filename, platform = false)
+    def type_for(filename, platform = :deprecated)
       __types__.type_for(filename, platform)
     end
     alias_method :of, :type_for
@@ -317,7 +312,6 @@ Type #{type} is already registered as a variant of #{type.simplified}.
 
   def prune_matches(matches, flags)
     matches.delete_if { |e| !e.complete? } if flags[:complete]
-    matches.delete_if { |e| !e.platform? } if flags[:platform]
     matches.delete_if { |e| !e.registered? } if flags[:registered]
     matches
   end

data/lib/mime/types/columnar.rb

@@ -81,12 +81,6 @@ module MIME::Types::Columnar
     end
   end
 
-  def load_references
-    each_file_line('references') do |type, line|
-      type.instance_variable_set(:@references, arr(line))
-    end
-  end
-
   def load_registered
     each_file_line('registered') do |type, line|
       type.registered = bool(line)
@@ -99,12 +93,6 @@ module MIME::Types::Columnar
     end
   end
 
-  def load_system
-    each_file_line('system') do |type, line|
-      type.system = (line unless line == '-'.freeze)
-    end
-  end
-
   def load_xrefs
     each_file_line('xrefs') { |type, line| type.xrefs = dict(line) }
   end

data/lib/mime/types/loader.rb

@@ -169,8 +169,8 @@ class MIME::Types::Loader
           fail BadV1Format, line
         end
 
-        unregistered, obsolete, platform, mediatype, subtype, extensions,
-          encoding, urls, docs, _ = *m.captures
+        unregistered, obsolete, _, mediatype, subtype, extensions, encoding,
+          urls, docs, _ = *m.captures
 
         next if mediatype.nil?
 
@@ -187,15 +187,10 @@ class MIME::Types::Loader
         mime_type = MIME::Type.new("#{mediatype}/#{subtype}") do |t|
           t.extensions  = extensions
           t.encoding    = encoding
-          t.system      = platform
           t.obsolete    = obsolete
           t.registered  = false if unregistered
           t.use_instead = use_instead
           t.docs        = docs
-
-          # This is being removed. Cheat to silence it for now.
-          t.instance_variable_set :@references,
-                                  Array(urls).flatten.compact.uniq
         end
 
         mime.add_type(mime_type, true)

data/support/convert/columnar.rb

@@ -29,11 +29,9 @@ class Convert::Columnar < Convert
 
     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')

data/support/iana_registry.rb

@@ -85,7 +85,6 @@ class IANARegistry
 
       if types.empty?
         MIME::Type.new(content_type) do |mt|
-          mt.references  = %w(IANA) + refs
           mt.xrefs       = xrefs
           mt.registered  = true
           mt.obsolete    = obsolete if obsolete
@@ -94,7 +93,6 @@ class IANARegistry
         end
       else
         types.each { |mt|
-          mt.references  = %w(IANA) + refs
           mt.registered  = true
           mt.xrefs       = xrefs
           mt.obsolete    = obsolete if obsolete

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","registered":true},{"content-type":"audio/vnd.qcelp","encoding":"base64","extensions":["qcp"],"obsolete":true,"use-instead":"audio/QCELP","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","registered":false},{"content-type":"audio/webm","encoding":"base64","extensions":["webm"],"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","registered":true},{"content-type":"audio/1d-interleaved-parityfec","encoding":"base64","registered":true},{"content-type":"application/x-apple-diskimage","encoding":"base64","extensions":["dmg"],"registered":false}]

data/test/fixture/yaml.yaml

@@ -7,9 +7,6 @@
   - smil
   obsolete: true
   use-instead: application/smil+xml
-  references:
-  - IANA
-  - RFC4536
   registered: true
 - !ruby/object:MIME::Type
   content-type: audio/vnd.qcelp
@@ -18,9 +15,6 @@
   - qcp
   obsolete: true
   use-instead: audio/QCELP
-  references:
-  - IANA
-  - RFC3625
   registered: true
 - !ruby/object:MIME::Type
   content-type: image/bmp
@@ -33,16 +27,12 @@
 - !ruby/object:MIME::Type
   content-type: application/acad
   encoding: base64
-  references:
-  - LTSW
   registered: false
 - !ruby/object:MIME::Type
   content-type: audio/webm
   encoding: base64
   extensions:
   - webm
-  references:
-  - ! '{WebM=http://www.webmproject.org/code/specs/container/}'
   registered: false
 - !ruby/object:MIME::Type
   content-type: image/pjpeg
@@ -52,16 +42,10 @@
 - !ruby/object:MIME::Type
   content-type: application/1d-interleaved-parityfec
   encoding: base64
-  references:
-  - IANA
-  - RFC6015
   registered: true
 - !ruby/object:MIME::Type
   content-type: audio/1d-interleaved-parityfec
   encoding: base64
-  references:
-  - IANA
-  - RFC6015
   registered: true
 - !ruby/object:MIME::Type
   content-type: application/x-apple-diskimage
@@ -69,4 +53,3 @@
   extensions:
   - dmg
   registered: false
-  system: !ruby/regexp /mac/

data/test/minitest_helper.rb

@@ -4,8 +4,9 @@ require 'mime/type'
 require 'fileutils'
 
 gem 'minitest'
-require 'minitest/autorun'
+require 'fivemat/minitest/autorun'
 require 'minitest/focus'
+require 'minitest/rg'
 
 module Minitest::MIMEDeprecated
   def assert_deprecated name, message = 'and will be removed'

data/test/test_mime_type.rb

@@ -18,7 +18,7 @@ class TestMIMEType < Minitest::Test
       js.encoding = '8bit'
       js.extensions = %w(js sj)
       assert_deprecated('MIME::Type#references=') do
-        js.references = %w(IANA RFC4329 {application/javascript=http://www.iana.org/assignments/media-types/application/javascript})
+        js.references = :anything
       end
       js.registered = true
 
@@ -30,7 +30,9 @@ class TestMIMEType < Minitest::Test
     make('text/x-yaml') do |yaml|
       yaml.extensions = %w(yaml yml)
       yaml.encoding   = '8bit'
-      yaml.system     = 'd9d172f608'
+      assert_deprecated('MIME::Type#system=') do
+        yaml.system     = 'd9d172f608'
+      end
       yaml.friendly('en' => 'YAML Structured Document')
     end
   end
@@ -39,7 +41,9 @@ class TestMIMEType < Minitest::Test
     make('text/x-yaml') do |yaml|
       yaml.extensions = %w(yaml yml)
       yaml.encoding   = '8bit'
-      yaml.system     = 'd9d172f608'
+      assert_deprecated('MIME::Type#system=') do
+        yaml.system     = 'd9d172f608'
+      end
       yaml.docs       = 'Test YAML'
     end
   end
@@ -274,18 +278,8 @@ class TestMIMEType < Minitest::Test
   end
 
   def test_platform_eh
-    yaml = nil
     assert_deprecated('MIME::Type#platform?') do
-      yaml = make_yaml_mime_type
-      refute(yaml.platform?)
-    end
-    yaml.system = nil
-    assert_deprecated('MIME::Type#platform?') do
-      refute(yaml.platform?)
-    end
-    yaml.system = %r{#{RUBY_PLATFORM}}
-    assert_deprecated('MIME::Type#platform?') do
-      assert(yaml.platform?)
+      refute make_yaml_mime_type.platform?
     end
   end
 
@@ -303,10 +297,6 @@ class TestMIMEType < Minitest::Test
     tr = make(tl) { |t| t.registered = false }
     assert_priority([tl, tr], [tl, te], [tr, tl])
 
-    tl.system = te.system = nil
-    tr = make(tl) { |t| t.system = /#{RUBY_PLATFORM}/ }
-    assert_priority([tl, tr], [tl, te], [tr, tl])
-
     tl.extensions = te.extensions = %w(1)
     tr = make(tl) { |t| t.extensions = nil }
     assert_priority([tl, tr], [tl, te], [tr, tl])
@@ -394,39 +384,29 @@ class TestMIMEType < Minitest::Test
 
   def test_system
     assert_deprecated('MIME::Type#system') do
-      yaml = make_yaml_mime_type
-      assert_equal(%r{d9d172f608}, yaml.system)
+      assert_nil make_yaml_mime_type.system
     end
   end
 
   def test_system_equals
-    yaml = make_yaml_mime_type
-    yaml.system = /win32/
     assert_deprecated('MIME::Type#system') do
-      assert_equal(%r{win32}, yaml.system)
-    end
-    yaml.system = nil
-    assert_deprecated('MIME::Type#system') do
-      assert_nil(yaml.system)
+      yaml = make_yaml_mime_type
+      yaml.system = /win32/
+      assert_nil yaml.system
     end
   end
 
   def test_system_eh
-    yaml = make_yaml_mime_type
     assert_deprecated('MIME::Type#system?') do
-      assert(yaml.system?)
-    end
-    yaml.system = nil
-    assert_deprecated('MIME::Type#system?') do
-      refute(yaml.system?)
+      refute make_yaml_mime_type.system?
     end
   end
 
   def test_to_a
     yaml = make_yaml_mime_type
     assert_deprecated('MIME::Type#to_a') do
-      assert_equal(['text/x-yaml', %w(yaml yml), '8bit', /d9d172f608/,
-                    false, [], [], false], yaml.to_a)
+      assert_equal [ 'text/x-yaml', %w(yaml yml), '8bit', nil, false, [], [],
+                     false ], yaml.to_a
     end
   end
 
@@ -438,7 +418,7 @@ class TestMIMEType < Minitest::Test
           'Content-Type'              => 'text/x-yaml',
           'Content-Transfer-Encoding' => '8bit',
           'Extensions'                => %w(yaml yml),
-          'System'                    => /d9d172f608/,
+          'System'                    => nil,
           'Registered'                => false,
           'URL'                       => [],
           'Obsolete'                  => false,
@@ -463,11 +443,7 @@ class TestMIMEType < Minitest::Test
       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
 
   def test_to_json
@@ -500,24 +476,17 @@ class TestMIMEType < Minitest::Test
 
   def test_references
     assert_deprecated('MIME::Type#references') do
-      assert_empty(make_yaml_mime_type.references)
+      assert_empty make_yaml_mime_type.references
     end
   end
 
   def test_references_equals
     yaml = make_yaml_mime_type
     assert_deprecated('MIME::Type#references=') do
-      yaml.references = 'IANA'
+      yaml.references = :anything
     end
     assert_deprecated('MIME::Type#references') do
-      assert_equal(%w(IANA), yaml.references)
-    end
-
-    assert_deprecated('MIME::Type#references=') do
-      yaml.references = %w(IANA IANA)
-    end
-    assert_deprecated('MIME::Type#references') do
-      assert_equal(%w(IANA), yaml.references)
+      assert_empty yaml.references
     end
   end
 
@@ -567,55 +536,14 @@ class TestMIMEType < Minitest::Test
       yaml.url = 'IANA'
     end
     assert_deprecated('MIME::Type#url') do
-      assert_equal(%w(IANA), yaml.url)
+      assert_equal [], yaml.url
     end
   end
 
   def test_urls
     yaml = make_yaml_mime_type
     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)
+      assert_empty yaml.urls
     end
   end