mime-types 1.24 → 1.25

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjkzNjc3YzY2ZTY3YTU2MDhkYjE3MzQ0MThmZWI0NjU5NWEzMDA1Mg==
+  data.tar.gz: !binary |-
+    MzY2ZmU2Nzc4YzNhZjJiMTYzNjc0ODdiMzc2NjE3NzQ1MTk3YzE5ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZmU3NTI2ZDQ3MjdlNWQ2YWYwNjNkNDkwNDEyNGYzZGRiZTYyMjNjMzY1MTQw
+    MjIxZmFkZmRhNTNmNmJhNWZmYWExZjllYWMxOWZjZjFmZGI1ODc4MTZiOGEz
+    YWI2NGVjNjAyNmIyYzI5MTc0MzNjNjJiMDRlZDdkN2I1NzVhNGE=
+  data.tar.gz: !binary |-
+    Nzk0Mjg1NWViZTRkZWRjNzliZmY4OTFlOTQ3ODgxYjI2MWJjY2IzNTg5NDlk
+    Nzc5OGY3MTY0NDA1Y2Q5ZjUwYzQ1YzRkZmE1N2M2MWEwMjVkNDMzMjFmZmVi
+    YjJkY2U0MzMzM2QwYjg0ZDNhODlhNDQ4OTMxOTZiN2Y0MjRjZDY=

data/.travis.yml

@@ -17,8 +17,8 @@ rvm:
   - rbx-19mode
   - rbx-18mode
   - ree
-  - ruby-head
-  - jruby-head
+# - ruby-head
+# - jruby-head
 matrix:
   allow_failures:
     - rvm:

data/Contributing.rdoc

@@ -57,12 +57,13 @@ Here's the most direct way to get your work merged into the project:
 
 Thanks to everyone else who has contributed to MIME::Types:
 
-*  Andre Pankratz
-*  Mauricio Linhares
-*  Richard Hirner
-*  Todd Carrico
-*  Garret Alfert
-*  Hans de Graaff
-*  Henrik Hodne
-*  Martin d'Allens
-*  cgat
+* Andre Pankratz
+* Mauricio Linhares
+* Richard Hirner
+* Todd Carrico
+* Garret Alfert
+* Hans de Graaff
+* Henrik Hodne
+* Martin d'Allens
+* cgat
+* Greg Brockman

data/History.rdoc

@@ -1,3 +1,17 @@
+== 1.25 / 2013-08-30
+
+* New Features:
+  * Adding lazy loading and caching functionality to the default data based on
+    work done by Greg Brockman (gdb).
+* Bugs:
+  * Force the default internal application encoding to be used when reading the
+    MIME types database. Based on a change by briangamble, found in the rapid7
+    fork.
+* New extensions:
+  * mjpeg (video/x-motion-jpeg) based on a change by punkrats, found in the
+    vidibus fork.
+* Modernized MiniTest configuration.
+
 == 1.24 / 2013-08-14
 
 * Code Climate:

data/Manifest.txt

@@ -38,3 +38,5 @@ lib/mime/types/video.nonstandard
 lib/mime/types/video.obsolete
 test/test_mime_type.rb
 test/test_mime_types.rb
+test/test_mime_types_cache.rb
+test/test_mime_types_lazy.rb

data/README.rdoc

@@ -10,8 +10,34 @@ continuous integration :: {<img src="https://travis-ci.org/halostatue/mime-types
 == Description
 
 This library allows for the identification of a file's likely MIME content
-type. This is release 1.24, adding and updating a few MIME types and fixing
-some issues with documentation.
+type. This is release 1.25, adding experimental caching and lazy loading
+functionality.
+
+The caching and lazy loading features were initially implemented by Greg
+Brockman (gdb). As these features are experimental, they are disabled by
+default and must be enabled through the use of environment variables. The cache
+is invalidated on a per-version basis; the cache for version 1.25 will not be
+reused for version 1.26.
+
+To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
+to any value other than 'false'. When using lazy loading, the initial startup
+of MIME::Types is around 12–25× faster than normal startup (on my system,
+normal startup is about 90 ms; lazy startup is about 4 ms). This isn't
+generally useful, however, as the MIME::Types database has not been loaded.
+Lazy startup and load is just *slightly* faster—around 1 ms. The real advantage
+comes from using the cache.
+
+To enable the cache, set the environment variable +RUBY_MIME_TYPES_CACHE+ to a
+filename where MIME::Types will have read-write access. The first time a new
+version of MIME::Types is run using this file, it will be created, taking a
+little longer than normal. Subsequent loads using the same cache file will be
+approximately 3½× faster (25 ms) than normal loads. This can be combined with
++RUBY_MIME_TYPES_LAZY_LOAD+, but this is *not* recommended in a multithreaded
+or multiprocess environment where all threads or processes will be using the
+same cache file.
+
+As the caching interface is still experimental, the only values cached are the
+default MIME::Types database, not any custom MIME::Types added by users.
 
 MIME types are used in MIME-compliant communications, as in e-mail or HTTP
 traffic, to indicate the type of content which is transmitted. MIME::Types

data/Rakefile

@@ -33,6 +33,46 @@ spec = Hoe.spec 'mime-types' do
   self.extra_dev_deps << ['rake', '~> 10.0']
 end
 
+def reload_mime_types(repeats = 1, force_load = false)
+  repeats.times {
+    Object.send(:remove_const, :MIME) if defined? MIME
+    load 'lib/mime/types.rb'
+    MIME::Types.send(:__types__) if force_load
+  }
+end
+
+desc 'Benchmark'
+task :benchmark, :repeats do |t, args|
+  repeats = args.repeats.to_i
+  repeats = 50 if repeats.zero?
+  require 'benchmark'
+  $LOAD_PATH.unshift 'lib'
+
+  cache_file = File.expand_path('../cache.mtx', __FILE__)
+  rm cache_file if File.exist? cache_file
+
+  Benchmark.bm(17) do |x|
+    x.report("Normal:") { reload_mime_types repeats }
+
+    ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
+    x.report("Lazy:") { reload_mime_types repeats }
+    x.report("Lazy+Load:") { reload_mime_types repeats, true }
+
+    ENV.delete('RUBY_MIME_TYPES_LAZY_LOAD')
+
+    ENV['RUBY_MIME_TYPES_CACHE'] = cache_file
+    reload_mime_types
+
+    x.report("Cached:") { reload_mime_types repeats }
+    ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'yes'
+    x.report("Lazy Cached:") { reload_mime_types repeats }
+    x.report("Lazy Cached Load:") { reload_mime_types repeats, true }
+
+  end
+
+  rm cache_file
+end
+
 namespace :mime do
   desc "Download the current MIME type registrations from IANA."
   task :iana, :save, :destination do |t, args|

data/lib/mime/types.rb

@@ -33,7 +33,7 @@ module MIME
   #
   class Type
     # The released version of Ruby MIME::Types
-    VERSION = '1.24'
+    VERSION = '1.25'
 
     include Comparable
 
@@ -557,28 +557,39 @@ module MIME
   # ftp://ftp.iana.org/assignments/media-types with some unofficial types
   # added from the the collection at
   # http://www.ltsw.se/knbase/internet/mime.htp
-  #
-  # This is originally based on Perl MIME::Types by Mark Overmeer.
-  #
-  # = Author
-  # Copyright:: Copyright 2002–2013 by Austin Ziegler
-  #             <austin@rubyforge.org>
-  # Version::   1.20.1
-  # Licence::   See Licence.rdoc
-  # See Also::  http://www.iana.org/assignments/media-types/
-  #             http://www.ltsw.se/knbase/internet/mime.htp
-  #
   class Types
     # The released version of Ruby MIME::Types
-    VERSION = MIME::Type::VERSION
+    VERSION      = MIME::Type::VERSION
+    DATA_VERSION = (VERSION.to_f * 100).to_i
 
-      # The data version.
+    # The data version.
     attr_reader :data_version
 
-    def initialize(data_version = nil)
-      @type_variants    = Hash.new { |h, k| h[k] = [] }
-      @extension_index  = Hash.new { |h, k| h[k] = [] }
-      @data_version = data_version
+    class HashWithArrayDefault < Hash # :nodoc:
+      def initialize
+        super { |h, k| h[k] = [] }
+      end
+
+      def marshal_dump
+        {}.merge(self)
+      end
+
+      def marshal_load(hash)
+        self.merge!(hash)
+      end
+    end
+
+    class CacheContainer # :nodoc:
+      attr_reader :version, :data
+      def initialize(version, data)
+        @version, @data = version, data
+      end
+    end
+
+    def initialize(data_version = DATA_VERSION)
+      @type_variants    = HashWithArrayDefault.new
+      @extension_index  = HashWithArrayDefault.new
+      @data_version     = data_version
     end
 
     def add_type_variant(mime_type) #:nodoc:
@@ -592,19 +603,19 @@ module MIME
     def defined_types #:nodoc:
       @type_variants.values.flatten
     end
-  
+
     # Returns the number of known types. A shortcut of MIME::Types[//].size.
     # (Keep in mind that this is memory intensive, cache the result to spare
     # resources)
     def count
       defined_types.size
     end
-  
+
     def each
      defined_types.each { |t| yield t }
     end
 
-    @__types__ = self.new(VERSION)
+    @__types__  = nil
 
     # Returns a list of MIME::Type objects, which may be empty. The optional
     # flag parameters are :complete (finds only complete MIME::Type objects)
@@ -633,22 +644,16 @@ module MIME
     #   6. Obsolete definitions use-instead clauses are compared.
     #   7. Sort on name.
     def [](type_id, flags = {})
-      if type_id.kind_of?(Regexp)
-        matches = []
-        @type_variants.each_key do |k|
-          matches << @type_variants[k] if k =~ type_id
-        end
-        matches.flatten!
-      elsif type_id.kind_of?(MIME::Type)
-        matches = [type_id]
-      else
-        matches = @type_variants[MIME::Type.simplified(type_id)]
-      end
+      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
 
-      matches.delete_if { |e| not e.complete? } if flags[:complete]
-      matches.delete_if { |e| not e.platform? } if flags[:platform]
-
-      matches.sort { |a, b| a.priority_compare(b) }
+      prune_matches(matches, flags).sort { |a, b| a.priority_compare(b) }
     end
 
     # Return the list of MIME::Types which belongs to the file based on its
@@ -686,7 +691,7 @@ module MIME
         else
           if @type_variants.include?(mime_type.simplified)
             if @type_variants[mime_type.simplified].include?(mime_type)
-              warn "Type #{mime_type} already registered as a variant of #{mime_type.simplified}." unless defined? MIME::Types::STARTUP
+              warn "Type #{mime_type} already registered as a variant of #{mime_type.simplified}." unless defined? MIME::Types::LOAD
             end
           end
           add_type_variant(mime_type)
@@ -695,13 +700,29 @@ module MIME
       end
     end
 
+    private
+    def prune_matches(matches, flags)
+      matches.delete_if { |e| not e.complete? } if flags[:complete]
+      matches.delete_if { |e| not e.platform? } if flags[:platform]
+      matches
+    end
+
+    def match(pattern)
+      matches = @type_variants.select { |k, v| k =~ pattern }
+      if matches.respond_to? :values
+        matches.values.flatten
+      else
+        matches.map { |m| m.last }.flatten
+      end
+    end
+
     class << self
       def add_type_variant(mime_type) #:nodoc:
-        @__types__.add_type_variant(mime_type)
+        __types__.add_type_variant(mime_type)
       end
 
       def index_extensions(mime_type) #:nodoc:
-        @__types__.index_extensions(mime_type)
+        __types__.index_extensions(mime_type)
       end
 
       # The regular expression used to match a file-based MIME type
@@ -760,7 +781,7 @@ module MIME
       # be provided.
       def load_from_file(filename) #:nodoc:
         if defined? ::Encoding
-          data = File.open(filename, 'r:UTF-8') { |f| f.read }
+          data = File.open(filename, 'r:UTF-8:-') { |f| f.read }
         else
           data = File.open(filename) { |f| f.read }
         end
@@ -824,17 +845,17 @@ module MIME
       #     puts t.to_a.join(", ")
       #   end
       def [](type_id, flags = {})
-        @__types__[type_id, flags]
+        __types__[type_id, flags]
       end
 
       include Enumerable
-  
+
       def count
-        @__types__.count
+        __types__.count
       end
 
       def each
-        @__types__.each {|t| yield t }
+        __types__.each {|t| yield t }
       end
 
       # Return the list of MIME::Types which belongs to the file based on
@@ -848,12 +869,12 @@ module MIME
       #   puts "MIME::Types.type_for('citydesk.gif')
       #     => [image/gif]
       def type_for(filename, platform = false)
-        @__types__.type_for(filename, platform)
+        __types__.type_for(filename, platform)
       end
 
       # A synonym for MIME::Types.type_for
       def of(filename, platform = false)
-        @__types__.type_for(filename, platform)
+        __types__.type_for(filename, platform)
       end
 
       # Add one or more MIME::Type objects to the set of known types. Each
@@ -863,14 +884,82 @@ module MIME
       # <strong>Please inform the maintainer of this module when registered
       # types are missing.</strong>
       def add(*types)
-        @__types__.add(*types)
+        __types__.add(*types)
+      end
+
+      # Returns the currently defined cache file, if any.
+      def cache_file
+        ENV['RUBY_MIME_TYPES_CACHE']
+      end
+
+      private
+      def load_mime_types_from_cache
+        load_mime_types_from_cache! if cache_file
+      end
+
+      def load_mime_types_from_cache!
+        raise ArgumentError, "No RUBY_MIME_TYPES_CACHE set." unless cache_file
+        return false unless File.exists? cache_file
+
+        begin
+          data      = File.read(cache_file)
+          container = Marshal.load(data)
+
+          if container.version == VERSION
+            @__types__ = Marshal.load(container.data)
+            true
+          else
+            false
+          end
+        rescue => e
+          warn "Could not load MIME::Types cache: #{e}"
+          false
+        end
+      end
+
+      def write_mime_types_to_cache
+        write_mime_types_to_cache! if cache_file
+      end
+
+      def write_mime_types_to_cache!
+        raise ArgumentError, "No RUBY_MIME_TYPES_CACHE set." unless cache_file
+
+        File.open(cache_file, 'w') do |f|
+          cache = MIME::Types::CacheContainer.new(VERSION,
+                                                  Marshal.dump(__types__))
+          f.write Marshal.dump(cache)
+        end
+
+        true
+      end
+
+      def load_and_parse_mime_types
+        const_set(:LOAD, true) unless $DEBUG
+        Dir[File.join(File.dirname(__FILE__), 'types', '*')].sort.each { |f|
+          add(load_from_file(f))
+        }
+        remove_const :LOAD if defined? LOAD
+      end
+
+      def lazy_load?
+        (lazy = ENV['RUBY_MIME_TYPES_LAZY_LOAD']) && (lazy != 'false')
+      end
+
+      def __types__
+        load_mime_types unless @__types__
+        @__types__
+      end
+
+      def load_mime_types
+        @__types__ = new(VERSION)
+        unless load_mime_types_from_cache
+          load_and_parse_mime_types
+          write_mime_types_to_cache
+        end
       end
     end
 
-    files = Dir[File.join(File.dirname(__FILE__), 'types', '*')]
-    MIME::Types::STARTUP = true unless $DEBUG
-    files.sort.each { |file| add load_from_file(file) }
-    remove_const :STARTUP if defined? STARTUP
+    load_mime_types unless lazy_load?
   end
 end
 

data/lib/mime/types/video.nonstandard

@@ -5,7 +5,7 @@ video/x-flv @flv :base64
 video/x-gl @gl :base64
 video/x-ivf @ivf
 video/x-matroska @mkv
-video/x-motion-jpeg @mjpg
+video/x-motion-jpeg @mjpg,mjpeg
 video/x-ms-asf @asf,asx
 video/x-ms-wm @wm
 video/x-ms-wmv @wmv

data/test/test_mime_type.rb

@@ -1,11 +1,8 @@
 # -*- ruby encoding: utf-8 -*-
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-
 require 'mime/types'
-require 'minitest/autorun'
 
-class TestMIME_Type < MiniTest::Unit::TestCase
+class TestMIMEType < Minitest::Test
   def yaml_mime_type_from_array
     MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'd9d172f608')
   end

data/test/test_mime_types.rb

@@ -1,10 +1,13 @@
 # -*- ruby encoding: utf-8 -*-
 
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0
-
 require 'mime/types'
 
-class TestMIME_Types < MiniTest::Unit::TestCase #:nodoc:
+class TestMIMETypes < Minitest::Test
+  def setup
+    MIME::Types.instance_variable_set(:@__types__, nil)
+    MIME::Types.send(:load_mime_types)
+  end
+
   def test_class_index_1
     text_plain = MIME::Type.new('text/plain') do |t|
       t.encoding = '8bit'

data/test/test_mime_types_cache.rb

@@ -0,0 +1,77 @@
+# -*- ruby encoding: utf-8 -*-
+
+require 'mime/types'
+
+class TestMIMETypesCache < Minitest::Test
+  def setup
+    require 'fileutils'
+    @cache_file = File.expand_path('../cache.tst', __FILE__)
+    ENV['RUBY_MIME_TYPES_CACHE'] = @cache_file
+    clear_cache_file
+  end
+
+  def teardown
+    clear_cache_file
+    ENV.delete('RUBY_MIME_TYPES_CACHE')
+  end
+
+  def reset_mime_types
+    MIME::Types.instance_variable_set(:@__types__, nil)
+    MIME::Types.send(:load_mime_types)
+  end
+
+  def clear_cache_file
+    FileUtils.rm @cache_file if File.exist? @cache_file
+  end
+
+  def test_uses_correct_cache_file
+    assert_equal(@cache_file, MIME::Types.cache_file)
+  end
+
+  def test_does_not_use_cache_when_unset
+    ENV.delete('RUBY_MIME_TYPES_CACHE')
+    assert_equal(nil, MIME::Types.send(:load_mime_types_from_cache))
+  end
+
+  def test_raises_exception_when_load_forced_without_cache_file
+    assert_raises(ArgumentError) {
+      ENV.delete('RUBY_MIME_TYPES_CACHE')
+      MIME::Types.send(:load_mime_types_from_cache!)
+    }
+  end
+
+  def test_does_not_use_cache_when_missing
+    assert_equal(false, MIME::Types.send(:load_mime_types_from_cache))
+  end
+
+  def test_does_not_create_cache_when_unset
+    ENV.delete('RUBY_MIME_TYPES_CACHE')
+    assert_equal(nil, MIME::Types.send(:write_mime_types_to_cache))
+  end
+
+  def test_raises_exception_when_write_forced_without_cache_file
+    assert_raises(ArgumentError) {
+      ENV.delete('RUBY_MIME_TYPES_CACHE')
+      MIME::Types.send(:write_mime_types_to_cache!)
+    }
+  end
+
+  def test_creates_cache
+    assert_equal(false, File.exist?(@cache_file))
+    MIME::Types.send(:write_mime_types_to_cache)
+    assert_equal(true, File.exist?(@cache_file))
+  end
+
+  def test_uses_cache
+    html = MIME::Types['text/html'].first
+    html.extensions << 'hex'
+    MIME::Types.send(:write_mime_types_to_cache)
+    MIME::Types.instance_variable_set(:@__types__, nil)
+
+    assert_equal(true, MIME::Types.send(:load_mime_types_from_cache))
+    html = MIME::Types['text/html'].first
+    assert_includes(html.extensions, 'hex')
+
+    reset_mime_types
+  end
+end

data/test/test_mime_types_lazy.rb

@@ -0,0 +1,40 @@
+# -*- ruby encoding: utf-8 -*-
+
+require 'mime/types'
+
+class TestMIMETypesLazy < Minitest::Test
+  def setup
+    ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'true'
+    ENV['RUBY_MIME_TYPES_CACHE'] = File.expand_path('../cache.tst', __FILE__)
+    MIME::Types.send(:write_mime_types_to_cache)
+  end
+
+  def teardown
+    reset_mime_types
+    if File.exist? ENV['RUBY_MIME_TYPES_CACHE']
+      FileUtils.rm ENV['RUBY_MIME_TYPES_CACHE']
+      ENV.delete('RUBY_MIME_TYPES_CACHE')
+    end
+    ENV.delete('RUBY_MIME_TYPES_LAZY_LOAD')
+  end
+
+  def reset_mime_types
+    MIME::Types.instance_variable_set(:@__types__, nil)
+    MIME::Types.send(:load_mime_types)
+  end
+
+  def test_lazy_load?
+    assert_equal(true, MIME::Types.send(:lazy_load?))
+    ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = nil
+    assert_equal(nil, MIME::Types.send(:lazy_load?))
+    ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'false'
+    assert_equal(false, MIME::Types.send(:lazy_load?))
+  end
+
+  def test_lazy_loading
+    MIME::Types.instance_variable_set(:@__types__, nil)
+    assert_nil(MIME::Types.instance_variable_get(:@__types__))
+    refute_nil(MIME::Types['text/html'].first)
+    refute_nil(MIME::Types.instance_variable_get(:@__types__))
+  end
+end

metadata

@@ -1,61 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: '1.24'
-  prerelease: 
+  version: '1.25'
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZhdXN0
-
-  aW4xGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZFgNv
-
-  cmcwHhcNMTMwMjA0MDMzMzI3WhcNMTQwMjA0MDMzMzI3WjBBMQ8wDQYDVQQDDAZh
-
-  dXN0aW4xGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZ
-
-  FgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2mPNf4L37GhKI
-
-  SPCYsvYWXA2/R9u5+pyUnbJ2R1o2CiRq2ZA/AIzY6N3hGnsgoWnh5RzvgTN1Lt08
-
-  DNIrsIG2VDYk/JVt6f9J6zZ8EQHbznWa3cWYoCFaaICdk7jV1n/42hg70jEDYXl9
-
-  gDOl0k6JmyF/rtfFu/OIkFGWeFYIuFHvRuLyUbw66+QDTOzKb3t8o55Ihgy1GVwT
-
-  i6pkDs8LhZWXdOD+921l2Z1NZGZa9KNbJIg6vtgYKU98jQ5qr9iY3ikBAspHrFas
-
-  K6USvGgAg8fCD5YiotBEvCBMYtfqmfrhpdU2p+gvTgeLW1Kaevwqd7ngQmFUrFG1
-
-  eUJSURv5AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFAtJKMp6YYNqlgR3
-
-  9TiZLWqvLagSMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEApTPkvDm8
-
-  7gJlUT4FfumXPvtuqP67LxUtGE8syvR0A4As+0P/wylLJFUOsGTTdZYtThhxCSJG
-
-  +7KG2FfIcH4Zz2d97arZGAzBoi8iPht2/UtSl1fCcUI5vmJa1MiXZT2oqdW7Wydq
-
-  rAZcBPlrYYuiwtGI0yqIOgBfXSZCWWsJsuyTKELep6mCLgz0YZUfmvKr8W/Ab3ax
-
-  DuLzH92LSRjZJyjyAUpw/Vc2rM4giiP5jtByrb1Y1dGnQhHTMHf1GfucWm7Nw/V9
-
-  twEPVw8+0f88JQucxOTmTF1NbLFpiRwQUZ1zoZbNg2e7mShc/eexnVLWKFKxRoP6
-
-  KPj3WoD+spB8fA==
-
-  -----END CERTIFICATE-----
-
-'
-date: 2013-08-14 00:00:00.000000000 Z
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVE4d0RRWURWUVFEREFaaGRY
+  TjAKYVc0eEdUQVhCZ29Ka2lhSmsvSXNaQUVaRmdseWRXSjVabTl5WjJVeEV6
+  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOdgpjbWN3SGhjTk1UTXdNakEwTURNek16
+  STNXaGNOTVRRd01qQTBNRE16TXpJM1dqQkJNUTh3RFFZRFZRUUREQVpoCmRY
+  TjBhVzR4R1RBWEJnb0praWFKay9Jc1pBRVpGZ2x5ZFdKNVptOXlaMlV4RXpB
+  UkJnb0praWFKay9Jc1pBRVoKRmdOdmNtY3dnZ0VpTUEwR0NTcUdTSWIzRFFF
+  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDMm1QTmY0TDM3R2hLSQpTUENZc3ZZ
+  V1hBMi9SOXU1K3B5VW5iSjJSMW8yQ2lScTJaQS9BSXpZNk4zaEduc2dvV25o
+  NVJ6dmdUTjFMdDA4CkROSXJzSUcyVkRZay9KVnQ2ZjlKNnpaOEVRSGJ6bldh
+  M2NXWW9DRmFhSUNkazdqVjFuLzQyaGc3MGpFRFlYbDkKZ0RPbDBrNkpteUYv
+  cnRmRnUvT0lrRkdXZUZZSXVGSHZSdUx5VWJ3NjYrUURUT3pLYjN0OG81NUlo
+  Z3kxR1Z3VAppNnBrRHM4TGhaV1hkT0QrOTIxbDJaMU5aR1phOUtOYkpJZzZ2
+  dGdZS1U5OGpRNXFyOWlZM2lrQkFzcEhyRmFzCks2VVN2R2dBZzhmQ0Q1WWlv
+  dEJFdkNCTVl0ZnFtZnJocGRVMnArZ3ZUZ2VMVzFLYWV2d3FkN25nUW1GVXJG
+  RzEKZVVKU1VSdjVBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
+  ME9CQllFRkF0SktNcDZZWU5xbGdSMwo5VGlaTFdxdkxhZ1NNQXNHQTFVZER3
+  UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQXBUUGt2RG04Cjdn
+  SmxVVDRGZnVtWFB2dHVxUDY3THhVdEdFOHN5dlIwQTRBcyswUC93eWxMSkZV
+  T3NHVFRkWll0VGhoeENTSkcKKzdLRzJGZkljSDRaejJkOTdhclpHQXpCb2k4
+  aVBodDIvVXRTbDFmQ2NVSTV2bUphMU1pWFpUMm9xZFc3V3lkcQpyQVpjQlBs
+  cllZdWl3dEdJMHlxSU9nQmZYU1pDV1dzSnN1eVRLRUxlcDZtQ0xnejBZWlVm
+  bXZLcjhXL0FiM2F4CkR1THpIOTJMU1JqWkp5anlBVXB3L1ZjMnJNNGdpaVA1
+  anRCeXJiMVkxZEduUWhIVE1IZjFHZnVjV203TncvVjkKdHdFUFZ3OCswZjg4
+  SlF1Y3hPVG1URjFOYkxGcGlSd1FVWjF6b1piTmcyZTdtU2hjL2VleG5WTFdL
+  Rkt4Um9QNgpLUGozV29EK3NwQjhmQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
+  LS0tLS0K
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -127,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -143,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -151,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -159,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-rubygems
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -183,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-travis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -191,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -199,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -207,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -215,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -223,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -231,9 +195,57 @@ dependencies:
 description: ! 'This library allows for the identification of a file''s likely MIME
   content
 
-  type. This is release 1.24, adding and updating a few MIME types and fixing
+  type. This is release 1.25, adding experimental caching and lazy loading
+
+  functionality.
+
+
+  The caching and lazy loading features were initially implemented by Greg
+
+  Brockman (gdb). As these features are experimental, they are disabled by
+
+  default and must be enabled through the use of environment variables. The cache
+
+  is invalidated on a per-version basis; the cache for version 1.25 will not be
+
+  reused for version 1.26.
+
+
+  To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+
+
+  to any value other than ''false''. When using lazy loading, the initial startup
+
+  of MIME::Types is around 12–25× faster than normal startup (on my system,
+
+  normal startup is about 90 ms; lazy startup is about 4 ms). This isn''t
+
+  generally useful, however, as the MIME::Types database has not been loaded.
+
+  Lazy startup and load is just *slightly* faster—around 1 ms. The real advantage
+
+  comes from using the cache.
+
+
+  To enable the cache, set the environment variable +RUBY_MIME_TYPES_CACHE+ to a
+
+  filename where MIME::Types will have read-write access. The first time a new
+
+  version of MIME::Types is run using this file, it will be created, taking a
+
+  little longer than normal. Subsequent loads using the same cache file will be
+
+  approximately 3½× faster (25 ms) than normal loads. This can be combined with
+
+  +RUBY_MIME_TYPES_LAZY_LOAD+, but this is *not* recommended in a multithreaded
+
+  or multiprocess environment where all threads or processes will be using the
+
+  same cache file.
+
+
+  As the caching interface is still experimental, the only values cached are the
 
-  some issues with documentation.
+  default MIME::Types database, not any custom MIME::Types added by users.
 
 
   MIME types are used in MIME-compliant communications, as in e-mail or HTTP
@@ -320,11 +332,14 @@ files:
 - lib/mime/types/video.obsolete
 - test/test_mime_type.rb
 - test/test_mime_types.rb
+- test/test_mime_types_cache.rb
+- test/test_mime_types_lazy.rb
 homepage: http://mime-types.rubyforge.org/
 licenses:
 - MIT
 - Artistic 2.0
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -332,24 +347,24 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mime-types
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This library allows for the identification of a file's likely MIME content
   type
 test_files:
 - test/test_mime_type.rb
 - test/test_mime_types.rb
+- test/test_mime_types_cache.rb
+- test/test_mime_types_lazy.rb