mime-types 3.3.1 → 3.7.0

data/lib/mime/types/version.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+##
+module MIME
+  class Types
+    # The released version of the mime-types library.
+    VERSION = "3.7.0"
+  end
+
+  class Type
+    # The released version of the mime-types library.
+    VERSION = MIME::Types::VERSION
+  end
+end

data/lib/mime/types.rb

@@ -7,7 +7,7 @@ module MIME
   end
 end
 
-require 'mime/type'
+require "mime/type"
 
 # MIME::Types is a registry of MIME types. It is both a class (created with
 # MIME::Types.new) and a default registry (loaded automatically or through
@@ -61,19 +61,17 @@ require 'mime/type'
 #  puts plaintext.ascii?                # => true
 #  puts plaintext.obsolete?             # => false
 #  puts plaintext.registered?           # => true
+#  puts plaintext.provisional?          # => false
 #  puts plaintext == 'text/plain'       # => true
 #  puts MIME::Type.simplified('x-appl/x-zip') # => 'appl/zip'
 #
 class MIME::Types
-  # The release version of Ruby MIME::Types
-  VERSION = MIME::Type::VERSION
-
   include Enumerable
 
   # Creates a new MIME::Types registry.
   def initialize
-    @type_variants    = Container.new
-    @extension_index  = Container.new
+    @type_variants = Container.new
+    @extension_index = Container.new
   end
 
   # Returns the number of known type variants.
@@ -122,18 +120,17 @@ class MIME::Types
   #   5. Obsolete definitions use-instead clauses are compared.
   #   6. Sort on name.
   def [](type_id, complete: false, registered: false)
-    matches = case type_id
-              when MIME::Type
-                @type_variants[type_id.simplified]
-              when Regexp
-                match(type_id)
-              else
-                @type_variants[MIME::Type.simplified(type_id)]
-              end
-
-    prune_matches(matches, complete, registered).sort { |a, b|
-      a.priority_compare(b)
-    }
+    matches =
+      case type_id
+      when MIME::Type
+        @type_variants[type_id.simplified]
+      when Regexp
+        match(type_id)
+      else
+        @type_variants[MIME::Type.simplified(type_id)]
+      end
+
+    prune_matches(matches, complete, registered).sort
   end
 
   # Return the list of MIME::Types which belongs to the file based on its
@@ -149,13 +146,17 @@ class MIME::Types
   #   puts MIME::Types.type_for(%w(citydesk.xml citydesk.gif))
   #     => [application/xml, image/gif, text/xml]
   def type_for(filename)
-    Array(filename).flat_map { |fn|
-      @extension_index[fn.chomp.downcase[/\.?([^.]*?)$/, 1]]
-    }.compact.inject(Set.new, :+).sort { |a, b|
-      a.priority_compare(b)
+    wanted = Array(filename).map { |fn| fn.chomp.downcase[/\.?([^.]*?)\z/m, 1] }
+
+    wanted
+      .flat_map { |ext| @extension_index[ext] }
+      .compact
+      .reduce(Set.new, :+)
+      .sort { |a, b|
+      a.__extension_priority_compare(b, wanted)
     }
   end
-  alias of type_for
+  alias_method :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.
@@ -163,7 +164,7 @@ class MIME::Types
   # The last parameter may be the value <tt>:silent</tt> or +true+ which
   # will suppress duplicate MIME type warnings.
   def add(*types)
-    quiet = ((types.last == :silent) or (types.last == true))
+    quiet = (types.last == :silent) || (types.last == true)
 
     types.each do |mime_type|
       case mime_type
@@ -184,9 +185,9 @@ class MIME::Types
   # already known, a warning will be displayed. The +quiet+ parameter may be a
   # 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
-Type #{type} is already registered as a variant of #{type.simplified}.
+    if !quiet && @type_variants[type.simplified].include?(type)
+      MIME::Types.logger.debug <<-WARNING.chomp.strip
+        Type #{type} is already registered as a variant of #{type.simplified}.
       WARNING
     end
 
@@ -194,6 +195,10 @@ Type #{type} is already registered as a variant of #{type.simplified}.
     index_extensions!(type)
   end
 
+  def __fully_loaded? # :nodoc:
+    true
+  end
+
   private
 
   def add_type_variant!(mime_type)
@@ -221,11 +226,18 @@ Type #{type} is already registered as a variant of #{type.simplified}.
       k =~ pattern
     }.values.inject(Set.new, :+)
   end
+
+  # def stable_sort(list)
+  #   list.lazy.each_with_index.sort { |(a, ai), (b, bi)|
+  #     a.priority_compare(b).nonzero? || ai <=> bi
+  #   }.map(&:first)
+  # end
 end
 
-require 'mime/types/cache'
-require 'mime/types/container'
-require 'mime/types/loader'
-require 'mime/types/logger'
-require 'mime/types/_columnar'
-require 'mime/types/registry'
+require "mime/types/cache"
+require "mime/types/container"
+require "mime/types/loader"
+require "mime/types/logger"
+require "mime/types/_columnar"
+require "mime/types/registry"
+require "mime/types/version"

data/lib/mime-types.rb

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

data/test/minitest_helper.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'mime/type'
-require 'fileutils'
+gem "minitest"
+require "minitest/focus"
+require "minitest/hooks"
 
-gem 'minitest'
-require 'fivemat/minitest/autorun'
-require 'minitest/focus'
-require 'minitest/rg'
-require 'minitest-bonus-assertions'
-require 'minitest/hooks'
+require "fileutils"
 
-ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
+require "mime/type"
+ENV["RUBY_MIME_TYPES_LAZY_LOAD"] = "yes"