mime-types 2.99.3 → 3.3.1

data/test/test_mime_types_lazy.rb

@@ -1,47 +1,49 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'mime/types'
 require 'minitest_helper'
 
-class TestMIMETypesLazy < Minitest::Test
+describe MIME::Types, 'lazy loading' do
   def setup
-    @cache_file = File.expand_path('../cache.tst', __FILE__)
     ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'true'
-    ENV['RUBY_MIME_TYPES_CACHE'] = @cache_file
-    MIME::Types::Cache.save
   end
 
   def teardown
-    clear_cache_file
     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 clear_cache_file
-    FileUtils.rm @cache_file if File.exist? @cache_file
-  end
-
   def reset_mime_types
     MIME::Types.instance_variable_set(:@__types__, nil)
     MIME::Types.send(:load_default_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?))
+  describe '.lazy_load?' do
+    it 'is true when RUBY_MIME_TYPES_LAZY_LOAD is set' do
+      assert_output '', /RUBY_MIME_TYPES_LAZY_LOAD/ do
+        assert_equal true, MIME::Types.send(:lazy_load?)
+      end
+    end
+
+    it 'is nil when RUBY_MIME_TYPES_LAZY_LOAD is unset' do
+      ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = nil
+      assert_output '', '' do
+        assert_nil MIME::Types.send(:lazy_load?)
+      end
+    end
+
+    it 'is false when RUBY_MIME_TYPES_LAZY_LOAD is false' do
+      ENV['RUBY_MIME_TYPES_LAZY_LOAD'] = 'false'
+      assert_output '', /RUBY_MIME_TYPES_LAZY_LOAD/ do
+        assert_equal false, MIME::Types.send(:lazy_load?)
+      end
+    end
   end
 
-  def test_lazy_loading
+  it 'loads lazily when RUBY_MIME_TYPES_LAZY_LOAD is set' do
     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__))
+    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

data/test/test_mime_types_loader.rb

@@ -1,9 +1,9 @@
-# -*- ruby encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'mime/types'
 require 'minitest_helper'
 
-class TestMIMETypesLoader < Minitest::Test
+describe MIME::Types::Loader do
   def setup
     @path     = File.expand_path('../fixture', __FILE__)
     @loader   = MIME::Types::Loader.new(@path)
@@ -12,48 +12,21 @@ class TestMIMETypesLoader < Minitest::Test
 
   def assert_correctly_loaded(types)
     assert_includes(types, 'application/1d-interleaved-parityfec')
-    assert_deprecated('MIME::Type#references') do
-      assert_empty types['application/acad'].first.references
-    end
-    assert_deprecated('MIME::Type#urls') do
-      assert_empty types['audio/webm'].first.urls
-    end
     assert_equal(%w(webm), types['audio/webm'].first.extensions)
     refute(types['audio/webm'].first.registered?)
 
     assert_equal('Fixes a bug with IE6 and progressive JPEGs',
                  types['image/pjpeg'].first.docs)
 
-    assert_deprecated('MIME::Type#system?') do
-      refute types['application/x-apple-diskimage'].first.system?
-    end
-    assert_deprecated('MIME::Type#system') do
-      assert_nil types['application/x-apple-diskimage'].first.system
-    end
-
     assert(types['audio/vnd.qcelp'].first.obsolete?)
     assert_equal('audio/QCELP', types['audio/vnd.qcelp'].first.use_instead)
   end
 
-  def test_load_yaml
-    assert_correctly_loaded(@loader.load_yaml)
-  end
-
-  def test_load_json
-    assert_correctly_loaded(@loader.load_json)
-  end
-
-  def test_load_v1
-    assert_deprecated('MIME::Types::Loader.load_v1') do
-      assert_correctly_loaded(@loader.load_v1)
-    end
+  it 'loads YAML files correctly' do
+    assert_correctly_loaded @loader.load_yaml
   end
 
-  def test_malformed_v1
-    assert_output(nil, /1: Parsing error in v1 MIME type definition/) {
-      assert_raises(MIME::Types::Loader::BadV1Format) {
-        MIME::Types::Loader.load_from_v1(File.join(@bad_path, 'malformed'))
-      }
-    }
+  it 'loads JSON files correctly' do
+    assert_correctly_loaded @loader.load_json
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: 2.99.3
+  version: 3.3.1
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mime-types-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
-  type: :development
+        version: '3.2015'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '3.2015'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.13'
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +137,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest-bonus-assertions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -178,91 +212,99 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.20'
 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
   extensions for MIME types, or to use filename extensions to look up the likely
   MIME type definitions.
 
-  This is release 2.99.1, the first scheduled data update for mime-types 2.x. As
-  of mime-types 2.99. deprecation warnings are noisy and data that has been
-  deprecated is now no longer available. The data is both dropped from the data
-  files and is stubbed out as empty or +nil+ values as appropriate.
-
-  mime-types-2.6 was the last version of mime-types 2.x with newly available
-  features, and mime-types 2.99 will only receive quarterly updates to the IANA
-  registered MIME media types plus any security updates that may be required.
-
-  If the loss of the deprecated data matters, be sure to set your dependency
-  appropriately:
-
-     gem 'mime-types', '~> 2.6, < 2.99'
+  Version 3.0 is a major release that requires Ruby 2.0 compatibility and removes
+  deprecated functions. The columnar registry format introduced in 2.6 has been
+  made the primary format; the registry data has been extracted from this library
+  and put into {mime-types-data}[https://github.com/mime-types/mime-types-data].
+  Additionally, mime-types is now licensed exclusively under the MIT licence and
+  there is a code of conduct in effect. There are a number of other smaller
+  changes described in the History file.
 email:
 - halostatue@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- Code-of-Conduct.rdoc
-- Contributing.rdoc
-- History-Types.rdoc
-- History.rdoc
-- Licence.rdoc
+- Code-of-Conduct.md
+- Contributing.md
+- History.md
+- Licence.md
 - Manifest.txt
 - README.rdoc
-- docs/COPYING.txt
-- docs/artistic.txt
 files:
-- Code-of-Conduct.rdoc
-- Contributing.rdoc
-- History-Types.rdoc
-- History.rdoc
-- Licence.rdoc
+- Code-of-Conduct.md
+- Contributing.md
+- History.md
+- Licence.md
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- data/mime-types.json
-- data/mime.content_type.column
-- data/mime.docs.column
-- data/mime.encoding.column
-- data/mime.friendly.column
-- data/mime.obsolete.column
-- data/mime.registered.column
-- data/mime.signature.column
-- data/mime.use_instead.column
-- data/mime.xrefs.column
-- docs/COPYING.txt
-- docs/artistic.txt
 - lib/mime-types.rb
 - lib/mime/type.rb
 - lib/mime/type/columnar.rb
 - lib/mime/types.rb
+- lib/mime/types/_columnar.rb
 - lib/mime/types/cache.rb
 - lib/mime/types/columnar.rb
+- lib/mime/types/container.rb
 - lib/mime/types/deprecations.rb
+- lib/mime/types/full.rb
 - lib/mime/types/loader.rb
-- lib/mime/types/loader_path.rb
 - lib/mime/types/logger.rb
-- support/apache_mime_types.rb
-- support/benchmarks/load.rb
-- support/benchmarks/load_allocations.rb
-- support/benchmarks/object_counts.rb
-- support/convert.rb
-- support/convert/columnar.rb
-- support/iana_registry.rb
+- lib/mime/types/registry.rb
 - test/bad-fixtures/malformed
 - test/fixture/json.json
 - test/fixture/old-data
@@ -277,9 +319,11 @@ files:
 homepage: https://github.com/mime-types/ruby-mime-types/
 licenses:
 - MIT
-- Artistic-2.0
-- GPL-2.0
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/mime-types/ruby-mime-types/
+  source_code_uri: https://github.com/mime-types/ruby-mime-types/
+  bug_tracker_uri: https://github.com/mime-types/ruby-mime-types/issues
+  changelog_uri: https://github.com/mime-types/ruby-mime-types/blob/master/History.md
 post_install_message: 
 rdoc_options:
 - "--main"
@@ -290,15 +334,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The mime-types library provides a library and registry for information about

data/Contributing.rdoc

@@ -1,170 +0,0 @@
-== Contributing
-
-I value any contribution to mime-types you can provide: a bug report, a feature
-request, or code contributions.
-
-There are a few guidelines for contributing to mime-types:
-
-* Code changes *will* *not* be accepted without tests. The test suite is
-  written with {Minitest}[https://github.com/seattlerb/minitest].
-* Match my coding style.
-* Use a thoughtfully-named topic branch that contains your change. Rebase your
-  commits into logical chunks as necessary.
-* Use {quality commit messages}[http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html].
-* Do not change the version number; when your patch is accepted and a release
-  is made, the version will be updated at that point.
-* Submit a GitHub pull request with your changes.
-* New or changed behaviours require new or updated documentation.
-
-=== Adding or Modifying MIME Types
-
-The mime-types registry is loaded from encoded files in +data+. These are not
-editable and cannot be compared meaningfully in a pull request; pull requests
-that include changes to these files will require amendment to revert these
-files.
-
-New or modified MIME types should be edited in the appropriate YAML file under
-+type-lists+. The format is as shown below for the +application/xml+ MIME type
-in +type-lists/application.yml+.
-
-  - !ruby/object:MIME::Type
-    content-type: application/xml
-    encoding: 8bit
-    extensions:
-    - xml
-    - xsl
-    xrefs: !ruby/hash:MIME::Types::Container
-      rfc:
-      - rfc3023
-    registered: true
-
-There are other fields that can be added, matching the fields discussed in the
-documentation for MIME::Type. Pull requests for MIME types should just contain
-the changes to the YAML files for the new or modified MIME types; I will
-convert the YAML files to JSON prior to a new release. I would rather not have
-to verify that the JSON matches the YAML changes, which is why it is not
-necessary to convert for the pull request.
-
-If you are making a change for a private fork, use <tt>rake
-convert:yaml:json</tt> to convert the YAML to JSON, or <tt>rake
-convert:yaml:columnar</tt> to convert it to the new columnar format.
-
-==== Updating Types from the IANA or Apache Lists
-
-If you are maintaining a private fork and wish to update your copy of the MIME
-types registry used by this gem, you can do this with the rake tasks:
-
-    $ rake mime:iana
-    $ rake mime:apache
-
-Both of these require
-{Nokogiri}[http://www.nokogiri.org/tutorials/installing_nokogiri.html], which
-is not installed by default. Install it in the usual way for your Ruby.
-
-=== Test Dependencies
-
-mime-types uses Ryan Davis’s {Hoe}[https://github.com/seattlerb/hoe] to manage
-the release process, and it adds a number of rake tasks. You will mostly be
-interested in:
-
-    $ rake
-
-which runs the tests the same way that:
-
-    $ rake test
-    $ rake travis
-
-will do.
-
-To assist with the installation of the development dependencies for mime-types,
-I have provided the simplest possible Gemfile pointing to the (generated)
-+mime-types.gemspec+ file. This will permit you to do:
-
-    $ bundle install
-
-to get the development dependencies. If you aleady have +hoe+ installed, you
-can accomplish the same thing with:
-
-    $ rake newb
-
-This task will install any missing dependencies, run the tests/specs, and
-generate the RDoc.
-
-You can run tests with code coverage analysis by running:
-
-    $ rake test:coverage
-
-=== Benchmarks
-
-mime-types offers several benchmark tasks to measure different measures of
-performance.
-
-There is a repeated load test, measuring how long it takes to start and load
-mime-types with its full registry. By default, it runs fifty loops and uses the
-built-in benchmark library.
-
-    $ rake benchmark:load
-
-There are two allocation tracing benchmarks (for normal and columnar loads).
-These can only be run on Ruby 2.1 or better and requires the
-{allocation_tracer}[https://github.com/ko1/allocation_tracer] gem (not
-installed by default).
-
-    $ rake benchmark:allocations
-    $ rake benchmark:allocations:columnar
-
-There are two loaded object count benchmarks (for normal and columnar loads).
-These use <tt>ObjectSpace.count_objects</tt>.
-
-    $ rake benchmark:objects
-    $ rake benchmark:objects:columnar
-
-=== Workflow
-
-Here's the most direct way to get your work merged into the project:
-
-* Fork the project.
-* Clone down your fork (<tt>git clone git://github.com/<username>/ruby-mime-types.git</tt>).
-* Create a topic branch to contain your change (<tt>git checkout -b my\_awesome\_feature</tt>).
-* Hack away, add tests. Not necessarily in that order.
-* Make sure everything still passes by running +rake+.
-* If necessary, rebase your commits into logical chunks, without errors.
-* Push the branch up (<tt>git push origin my\_awesome\_feature</tt>).
-* Create a pull request against mime-types/ruby-mime-types and describe what
-  your change does and the why you think it should be merged.
-
-=== Contributors
-
-* Austin Ziegler created mime-types.
-
-Thanks to everyone else who has contributed to mime-types:
-
-* Aaron Patterson
-* Aggelos Avgerinos
-* Andre Pankratz
-* Andy Brody
-* Arnaud Meuret
-* Brandon Galbraith
-* Chris Gat
-* David Genord
-* Eric Marden
-* Garret Alfert
-* Godfrey Chan
-* Greg Brockman
-* Hans de Graaff
-* Henrik Hodne
-* Jeremy Evans
-* Juanito Fatas
-* Łukasz Śliwa
-* Keerthi Siva
-* Ken Ip
-* Martin d'Allens
-* Mauricio Linhares
-* nycvotes-dev
-* Postmodern
-* Richard Hirner
-* Richard Hurt
-* Richard Schneeman
-* Tao Guo
-* Tibor Szolár
-* Todd Carrico