mime-types 3.2.1 → 3.4.0

data/lib/mime/types/container.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'set'
-require 'forwardable'
+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
@@ -9,7 +9,7 @@ require 'forwardable'
 # 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:
+class MIME::Types::Container # :nodoc:
   extend Forwardable
 
   def initialize(hash = {})
@@ -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)
@@ -36,8 +37,8 @@ class MIME::Types::Container #:nodoc:
 
   def merge!(other)
     tap {
-      other = other.kind_of?(MIME::Types::Container) ? other.container : other
-      self.container.merge!(other)
+      other = other.is_a?(MIME::Types::Container) ? other.container : other
+      container.merge!(other)
       normalize
     }
   end
@@ -70,7 +71,6 @@ class MIME::Types::Container #:nodoc:
   end
 
   def encode_with(coder)
-    debugger
     container.each { |k, v| coder[k] = v.to_a }
   end
 
@@ -85,7 +85,8 @@ class MIME::Types::Container #:nodoc:
 
   def normalize
     container.each do |k, v|
-      next if v.kind_of?(Set)
+      next if v.is_a?(Set)
+
       container[k] = Set[*v]
     end
   end

data/lib/mime/types/deprecations.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
-require 'mime/types/logger'
+require "mime/types/logger"
 
 # The namespace for MIME applications, tools, and libraries.
 module MIME
@@ -10,25 +8,29 @@ module MIME
   class Types
     # Used to mark a method as deprecated in the mime-types interface.
     def self.deprecated(klass, sym, message = nil, &block) # :nodoc:
-      level = case klass
+      level =
+        case klass
               when Class, Module
-                '.'
+                "."
               else
                 klass = klass.class
-                '#'
-              end
-      message = case message
+                "#"
+        end
+      message =
+        case message
                 when :private, :protected
                   "and will be #{message}"
                 when nil
-                  'and will be removed'
+                  "and will be removed"
                 else
                   message
-                end
-      MIME::Types.logger.warn <<-WARNING.chomp
-#{caller[1]}: #{klass}#{level}#{sym} is deprecated #{message}.
+        end
+      MIME::Types.logger.warn <<~WARNING.chomp
+        #{caller(2..2).first}: #{klass}#{level}#{sym} is deprecated #{message}.
       WARNING
-      block.call if block
+
+      return unless block
+      block.call
     end
   end
 end

data/lib/mime/types/full.rb

@@ -9,11 +9,11 @@ module MIME
         private
 
         def load_mode
-          { columnar: false }
+          {columnar: false}
         end
       end
     end
   end
 end
 
-require 'mime/types'
+require "mime/types"

data/lib/mime/types/loader.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
 ##
 module MIME; end
+
 ##
 class MIME::Types; end
 
-require 'mime/types/data'
+require "mime/types/data"
 
 # This class is responsible for initializing the MIME::Types registry from
 # the data files supplied with the mime-types library.
@@ -30,7 +29,7 @@ class MIME::Types::Loader
   # Creates a Loader object that can be used to load MIME::Types registries
   # into memory, using YAML, JSON, or Columnar registry format loaders.
   def initialize(path = nil, container = nil)
-    path = path || ENV['RUBY_MIME_TYPES_DATA'] || MIME::Types::Data::PATH
+    path = path || ENV["RUBY_MIME_TYPES_DATA"] || MIME::Types::Data::PATH
     @container = container || MIME::Types.new
     @path = File.expand_path(path)
   end
@@ -68,7 +67,7 @@ class MIME::Types::Loader
   # Loads a MIME::Types registry from columnar files recursively found in
   # +path+.
   def load_columnar
-    require 'mime/types/columnar' unless defined?(MIME::Types::Columnar)
+    require "mime/types/columnar" unless defined?(MIME::Types::Columnar)
     container.extend(MIME::Types::Columnar)
     container.load_base_data(path)
 
@@ -80,7 +79,7 @@ class MIME::Types::Loader
   #
   # This will load from columnar files (#load_columnar) if <tt>columnar:
   # true</tt> is provided in +options+ and there are columnar files in +path+.
-  def load(options = { columnar: false })
+  def load(options = {columnar: false})
     if options[:columnar] && !Dir[columnar_path].empty?
       load_columnar
     else
@@ -90,7 +89,7 @@ class MIME::Types::Loader
 
   class << self
     # Loads the default MIME::Type registry.
-    def load(options = { columnar: false })
+    def load(options = {columnar: false})
       new.load(options)
     end
 
@@ -105,12 +104,18 @@ class MIME::Types::Loader
     # NOTE: The purpose of this format is purely for maintenance reasons.
     def load_from_yaml(filename)
       begin
-        require 'psych'
+        require "psych"
       rescue LoadError
         nil
       end
-      require 'yaml'
-      YAML.load(read_file(filename))
+
+      require "yaml"
+
+      if old_yaml?
+        YAML.safe_load(read_file(filename), [MIME::Type])
+      else
+        YAML.safe_load(read_file(filename), permitted_classes: [MIME::Type])
+      end
     end
 
     # Loads MIME::Types from a single JSON file.
@@ -119,28 +124,36 @@ class MIME::Types::Loader
     # The JSON format is the registry format for the MIME types registry
     # shipped with the mime-types library.
     def load_from_json(filename)
-      require 'json'
+      require "json"
       JSON.parse(read_file(filename)).map { |type| MIME::Type.new(type) }
     end
 
     private
 
     def read_file(filename)
-      File.open(filename, 'r:UTF-8:-', &:read)
+      File.open(filename, "r:UTF-8:-", &:read)
+    end
+
+    def old_yaml?
+      @old_yaml ||=
+        begin
+          require "rubygems/version"
+          Gem::Version.new(YAML::VERSION) < Gem::Version.new("3.1")
+        end
     end
   end
 
   private
 
   def yaml_path
-    File.join(path, '*.y{,a}ml')
+    File.join(path, "*.y{,a}ml")
   end
 
   def json_path
-    File.join(path, '*.json')
+    File.join(path, "*.json")
   end
 
   def columnar_path
-    File.join(path, '*.column')
+    File.join(path, "*.column")
   end
 end

data/lib/mime/types/logger.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
-
-require 'logger'
+require "logger"
 
 ##
 module MIME
@@ -14,8 +12,8 @@ module MIME
       attr_accessor :logger
     end
 
-    class WarnLogger < ::Logger #:nodoc:
-      class WarnLogDevice < ::Logger::LogDevice #:nodoc:
+    class WarnLogger < ::Logger # :nodoc:
+      class WarnLogDevice < ::Logger::LogDevice # :nodoc:
         def initialize(*)
         end
 
@@ -27,7 +25,7 @@ module MIME
         end
       end
 
-      def initialize(_1, _2 = nil, _3 = nil)
+      def initialize(_one, _two = nil, _three = nil)
         super nil
         @logdev = WarnLogDevice.new
         @formatter = ->(_s, _d, _p, m) { m }

data/lib/mime/types/registry.rb

@@ -43,27 +43,27 @@ class << MIME::Types
   private
 
   def lazy_load?
-    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
+    return unless ENV.key?("RUBY_MIME_TYPES_LAZY_LOAD")
 
-      (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
-    end
+    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
 
   def __types__
-    (defined?(@__types__) and @__types__) or load_default_mime_types
+    (defined?(@__types__) && @__types__) || load_default_mime_types
   end
 
   unless private_method_defined?(:load_mode)
     def load_mode
-      { columnar: true }
+      {columnar: true}
     end
   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/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,6 +61,7 @@ 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'
 #
@@ -72,8 +73,8 @@ class MIME::Types
 
   # 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,14 +123,15 @@ 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
+    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
+      end
 
     prune_matches(matches, complete, registered).sort { |a, b|
       a.priority_compare(b)
@@ -163,7 +165,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,10 +186,10 @@ 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}.
-      warning
+    if !quiet && @type_variants[type.simplified].include?(type)
+      MIME::Types.logger.warn <<~WARNING
+        Type #{type} is already registered as a variant of #{type.simplified}.
+      WARNING
     end
 
     add_type_variant!(type)
@@ -202,6 +204,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
 
@@ -222,9 +225,9 @@ Type #{type} is already registered as a variant of #{type.simplified}.
   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"

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,15 +1,11 @@
 # frozen_string_literal: true
 
-# -*- ruby encoding: utf-8 -*-
+require "mime/type"
+require "fileutils"
 
-require 'mime/type'
-require 'fileutils'
+gem "minitest"
+require "minitest/focus"
+require "minitest-bonus-assertions"
+require "minitest/hooks"
 
-gem 'minitest'
-require 'fivemat/minitest/autorun'
-require 'minitest/focus'
-require 'minitest/rg'
-require 'minitest-bonus-assertions'
-require 'minitest/hooks'
-
-ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
+ENV["RUBY_MIME_TYPES_LAZY_LOAD"] = "yes"