mime-types 2.0 → 2.1

data/test/test_mime_type.rb

@@ -199,6 +199,12 @@ class TestMIMEType < Minitest::Test
     yaml = make_yaml_mime_type
     yaml.extensions = 'yaml'
     assert_equal(%w(yaml), yaml.extensions)
+
+    yaml.extensions = %w(yaml yaml)
+    assert_equal(%w(yaml), yaml.extensions)
+
+    yaml.extensions = %w(yz yaml yz yml)
+    assert_equal(%w(yaml yml yz), yaml.extensions)
   end
 
   def test_like_eh
@@ -450,6 +456,9 @@ class TestMIMEType < Minitest::Test
     yaml = make_yaml_mime_type
     yaml.references = "IANA"
     assert_equal(%W(IANA), yaml.references)
+
+    yaml.references = %w(IANA IANA)
+    assert_equal(%W(IANA), yaml.references)
   end
 
   def test_url
@@ -460,7 +469,7 @@ class TestMIMEType < Minitest::Test
 
   def test_url_equals
     yaml = make_yaml_mime_type
-    assert_deprecated("MIME::Type#url=", "and has been renamed to #references=") do
+    assert_deprecated("MIME::Type#url=") do
       yaml.url = "IANA"
     end
     assert_equal(%W(IANA), yaml.url)
@@ -469,11 +478,10 @@ class TestMIMEType < Minitest::Test
   def test_urls
     yaml = make_yaml_mime_type
     assert_empty(yaml.urls)
-    yaml.references = %w(IANA RFC123 DRAFT:xyz LTSW [abc])
+    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.ltsw.se/knbase/internet/text.htp
                     http://www.iana.org/assignments/contact-people.htm#abc),
                  yaml.urls)
     yaml.references = '[def=lax]'

data/test/test_mime_types_class.rb

@@ -22,21 +22,21 @@ class TestMIMETypesQueryClassMethods < Minitest::Test
   def test_index_with_mime_type
     xtxp = MIME::Type.new('x-text/x-plain')
     assert_includes(MIME::Types[xtxp], 'text/plain')
-    assert_equal(2, MIME::Types[xtxp].size)
+    assert_equal(1, MIME::Types[xtxp].size)
   end
 
   def test_index_with_regex
     assert_includes(MIME::Types[/plain/], 'text/plain')
-    assert_equal(2, MIME::Types[/plain/].size)
+    assert_equal(1, MIME::Types[/plain/].size)
   end
 
   def test_index_with_string
     assert_includes(MIME::Types['text/plain'], 'text/plain')
-    assert_equal(2, MIME::Types['text/plain'].size)
+    assert_equal(1, MIME::Types['text/plain'].size)
   end
 
   def test_index_with_complete_flag
-    assert_empty(MIME::Types['text/vnd.fly', complete: true])
+    assert_empty(MIME::Types['application/1d-interleaved-parityfec', complete: true])
     refute_empty(MIME::Types['text/plain', complete: true])
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
 platform: ruby
 authors:
 - Austin Ziegler
@@ -36,7 +36,7 @@ cert_chain:
   SlF1Y3hPVG1URjFOYkxGcGlSd1FVWjF6b1piTmcyZTdtU2hjL2VleG5WTFdL
   Rkt4Um9QNgpLUGozV29EK3NwQjhmQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 description: ! 'The mime-types library provides a library and registry for information
   about
 
@@ -235,34 +221,42 @@ description: ! 'The mime-types library provides a library and registry for infor
   registrations (see below for the link), RFCs, and W3C recommendations.
 
 
-  The mime-types library uses semantic versioning. This is release 2.0; there are
+  This is release 2.1, mostly changing how the MIME type registry is updated from
 
-  incompatible changes in the API provided by mime-types, mostly around registry
+  the IANA registry (the format of which was incompatibly changed shortly before
 
-  initialization (see History.rdoc for full details), and the removal of support
+  this release) and taking advantage of the extra data available from IANA
 
-  for Ruby 1.8 interpreters.
+  registry in the form of MIME::Type#xrefs. In addition, the {LTSW
 
+  list}[http://www.ltsw.se/knbase/internet/mime.htp] has been dropped as a
 
-  mime-types (previously called MIME::Types for Ruby) was originally based on
+  supported list.
 
-  MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to
 
-  conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA
+  As a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and
+
+  mime-types 1.x is only being maintained for security issues. No new MIME types
 
-  registry}[http://www.iana.org/assignments/media-types/]
+  or features will be added.
+
+
+  mime-types (previously called MIME::Types for Ruby) was originally based on
+
+  MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to
 
-  ({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types
+  conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media
 
-  added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]
+  Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml]
 
-  and added by the users of mime-types.'
+  with some types added by the users of mime-types.'
 email:
 - austin@rubyforge.org
 executables: []
 extensions: []
 extra_rdoc_files:
 - Contributing.rdoc
+- History-Types.rdoc
 - History.rdoc
 - Licence.rdoc
 - Manifest.txt
@@ -277,6 +271,7 @@ files:
 - .travis.yml
 - Contributing.rdoc
 - Gemfile
+- History-Types.rdoc
 - History.rdoc
 - Licence.rdoc
 - Manifest.txt
@@ -292,9 +287,10 @@ files:
 - lib/mime/types/cache.rb
 - lib/mime/types/loader.rb
 - lib/mime/types/loader_path.rb
+- support/apache_mime_types.rb
 - support/benchmarker.rb
 - support/convert.rb
-- support/iana_downloader.rb
+- support/iana_registry.rb
 - test/fixture/json.json
 - test/fixture/old-data
 - test/fixture/yaml.yaml
@@ -329,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mime-types
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: The mime-types library provides a library and registry for information about

data/support/iana_downloader.rb

@@ -1,201 +0,0 @@
-# -*- ruby encoding: utf-8 -*-
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'open-uri'
-require 'nokogiri'
-require 'cgi'
-require 'fileutils'
-require 'yaml'
-
-ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
-require 'mime/types'
-
-class IANADownloader
-  INDEX_URL = %q(https://www.iana.org/assignments/media-types/)
-  MIME_HREF = %r{/assignments/media-types/(.+)/?$}
-
-  def self.download_to(destination)
-    new(destination).download_all
-  end
-
-  attr_reader :destination
-
-  def initialize(destination = nil)
-    @destination =
-      File.expand_path(destination ||
-                       File.expand_path('../../type-lists', __FILE__))
-  end
-
-  def download_all
-    puts "Downloading index of MIME types from #{INDEX_URL}."
-    index = Nokogiri::HTML(open(INDEX_URL) { |f| f.read })
-    index.xpath('//a').each do |tag|
-      next unless tag['href']
-      href_match = MIME_HREF.match(tag['href'])
-      next unless href_match
-      href = href_match.captures.first
-      next if tag.content == 'example'
-      download_one(href, tag.content, href)
-    end
-  end
-
-  def download_one(url, name = url, type = nil)
-    if url =~ %r{^https?://}
-      name = File.basename(url) if name == url
-    else
-      url  = File.join(INDEX_URL, url)
-    end
-
-    Parser.download(name, from: url, to: @destination, type: type)
-  end
-end
-
-class IANADownloader::Parser
-  def self.download(name, options = {})
-    new(name, options) do |parser|
-      parser.parse(parser.download)
-      parser.save
-    end
-  end
-
-  def initialize(name, options = {})
-    raise ArgumentError, ":from not specified" unless options[:from]
-    raise ArgumentError, ":to not specified" unless options[:to]
-
-    @name  = "#{File.basename(name, '.yml')}.yml"
-    @from  = options[:from]
-    @to    = File.expand_path(options[:to])
-    @type  = File.basename(options[:type] || name, '.yml')
-    @file  = File.join(@to, @name)
-    @types = load_mime_types || MIME::Types.new
-
-    yield self if block_given?
-  end
-
-  def download
-    puts "Downloading #{@name} from #{@from}"
-    Nokogiri::HTML(open(@from) { |f| f.read })
-  end
-
-  def parse(html)
-    nodes = html.xpath('//table//table//tr')
-
-    # How many <td> children does the first node have?
-    node_count = child_elems(nodes.first).size
-
-    if node_count == 1
-      # The title node doesn't have what we expect. Let's try it based on
-      # the first real node.
-      node_count = child_elems(nodes.first.next).size
-    end
-
-    nodes.each do |node|
-      next if node == nodes.first
-
-      elems = child_elems(node)
-      next if elems.size.zero?
-
-      if elems.size != node_count
-        warn "size mismatch (#{elems.size} != #{node_count}) in node: #{node}"
-        next
-      end
-
-      sub_ix, ref_ix = case elems.size
-                       when 3
-                         [ 1, 2 ]
-                       when 4
-                         [ 1, 3 ]
-                       else
-                         warn "size error (#{elems.size} != {3,4}) in node: #{node}"
-                         raise
-                       end
-      subtype = elems[sub_ix].content.chomp.strip
-      refs    = child_elems(elems[ref_ix]).map { |ref|
-        ref = ref.xpath('a') unless ref.name == 'a'
-        [ ref ].flatten.map { |r| href_to_ref(r) }
-
-      }.flatten
-
-      content_type = [ @type, subtype].join('/')
-      use_instead  = nil
-      obsolete     = false
-
-      if content_type =~ OBSOLETE
-        content_type = $1
-        obsolete     = true
-      elsif content_type =~ DEPRECATED
-        content_type = $1
-        use_instead  = [ $2 ]
-        obsolete     = true
-      end
-
-      types        = @types.select { |t|
-        (t.content_type == content_type)
-      }
-
-      if types.empty?
-        MIME::Type.new(content_type) do |mt|
-          mt.references  = %w(IANA) + refs
-          mt.registered  = true
-          mt.obsolete    = obsolete if obsolete
-          mt.use_instead = use_instead if use_instead
-          @types << mt
-        end
-      else
-        types.each { |mt|
-          mt.references  = %w(IANA) + refs
-          mt.registered  = true
-          mt.obsolete    = obsolete if obsolete
-          mt.use_instead = use_instead if use_instead
-        }
-      end
-    end
-  end
-
-  def save
-    FileUtils.mkdir_p(@to)
-    File.open(@file, 'wb') { |f|
-      f.puts @types.map.to_a.sort.to_yaml
-    }
-  end
-
-  private
-  def child_elems(node)
-    node.children.select { |n| n.elem? }
-  end
-
-  def load_mime_types
-    if File.exist?(@file)
-      MIME::Types::Loader.load_from_yaml(@file)
-    end
-  end
-
-  def href_to_ref(ref)
-    case ref['href']
-    when CONTACT_PEOPLE
-      tag = CGI::unescape($1).chomp.strip
-      if tag == ref.content
-        "[#{ref.content}]"
-      else
-        "[#{ref.content}=#{tag}]"
-      end
-    when RFC_EDITOR, IETF_RFC, IETF_RFC_TOOLS
-      "RFC#$1"
-    when RFC_BAD_EDITOR
-      ref.content
-    when %r{(https?://.*)}
-      "{#{ref.content}=#$1}"
-    else
-      ref
-    end
-  end
-
-  CONTACT_PEOPLE = %r{https?://www.iana.org/assignments/contact-people.html?l?#(.*)}
-  RFC_EDITOR = %r{https?://www.rfc-editor.org/rfc/rfc(\d+).txt}
-  RFC_BAD_EDITOR = %r{https?://www.rfc-editor.org/rfc/rfcxxxx.txt}
-  IETF_RFC = %r{https?://www.ietf.org/rfc/rfc(\d+).txt}
-  IETF_RFC_TOOLS = %r{https?://tools.ietf.org/html/rfc(\d+)}
-  OBSOLETE   = %r{(.+)\s+\((?:obsolete|deprecated)\)}i
-  DEPRECATED = %r{(.+)\s+-\s+DEPRECATED\s+-\s+Please\s+use\s+(.+)}
-end