mime-types 3.2.2 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4341a1bdee1841367197d0f06ed6fcda8ee1fc3cd4347c6aa949fe942f247d2c
-  data.tar.gz: a7dd6d594e0029c2e6e4d8d342c3b8a46b94d05f2281cd30218a31fcbec8ec04
+  metadata.gz: c7c3e98bd6269827964418e761cda4c4699372a96b842c0bf161357201025974
+  data.tar.gz: e57d04551653914d1d184e35f0531be89665a23f4442a658f0fe5b59e7c61cec
 SHA512:
-  metadata.gz: 143d9bcc08f707d6e4cef9cee51d94581183ac6264180b261939215311368606fed8168832e96c7908f1926409c4d50c9a7d8216009070dda473aeb20465ba3e
-  data.tar.gz: 6e14198fc2b2c67c6b4f1e71d2f1f0442050ddec22f1be28533290badc01a7d3e8d5bc3e476f0af95c31c260171172d5bc777adee5fa30d2bb4838c2cc078d43
+  metadata.gz: 5e53279a2f70e31beba311206b779f175d4b0f5e516b858c0d6154787f3970bf0b977c0fb91a5739a8dce8a3a89958b58984be1d70ab9b81ca17f9e619bf920a
+  data.tar.gz: a2e8e7bf38b05e8536e4892ff2c3a0cdf30a7306c54620af78f36f5db77173bc3bb8ca47010527e8d74f3efd4eeb2fd937208d7951b6703764319d7d885b12b9

data/Contributing.md

@@ -115,6 +115,7 @@ Thanks to everyone else who has contributed to mime-types over the years:
 *   Hans de Graaff
 *   Henrik Hodne
 *   Janko Marohnić
+*   Jean Boussier
 *   Jeremy Evans
 *   Juanito Fatas
 *   Jun Aruga
@@ -124,6 +125,7 @@ Thanks to everyone else who has contributed to mime-types over the years:
 *   Martin d'Allens
 *   Mauricio Linhares
 *   Nicolas Leger
+*   Nicholas La Roux
 *   nycvotes-dev
 *   Postmodern
 *   Richard Hirner

data/History.md

@@ -1,3 +1,16 @@
+## 3.3 / 2019-09-04
+
+*   1 minor enhancement
+
+    *   Jean Boussier reduced memory usage for Ruby versions 2.3 or higher by
+        interning various string values in each type. This is done with a
+        backwards-compatible call that _freezes_ the strings on older
+        versions of Ruby. [#141][]
+
+*   Administrivia:
+
+    *   Nicholas La Roux updated Travis build configurations. [#139][]
+
 ## 3.2.2 / 2018-08-12
 
 *   Hiroto Fukui removed a stray `debugger` statement that I had used in
@@ -50,7 +63,7 @@
 *   Documentation Changes:
 
     *   Supporting files are now Markdown instead of rdoc, except for the
-        README. 
+        README.
 
     *   The history file has been modified to remove all history prior to 3.0.
         This history can be found in previous commits.
@@ -203,6 +216,8 @@
 [#135]: https://github.com/mime-types/ruby-mime-types/pull/135
 [#136]: https://github.com/mime-types/ruby-mime-types/issues/136
 [#137]: https://github.com/mime-types/ruby-mime-types/pull/137
+[#139]: https://github.com/mime-types/ruby-mime-types/pull/139
+[#141]: https://github.com/mime-types/ruby-mime-types/pull/141
 [Code-of-Conduct.md]: Code-of-Conduct_md.html
 [Contributor Covenant]: http://contributor-covenant.org
 [mime-types-data]: https://github.com/mime-types/mime-types-data

data/Licence.md

@@ -1,6 +1,6 @@
 ## Licence
 
-*   Copyright 2003–2018 Austin Ziegler and contributors.
+*   Copyright 2003–2019 Austin Ziegler and contributors.
 
 The software in this repository is made available under the MIT license.
 

data/Rakefile

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'rubygems'
 require 'hoe'
 require 'rake/clean'
@@ -37,7 +35,7 @@ spec = Hoe.spec 'mime-types' do
   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 << ['fivemat', '~> 1.3']
   extra_dev_deps << ['minitest-rg', '~> 5.2']
 
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0')
@@ -56,7 +54,7 @@ namespace :benchmark do
   end
 
   desc 'Benchmark Load Times'
-  task :load, [ :repeats ] => 'benchmark:support' do |_, args|
+  task :load, [:repeats] => 'benchmark:support' do |_, args|
     require 'benchmarks/load'
     Benchmarks::Load.report(
       File.join(Rake.application.original_dir, 'lib'),
@@ -65,7 +63,7 @@ namespace :benchmark do
   end
 
   desc 'Allocation counts'
-  task :allocations, [ :top_x, :mime_types_only ] => 'benchmark:support' do |_, args|
+  task :allocations, [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
     require 'benchmarks/load_allocations'
     Benchmarks::LoadAllocations.report(
       top_x: args.top_x,
@@ -74,7 +72,7 @@ namespace :benchmark do
   end
 
   desc 'Columnar allocation counts'
-  task 'allocations:columnar', [ :top_x, :mime_types_only ] => 'benchmark:support' do |_, args|
+  task 'allocations:columnar', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
     require 'benchmarks/load_allocations'
     Benchmarks::LoadAllocations.report(
       columnar: true,
@@ -84,7 +82,7 @@ namespace :benchmark do
   end
 
   desc 'Columnar allocation counts (full load)'
-  task 'allocations:columnar:full', [ :top_x, :mime_types_only ] => 'benchmark:support' do |_, args|
+  task 'allocations:columnar:full', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
     require 'benchmarks/load_allocations'
     Benchmarks::LoadAllocations.report(
       columnar: true,
@@ -94,6 +92,36 @@ namespace :benchmark do
     )
   end
 
+  desc 'Memory profiler'
+  task :memory, [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
+    require 'benchmarks/memory_profiler'
+    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'
+    Benchmarks::ProfileMemory.report(
+      columnar: true,
+      mime_types_only: args.mime_types_only,
+      top_x: args.top_x
+    )
+  end
+
+  desc 'Columnar allocation counts (full load)'
+  task 'memory:columnar:full', [:top_x, :mime_types_only] => 'benchmark:support' do |_, args|
+    require 'benchmarks/memory_profiler'
+    Benchmarks::ProfileMemory.report(
+      columnar: true,
+      full: true,
+      top_x: args.top_x,
+      mime_types_only: args.mime_types_only
+    )
+  end
+
   desc 'Object counts'
   task objects: 'benchmark:support' do
     require 'benchmarks/object_counts'
@@ -131,7 +159,7 @@ namespace :profile do
       '-R', 'mime/types',
       '-s', 'self',
       '-p', 'multi',
-      '-f', "#{output}",
+      '-f', output.to_s,
       script.to_s
     ]
     ruby args.join(' ')
@@ -194,7 +222,7 @@ namespace :convert do
       rdoc = name
       mark = "#{File.basename(name, '.rdoc')}.md"
 
-      file mark => [ rdoc, :setup ] do |t|
+      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))
@@ -203,7 +231,7 @@ namespace :convert do
 
       CLEAN.add mark
 
-      task run: [ mark ]
+      task run: [mark]
     end
   end
 
@@ -211,7 +239,7 @@ namespace :convert do
   task docs: 'convert:docs:run'
 end
 
-task 'deps:top', [ :number ] do |_, args|
+task 'deps:top', [:number] do |_, args|
   require 'net/http'
   require 'json'
 

data/lib/mime/type.rb

@@ -57,17 +57,17 @@ class MIME::Type
   end
 
   # The released version of the mime-types library.
-  VERSION = '3.2.2'
+  VERSION = '3.3'
 
   include Comparable
 
   # :stopdoc:
   # TODO verify mime-type character restrictions; I am pretty sure that this is
   # too wide open.
-  MEDIA_TYPE_RE    = %r{([-\w.+]+)/([-\w.+]*)}
-  I18N_RE          = %r{[^[:alnum:]]}
-  BINARY_ENCODINGS = %w(base64 8bit)
-  ASCII_ENCODINGS  = %w(7bit quoted-printable)
+  MEDIA_TYPE_RE    = %r{([-\w.+]+)/([-\w.+]*)}.freeze
+  I18N_RE          = /[^[:alnum:]]/.freeze
+  BINARY_ENCODINGS = %w(base64 8bit).freeze
+  ASCII_ENCODINGS  = %w(7bit quoted-printable).freeze
   # :startdoc:
 
   private_constant :MEDIA_TYPE_RE, :I18N_RE, :BINARY_ENCODINGS,
@@ -301,7 +301,7 @@ class MIME::Type
 
   # Returns the default encoding for the MIME::Type based on the media type.
   def default_encoding
-    (@media_type == 'text') ? 'quoted-printable' : 'base64'
+    @media_type == 'text' ? 'quoted-printable' : 'base64'
   end
 
   ##
@@ -321,7 +321,7 @@ class MIME::Type
 
   # Returns +true+ if the media type is obsolete.
   attr_accessor :obsolete
-  alias_method :obsolete?, :obsolete
+  alias obsolete? obsolete
 
   # The documentation for this MIME::Type.
   attr_accessor :docs
@@ -331,7 +331,7 @@ class MIME::Type
   # call-seq:
   #   text_plain.friendly         # => "Text File"
   #   text_plain.friendly('en')   # => "Text File"
-  def friendly(lang = 'en'.freeze)
+  def friendly(lang = 'en')
     @friendly ||= {}
 
     case lang
@@ -367,8 +367,8 @@ class MIME::Type
   attr_reader :xrefs
 
   ##
-  def xrefs=(x) # :nodoc:
-    @xrefs = MIME::Types::Container.new(x)
+  def xrefs=(xrefs) # :nodoc:
+    @xrefs = MIME::Types::Container.new(xrefs)
   end
 
   # The decoded cross-reference URL list for this MIME::Type.
@@ -381,7 +381,7 @@ class MIME::Type
 
   # Indicates whether the MIME type has been registered with IANA.
   attr_accessor :registered
-  alias_method :registered?, :registered
+  alias registered? registered
 
   # MIME types can be specified to be sent across a network in particular
   # formats. This method returns +true+ when the MIME::Type encoding is set
@@ -399,7 +399,7 @@ class MIME::Type
 
   # Indicateswhether the MIME type is declared as a signature type.
   attr_accessor :signature
-  alias_method :signature?, :signature
+  alias signature? signature
 
   # Returns +true+ if the MIME::Type specifies an extension list,
   # indicating that it is a complete MIME::Type.
@@ -438,17 +438,15 @@ class MIME::Type
   #
   # This method should be considered a private implementation detail.
   def encode_with(coder)
-    coder['content-type']        = @content_type
-    coder['docs']                = @docs unless @docs.nil? or @docs.empty?
-    unless @friendly.nil? or @friendly.empty?
-      coder['friendly']            = @friendly
-    end
-    coder['encoding']            = @encoding
-    coder['extensions']          = @extensions.to_a unless @extensions.empty?
+    coder['content-type'] = @content_type
+    coder['docs'] = @docs unless @docs.nil? or @docs.empty?
+    coder['friendly'] = @friendly unless @friendly.nil? or @friendly.empty?
+    coder['encoding'] = @encoding
+    coder['extensions'] = @extensions.to_a unless @extensions.empty?
     coder['preferred-extension'] = @preferred_extension if @preferred_extension
     if obsolete?
-      coder['obsolete']          = obsolete?
-      coder['use-instead']       = use_instead if use_instead
+      coder['obsolete'] = obsolete?
+      coder['use-instead'] = use_instead if use_instead
     end
     unless xrefs.empty?
       {}.tap do |hash|
@@ -458,8 +456,8 @@ class MIME::Type
         coder['xrefs'] = hash
       end
     end
-    coder['registered']          = registered?
-    coder['signature']           = signature? if signature?
+    coder['registered'] = registered?
+    coder['signature'] = signature? if signature?
     coder
   end
 
@@ -504,7 +502,7 @@ class MIME::Type
     # use with the I18n library.
     def i18n_key(content_type)
       simplify_matchdata(match(content_type), joiner: '.') { |e|
-        e.gsub!(I18N_RE, '-'.freeze)
+        e.gsub!(I18N_RE, '-')
       }
     end
 
@@ -521,12 +519,12 @@ class MIME::Type
 
     private
 
-    def simplify_matchdata(matchdata, remove_x = false, joiner: '/'.freeze)
+    def simplify_matchdata(matchdata, remove_x = false, joiner: '/')
       return nil unless matchdata
 
       matchdata.captures.map { |e|
         e.downcase!
-        e.sub!(%r{^x-}, ''.freeze) if remove_x
+        e.sub!(/^x-/, '') if remove_x
         yield e if block_given?
         e
       }.join(joiner)
@@ -539,11 +537,28 @@ class MIME::Type
     match = MEDIA_TYPE_RE.match(type_string)
     fail InvalidContentType, type_string if match.nil?
 
-    @content_type                  = type_string
+    @content_type                  = intern_string(type_string)
     @raw_media_type, @raw_sub_type = match.captures
-    @simplified                    = MIME::Type.simplified(match)
-    @i18n_key                      = MIME::Type.i18n_key(match)
+    @simplified                    = intern_string(MIME::Type.simplified(match))
+    @i18n_key                      = intern_string(MIME::Type.i18n_key(match))
     @media_type, @sub_type         = MEDIA_TYPE_RE.match(@simplified).captures
+
+    @raw_media_type = intern_string(@raw_media_type)
+    @raw_sub_type = intern_string(@raw_sub_type)
+    @media_type = intern_string(@media_type)
+    @sub_type = intern_string(@sub_type)
+  end
+
+  if String.method_defined?(:-@)
+    def intern_string(string)
+      -string
+    end
+  else
+    # MRI 2.2 and older don't have a method for string interning,
+    # so we simply freeze them for keeping a similar interface
+    def intern_string(string)
+      string.freeze
+    end
   end
 
   def xref_map(values, helper)
@@ -551,23 +566,22 @@ class MIME::Type
   end
 
   def xref_url_for_rfc(value)
-    'http://www.iana.org/go/%s'.freeze % value
+    'http://www.iana.org/go/%s' % value
   end
 
   def xref_url_for_draft(value)
-    'http://www.iana.org/go/%s'.freeze % value.sub(/\ARFC/, 'draft')
+    'http://www.iana.org/go/%s' % value.sub(/\ARFC/, 'draft')
   end
 
   def xref_url_for_rfc_errata(value)
-    'http://www.rfc-editor.org/errata_search.php?eid=%s'.freeze % value
+    'http://www.rfc-editor.org/errata_search.php?eid=%s' % value
   end
 
   def xref_url_for_person(value)
-    'http://www.iana.org/assignments/media-types/media-types.xhtml#%s'.freeze %
-      value
+    'http://www.iana.org/assignments/media-types/media-types.xhtml#%s' % value
   end
 
   def xref_url_for_template(value)
-    'http://www.iana.org/assignments/media-types/%s'.freeze % value
+    'http://www.iana.org/assignments/media-types/%s' % value
   end
 end

data/lib/mime/type/columnar.rb

@@ -20,7 +20,7 @@ class MIME::Type::Columnar < MIME::Type
   end
 
   def self.column(*methods, file: nil) # :nodoc:
-    file = methods.first unless file
+    file ||= methods.first
 
     file_method = :"load_#{file}"
     methods.each do |m|

data/lib/mime/types.rb

@@ -155,7 +155,7 @@ class MIME::Types
       a.priority_compare(b)
     }
   end
-  alias_method :of, :type_for
+  alias of type_for
 
   # Add one or more MIME::Type objects to the set of known types. If the
   # type is already known, a warning will be displayed.
@@ -185,9 +185,9 @@ class MIME::Types
   # truthy value to suppress that warning.
   def add_type(type, quiet = false)
     if !quiet and @type_variants[type.simplified].include?(type)
-      MIME::Types.logger.warn <<-warning
+      MIME::Types.logger.warn <<-WARNING
 Type #{type} is already registered as a variant of #{type.simplified}.
-      warning
+      WARNING
     end
 
     add_type_variant!(type)
@@ -202,6 +202,7 @@ Type #{type} is already registered as a variant of #{type.simplified}.
 
   def reindex_extensions!(mime_type)
     return unless @type_variants[mime_type.simplified].include?(mime_type)
+
     index_extensions!(mime_type)
   end
 

data/lib/mime/types/_columnar.rb

@@ -45,7 +45,7 @@ module MIME::Types::Columnar
       i = -1
       column = File.join(@__root__, "mime.#{name}.column")
 
-      IO.readlines(column, encoding: 'UTF-8'.freeze).each do |line|
+      IO.readlines(column, encoding: 'UTF-8').each do |line|
         line.chomp!
 
         if lookup
@@ -63,7 +63,6 @@ module MIME::Types::Columnar
   def load_encoding
     each_file_line('encoding') do |type, line|
       pool ||= {}
-      line.freeze
       type.instance_variable_set(:@encoding, (pool[line] ||= line))
     end
   end
@@ -108,11 +107,11 @@ module MIME::Types::Columnar
   end
 
   def dict(line, array: false)
-    if line == '-'.freeze
+    if line == '-'
       {}
     else
-      line.split('|'.freeze).each_with_object({}) { |l, h|
-        k, v = l.split('^'.freeze)
+      line.split('|').each_with_object({}) { |l, h|
+        k, v = l.split('^')
         v = nil if v.empty?
         h[k] = array ? Array(v) : v
       }
@@ -120,18 +119,18 @@ module MIME::Types::Columnar
   end
 
   def arr(line)
-    if line == '-'.freeze
+    if line == '-'
       []
     else
-      line.split('|'.freeze).flatten.compact.uniq
+      line.split('|').flatten.compact.uniq
     end
   end
 
   def opt(line)
-    line unless line == '-'.freeze
+    line unless line == '-'
   end
 
   def flag(line)
-    line == '1'.freeze ? true : false
+    line == '1'
   end
 end

data/lib/mime/types/cache.rb

@@ -22,16 +22,16 @@ class << MIME::Types::Cache
     if cache.version == MIME::Types::Data::VERSION
       Marshal.load(cache.data)
     else
-      MIME::Types.logger.warn <<-warning.chomp
+      MIME::Types.logger.warn <<-WARNING.chomp
 Could not load MIME::Types cache: invalid version
-      warning
+      WARNING
       nil
     end
   rescue => e
-    MIME::Types.logger.warn <<-warning.chomp
+    MIME::Types.logger.warn <<-WARNING.chomp
 Could not load MIME::Types cache: #{e}
-    warning
-    return nil
+    WARNING
+    nil
   end
 
   # Attempts to save the types provided to the cache file provided.

data/lib/mime/types/container.rb

@@ -22,12 +22,13 @@ class MIME::Types::Container #:nodoc:
   end
 
   def []=(key, value)
-    case value
-    when Set
-      container[key] = value
-    else
-      container[key] = Set[*value]
-    end
+    container[key] =
+      case value
+      when Set
+        value
+      else
+        Set[*value]
+      end
   end
 
   def merge(other)
@@ -37,7 +38,7 @@ class MIME::Types::Container #:nodoc:
   def merge!(other)
     tap {
       other = other.kind_of?(MIME::Types::Container) ? other.container : other
-      self.container.merge!(other)
+      container.merge!(other)
       normalize
     }
   end
@@ -85,6 +86,7 @@ class MIME::Types::Container #:nodoc:
   def normalize
     container.each do |k, v|
       next if v.kind_of?(Set)
+
       container[k] = Set[*v]
     end
   end

data/lib/mime/types/deprecations.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types/logger'
 
 # The namespace for MIME applications, tools, and libraries.

data/lib/mime/types/registry.rb

@@ -33,7 +33,7 @@ class << MIME::Types
   def type_for(filename)
     __types__.type_for(filename)
   end
-  alias_method :of, :type_for
+  alias of type_for
 
   # MIME::Types#add against the default MIME::Types registry.
   def add(*types)
@@ -43,13 +43,13 @@ class << MIME::Types
   private
 
   def lazy_load?
-    if ENV.key?('RUBY_MIME_TYPES_LAZY_LOAD')
-      MIME::Types.logger.warn <<-WARNING.chomp
+    return unless 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
+    WARNING
 
-      (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
-    end
+    (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
   end
 
   def __types__
@@ -63,7 +63,7 @@ Lazy loading ($RUBY_MIME_TYPES_LAZY_LOAD) is deprecated and will be removed.
   end
 
   def load_default_mime_types(mode = load_mode)
-    if @__types__ = MIME::Types::Cache.load
+    if (@__types__ = MIME::Types::Cache.load)
       __instances__.add(@__types__)
     else
       @__types__ = MIME::Types::Loader.load(mode)

data/test/minitest_helper.rb

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

data/test/test_mime_type.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
 describe MIME::Type do
-  # it { fail }
-
   def mime_type(content_type)
     MIME::Type.new(content_type) { |mt| yield mt if block_given? }
   end
@@ -333,8 +329,8 @@ describe MIME::Type do
     end
 
     it 'sorts (2) based on extensions' do
-      text_1.extensions = ["foo", "bar"]
-      text_2.extensions = ["foo"]
+      text_1.extensions = ['foo', 'bar']
+      text_2.extensions = ['foo']
 
       assert_priority_same text_1, text_2
 
@@ -476,7 +472,7 @@ describe MIME::Type do
 
   describe '#to_s, #to_str' do
     it 'represents itself as a string of the canonical content_type' do
-      assert_equal 'text/plain', "#{text_plain}"
+      assert_equal 'text/plain', "#{text_plain}" # rubocop:disable Style/UnneededInterpolation
     end
 
     it 'acts like a string of the canonical content_type for comparison' do
@@ -490,7 +486,7 @@ describe MIME::Type do
 
   describe '#xrefs, #xrefs=' do
     let(:expected) {
-      MIME::Types::Container.new({ 'rfc' => Set[*%w(rfc1234 rfc5678)] })
+      MIME::Types::Container.new('rfc' => Set['rfc1234', 'rfc5678'])
     }
 
     it 'returns the expected results' do
@@ -518,13 +514,13 @@ describe MIME::Type do
     let(:type) {
       mime_type('a/b').tap do |t|
         t.xrefs = {
-          'draft'      => [ 'RFC1' ],
-          'template'   => [ 'a/b' ],
-          'person'     => [ 'p-1' ],
-          'rfc'        => [ 'rfc-1' ],
-          'rfc-errata' => [ 'err-1' ],
-          'uri'        => [ 'http://example.org' ],
-          'text'       => [ 'text' ]
+          'draft' => ['RFC1'],
+          'template' => ['a/b'],
+          'person' => ['p-1'],
+          'rfc' => ['rfc-1'],
+          'rfc-errata' => ['err-1'],
+          'uri' => ['http://example.org'],
+          'text' => ['text']
         }
       end
     }
@@ -588,10 +584,10 @@ describe MIME::Type do
 
     it 'merges new values from an array parameter' do
       expected = { 'en' => 'Text files' }
-      assert_equal expected, text_plain.friendly([ 'en', 'Text files' ])
+      assert_equal expected, text_plain.friendly(['en', 'Text files'])
       expected.update('fr' => 'des fichiers texte')
       assert_equal expected,
-        text_plain.friendly([ 'fr', 'des fichiers texte' ])
+        text_plain.friendly(['fr', 'des fichiers texte'])
     end
 
     it 'merges new values from a hash parameter' do

data/test/test_mime_types.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
 describe MIME::Types do
   def mime_types
-    @mime_types ||= MIME::Types.new.tap do |mt|
+    @mime_types ||= MIME::Types.new.tap { |mt|
       mt.add MIME::Type.new(['text/plain', %w(txt)]),
         MIME::Type.new(['image/jpeg', %w(jpg jpeg)]),
         MIME::Type.new('application/x-wordperfect6.1'),
@@ -21,12 +19,12 @@ describe MIME::Types do
           'extensions' => 'gz',
           'registered' => true
         )
-    end
+    }
   end
 
   describe 'is enumerable' do
     it 'correctly uses an Enumerable method like #any?' do
-      assert mime_types.any? { |type| type.content_type == 'text/plain' }
+      assert(mime_types.any? { |type| type.content_type == 'text/plain' })
     end
 
     it 'implements each with no parameters to return an Enumerator' do
@@ -95,11 +93,11 @@ describe MIME::Types do
 
   describe '#add' do
     let(:eruby) { MIME::Type.new('application/x-eruby') }
-    let(:jinja) { MIME::Type.new('application/jinja2' )}
+    let(:jinja) { MIME::Type.new('application/jinja2') }
 
     it 'successfully adds a new type' do
       mime_types.add(eruby)
-      assert_equal mime_types['application/x-eruby'], [ eruby ]
+      assert_equal mime_types['application/x-eruby'], [eruby]
     end
 
     it 'complains about adding a duplicate type' do
@@ -115,13 +113,13 @@ describe MIME::Types do
       assert_output '', '' do
         mime_types.add(eruby, :silent)
       end
-      assert_equal mime_types['application/x-eruby'], [ eruby ]
+      assert_equal mime_types['application/x-eruby'], [eruby]
     end
 
     it 'successfully adds from an array' do
-      mime_types.add([ eruby, jinja ])
-      assert_equal mime_types['application/x-eruby'], [ eruby ]
-      assert_equal mime_types['application/jinja2'], [ jinja ]
+      mime_types.add([eruby, jinja])
+      assert_equal mime_types['application/x-eruby'], [eruby]
+      assert_equal mime_types['application/jinja2'], [jinja]
     end
 
     it 'successfully adds from another MIME::Types' do
@@ -130,7 +128,7 @@ describe MIME::Types do
       assert_equal mime_types.count, mt.count
 
       mime_types.each do |type|
-        assert_equal mt[type.content_type], [ type ]
+        assert_equal mt[type.content_type], [type]
       end
     end
   end

data/test/test_mime_types_cache.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
@@ -69,7 +67,7 @@ describe MIME::Types::Cache do
     it 'outputs an error when there is a marshal file incompatibility' do
       MIME::Types::Cache.save
       data = File.binread(@cache_file).reverse
-      File.open(@cache_file, 'wb') { |f| f.write(data) }
+      File.open(@cache_file, 'wb') do |f| f.write(data) end
       MIME::Types.instance_variable_set(:@__types__, nil)
       assert_output '', /incompatible marshal file format/ do
         MIME::Types['text/html']

data/test/test_mime_types_class.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
@@ -12,7 +10,7 @@ describe MIME::Types, 'registry' do
 
   describe 'is enumerable' do
     it 'correctly uses an Enumerable method like #any?' do
-      assert MIME::Types.any? { |type| type.content_type == 'text/plain' }
+      assert(MIME::Types.any? { |type| type.content_type == 'text/plain' })
     end
 
     it 'implements each with no parameters to return an Enumerator' do
@@ -45,7 +43,7 @@ describe MIME::Types, 'registry' do
 
     it 'sorts by priority with multiple matches' do
       types = MIME::Types[/gzip$/].select { |t|
-        t == 'application/gzip' || t == 'application/x-gzip' || t == 'multipart/x-gzip'
+        %w(application/gzip application/x-gzip multipart/x-gzip).include?(t)
       }
       # This is this way because of a new type ending with gzip that only
       # appears in some data files.
@@ -117,11 +115,11 @@ describe MIME::Types, 'registry' do
     end
 
     let(:eruby) { MIME::Type.new('application/x-eruby') }
-    let(:jinja) { MIME::Type.new('application/jinja2' )}
+    let(:jinja) { MIME::Type.new('application/jinja2') }
 
     it 'successfully adds a new type' do
       MIME::Types.add(eruby)
-      assert_equal MIME::Types['application/x-eruby'], [ eruby ]
+      assert_equal MIME::Types['application/x-eruby'], [eruby]
     end
 
     it 'complains about adding a duplicate type' do
@@ -137,13 +135,13 @@ describe MIME::Types, 'registry' do
       assert_silent do
         MIME::Types.add(eruby, :silent)
       end
-      assert_equal MIME::Types['application/x-eruby'], [ eruby ]
+      assert_equal MIME::Types['application/x-eruby'], [eruby]
     end
 
     it 'successfully adds from an array' do
-      MIME::Types.add([ eruby, jinja ])
-      assert_equal MIME::Types['application/x-eruby'], [ eruby ]
-      assert_equal MIME::Types['application/jinja2'], [ jinja ]
+      MIME::Types.add([eruby, jinja])
+      assert_equal MIME::Types['application/x-eruby'], [eruby]
+      assert_equal MIME::Types['application/jinja2'], [jinja]
     end
 
     it 'successfully adds from another MIME::Types' do
@@ -155,7 +153,7 @@ describe MIME::Types, 'registry' do
       MIME::Types.add(mt)
       assert_equal old_count + 1, MIME::Types.count
 
-      assert_equal MIME::Types[eruby.content_type], [ eruby ]
+      assert_equal MIME::Types[eruby.content_type], [eruby]
     end
   end
 end

data/test/test_mime_types_lazy.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 

data/test/test_mime_types_loader.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 require 'mime/types'
 require 'minitest_helper'
 
@@ -18,7 +16,7 @@ describe MIME::Types::Loader do
     refute(types['audio/webm'].first.registered?)
 
     assert_equal('Fixes a bug with IE6 and progressive JPEGs',
-                 types['image/pjpeg'].first.docs)
+      types['image/pjpeg'].first.docs)
 
     assert(types['audio/vnd.qcelp'].first.obsolete?)
     assert_equal('audio/QCELP', types['audio/vnd.qcelp'].first.use_instead)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: '3.3'
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types-data
@@ -235,7 +235,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -245,21 +245,21 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
 description: |-
   The mime-types library provides a library and registry for information about
   MIME content type definitions. It can be used to determine defined filename
@@ -337,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The mime-types library provides a library and registry for information about