mime-types 3.1 → 3.2

data/{Licence.rdoc → Licence.md}

@@ -1,10 +1,10 @@
-== Licence
+## Licence
 
-*   Copyright 2003–2015 Austin Ziegler and contributors.
+*   Copyright 2003–2018 Austin Ziegler and contributors.
 
 The software in this repository is made available under the MIT license.
 
-=== MIT License
+### MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/Manifest.txt

@@ -1,7 +1,7 @@
-Code-of-Conduct.rdoc
-Contributing.rdoc
-History.rdoc
-Licence.rdoc
+Code-of-Conduct.md
+Contributing.md
+History.md
+Licence.md
 Manifest.txt
 README.rdoc
 Rakefile

data/README.rdoc

@@ -41,9 +41,7 @@ mime-types 1.x is no longer supported as of 2015-10-27.
 
 === mime-types 2.x End of Life
 
-mime-types 2.x is supported as 2.99.x receiving quarterly updates of the IANA
-registry and security updates for two years. It will reach full end of life on
-2017-11-21.
+mime-types 2.x is no longer supported as of 2017-11-21.
 
 === mime-types 3.x
 
@@ -183,7 +181,7 @@ MAJOR.MINOR:
    incremented, MINOR will be set to zero, and PATCH will be reset to the
    implied zero.
 
-2. If an API (code) feature is added that does not break compatibilty, the
+2. If an API (code) feature is added that does not break compatibility, the
    MINOR version will be incremented and PATCH will be reset to the implied zero.
 
 3. If there is a bugfix to a feature added in the most recent MAJOR.MINOR
@@ -195,8 +193,8 @@ features because of the existence of the [mime-types-data][] gem, and if
 features are marked deprecated in the course of mime-types 3.x, they will not
 be removed until mime-types 4.x or possibly later.
 
-:include: Code-of-Conduct.rdoc
+{Code of Conduct}[Code-of-Conduct_md.html]
 
-:include: Contributing.rdoc
+{Contributing}[Contributing_md.html]
 
-:include: Licence.rdoc
+{Licence}[Licence_md.html]

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'rubygems'
@@ -17,7 +19,7 @@ spec = Hoe.spec 'mime-types' do
 
   require_ruby_version '>= 2.0'
 
-  self.history_file = 'History.rdoc'
+  self.history_file = 'History.md'
   self.readme_file = 'README.rdoc'
 
   license 'MIT'
@@ -32,9 +34,9 @@ spec = Hoe.spec 'mime-types' do
   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', '~> 2.0']
+  extra_dev_deps << ['minitest-bonus-assertions', '~> 3.0']
   extra_dev_deps << ['minitest-hooks', '~> 1.4']
-  extra_dev_deps << ['rake', '~> 10.0']
+  extra_dev_deps << ['rake', '>= 10.0', '< 13.0']
   extra_dev_deps << ['fivemat', '~> 1.3' ]
   extra_dev_deps << ['minitest-rg', '~> 5.2']
 

data/lib/mime-types.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'mime/types'

data/lib/mime/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 module MIME
 end
@@ -55,7 +57,7 @@ class MIME::Type
   end
 
   # The released version of the mime-types library.
-  VERSION = '3.1'
+  VERSION = '3.2'
 
   include Comparable
 
@@ -129,7 +131,11 @@ class MIME::Type
     elsif other.respond_to?(:simplified)
       simplified <=> other.simplified
     else
-      simplified <=> MIME::Type.simplified(other.to_s)
+      filtered = 'silent' if other == :silent
+      filtered ||= 'true' if other == true
+      filtered ||= other.to_s
+
+      simplified <=> MIME::Type.simplified(filtered)
     end
   end
 
@@ -151,7 +157,7 @@ class MIME::Type
   # before unregistered or obsolete content types.
   def priority_compare(other)
     pc = simplified <=> other.simplified
-    if pc.zero?
+    if pc.zero? || !(extensions & other.extensions).empty?
       pc = if (reg = registered?) != other.registered?
              reg ? -1 : 1 # registered < unregistered
            elsif (comp = complete?) != other.complete?

data/lib/mime/type/columnar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mime/type'
 
 # A version of MIME::Type that works hand-in-hand with a MIME::Types::Columnar

data/lib/mime/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 module MIME
   ##
@@ -149,7 +151,7 @@ class MIME::Types
   def type_for(filename)
     Array(filename).flat_map { |fn|
       @extension_index[fn.chomp.downcase[/\.?([^.]*?)$/, 1]]
-    }.compact.inject(:+).sort { |a, b|
+    }.compact.inject(Set.new, :+).sort { |a, b|
       a.priority_compare(b)
     }
   end
@@ -169,7 +171,7 @@ class MIME::Types
         nil
       when MIME::Types
         variants = mime_type.instance_variable_get(:@type_variants)
-        add(*variants.values.inject(:+).to_a, quiet)
+        add(*variants.values.inject(Set.new, :+).to_a, quiet)
       when Array
         add(*mime_type, quiet)
       else
@@ -195,7 +197,7 @@ Type #{type} is already registered as a variant of #{type.simplified}.
   private
 
   def add_type_variant!(mime_type)
-    @type_variants[mime_type.simplified] << mime_type
+    @type_variants.add(mime_type.simplified, mime_type)
   end
 
   def reindex_extensions!(mime_type)
@@ -204,7 +206,7 @@ Type #{type} is already registered as a variant of #{type.simplified}.
   end
 
   def index_extensions!(mime_type)
-    mime_type.extensions.each { |ext| @extension_index[ext] << mime_type }
+    mime_type.extensions.each { |ext| @extension_index.add(ext, mime_type) }
   end
 
   def prune_matches(matches, complete, registered)
@@ -216,7 +218,7 @@ Type #{type} is already registered as a variant of #{type.simplified}.
   def match(pattern)
     @type_variants.select { |k, _|
       k =~ pattern
-    }.values.inject(:+)
+    }.values.inject(Set.new, :+)
   end
 end
 

data/lib/mime/types/_columnar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mime/type/columnar'
 
 # MIME::Types::Columnar is used to extend a MIME::Types container to load data

data/lib/mime/types/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 MIME::Types::Cache = Struct.new(:version, :data) # :nodoc:
 
 # Caching of MIME::Types registries is advisable if you will be loading

data/lib/mime/types/columnar.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'mime/types'

data/lib/mime/types/container.rb

@@ -1,30 +1,58 @@
+# frozen_string_literal: true
+
 require 'set'
+require 'forwardable'
+
+# MIME::Types requires a serializable keyed container that returns an empty Set
+# on a key miss. Hash#default_value cannot be used because, while it traverses
+# the Marshal format correctly, it won't survive any other serialization
+# format (plus, a default of a mutable object resuls in a shared mess).
+# Hash#default_proc cannot be used without a wrapper because it prevents
+# Marshal serialization (and doesn't survive the round-trip).
+class MIME::Types::Container #:nodoc:
+  extend Forwardable
 
-# MIME::Types requires a container Hash with a default values for keys
-# resulting in an empty array (<tt>[]</tt>), but this cannot be dumped through
-# Marshal because of the presence of that default Proc. This class exists
-# solely to satisfy that need.
-class MIME::Types::Container < Hash # :nodoc:
   def initialize
-    super
-    self.default_proc = ->(h, k) { h[k] = Set.new }
+    @container = {}
+  end
+
+  def [](key)
+    container[key] || EMPTY_SET
+  end
+
+  def_delegators :@container,
+    :count,
+    :each_value,
+    :keys,
+    :merge,
+    :merge!,
+    :select,
+    :values
+
+  def add(key, value)
+    (container[key] ||= Set.new).add(value)
   end
 
   def marshal_dump
-    {}.merge(self)
+    {}.merge(container)
   end
 
   def marshal_load(hash)
-    self.default_proc = ->(h, k) { h[k] = Set.new }
-    merge!(hash)
+    @container = hash
   end
 
   def encode_with(coder)
-    each { |k, v| coder[k] = v.to_a }
+    container.each { |k, v| coder[k] = v.to_a }
   end
 
   def init_with(coder)
-    self.default_proc = ->(h, k) { h[k] = Set.new }
-    coder.map.each { |k, v| self[k] = Set[*v] }
+    coder.map.each { |k, v| container[k] = Set[*v] }
   end
+
+  private
+
+  attr_reader :container
+
+  EMPTY_SET = Set.new.freeze
+  private_constant :EMPTY_SET
 end

data/lib/mime/types/deprecations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'mime/types/logger'
@@ -23,9 +25,9 @@ module MIME
                 else
                   message
                 end
-      MIME::Types.logger.warn <<-warning.chomp
+      MIME::Types.logger.warn <<-WARNING.chomp
 #{caller[1]}: #{klass}#{level}#{sym} is deprecated #{message}.
-      warning
+      WARNING
       block.call if block
     end
   end

data/lib/mime/types/full.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 module MIME
   ##

data/lib/mime/types/loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 ##
@@ -31,10 +33,6 @@ class MIME::Types::Loader
     path = path || ENV['RUBY_MIME_TYPES_DATA'] || MIME::Types::Data::PATH
     @container = container || MIME::Types.new
     @path = File.expand_path(path)
-    # begin
-    #   require 'mime/lazy_types'
-    #   @container.extend(MIME::LazyTypes)
-    # end
   end
 
   # Loads a MIME::Types registry from YAML files (<tt>*.yml</tt> or

data/lib/mime/types/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'logger'

data/lib/mime/types/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class << MIME::Types
   include Enumerable
 
@@ -41,7 +43,13 @@ class << MIME::Types
   private
 
   def lazy_load?
-    (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
+    if ENV.key?('RUBY_MIME_TYPES_LAZY_LOAD')
+      MIME::Types.logger.warn <<-WARNING.chomp
+Lazy loading ($RUBY_MIME_TYPES_LAZY_LOAD) is deprecated and will be removed.
+      WARNING
+
+      (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
+    end
   end
 
   def __types__
@@ -55,8 +63,9 @@ class << MIME::Types
   end
 
   def load_default_mime_types(mode = load_mode)
-    @__types__ = MIME::Types::Cache.load
-    unless @__types__
+    if @__types__ = MIME::Types::Cache.load
+      __instances__.add(@__types__)
+    else
       @__types__ = MIME::Types::Loader.load(mode)
       MIME::Types::Cache.save(@__types__)
     end

data/test/minitest_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'mime/type'

data/test/test_mime_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'mime/types'
@@ -330,21 +332,32 @@ describe MIME::Type do
       assert_priority text_1, text_1p, text_2
     end
 
-    it 'sorts (2) based on the registration state' do
+    it 'sorts (2) based on extensions' do
+      text_1.extensions = ["foo", "bar"]
+      text_2.extensions = ["foo"]
+
+      assert_priority_same text_1, text_2
+
+      text_2.registered = true
+
+      assert_priority_more text_1, text_2
+    end
+
+    it 'sorts (3) based on the registration state' do
       text_1.registered = text_1p.registered = true
       text_1b = mime_type(text_1) { |t| t.registered = false }
 
       assert_priority text_1, text_1p, text_1b
     end
 
-    it 'sorts (3) based on the completeness' do
+    it 'sorts (4) based on the completeness' do
       text_1.extensions = text_1p.extensions = '1'
       text_1b = mime_type(text_1) { |t| t.extensions = nil }
 
       assert_priority text_1, text_1p, text_1b
     end
 
-    it 'sorts (4) based on obsolete status' do
+    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 }
 

data/test/test_mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'mime/types'
@@ -83,6 +85,12 @@ describe MIME::Types do
       refute_empty mime_types[/gzip/, registered: true]
       refute_equal mime_types[/gzip/], mime_types[/gzip/, registered: true]
     end
+
+    it 'properly returns an empty result on a regular expression miss' do
+      assert_empty mime_types[/^foo/]
+      assert_empty mime_types[/^foo/, registered: true]
+      assert_empty mime_types[/^foo/, complete: true]
+    end
   end
 
   describe '#add' do
@@ -143,7 +151,9 @@ describe MIME::Types do
     end
 
     it 'does not find unknown extensions' do
+      keys = mime_types.instance_variable_get(:@extension_index).keys
       assert_empty mime_types.type_for('zzz')
+      assert_equal keys, mime_types.instance_variable_get(:@extension_index).keys
     end
 
     it 'modifying type extensions causes reindexing' do

data/test/test_mime_types_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: utf-8 -*-
 
 require 'mime/types'
@@ -35,11 +37,20 @@ describe MIME::Types::Cache do
   describe '.load' do
     it 'does not use cache when RUBY_MIME_TYPES_CACHE is unset' do
       ENV.delete('RUBY_MIME_TYPES_CACHE')
-      assert_equal(nil, MIME::Types::Cache.load)
+      assert_nil MIME::Types::Cache.load
     end
 
     it 'does not use cache when missing' do
-      assert_equal(nil, MIME::Types::Cache.load)
+      assert_nil MIME::Types::Cache.load
+    end
+
+    it 'registers the data to be updated by #add_extensions' do
+      MIME::Types::Cache.save
+      reset_mime_types
+      assert_equal([], MIME::Types.type_for('foo.additional'))
+      html = MIME::Types['text/html'][0]
+      html.add_extensions('additional')
+      assert_equal([html], MIME::Types.type_for('foo.additional'))
     end
 
     it 'outputs an error when there is an invalid version' do
@@ -69,7 +80,7 @@ describe MIME::Types::Cache do
   describe '.save' do
     it 'does not create cache when RUBY_MIME_TYPES_CACHE is unset' do
       ENV.delete('RUBY_MIME_TYPES_CACHE')
-      assert_equal(nil, MIME::Types::Cache.save)
+      assert_nil MIME::Types::Cache.save
     end
 
     it 'creates the cache ' do
@@ -93,7 +104,7 @@ end
 describe MIME::Types::Container do
   it 'marshals and unmarshals correctly' do
     container = MIME::Types::Container.new
-    container['xyz'] << 'abc'
+    container.add('xyz', 'abc')
 
     # default proc should return Set[]
     assert_equal(Set[], container['abc'])