mime-types 1.22 → 1.23

data/.hoerc

@@ -1,2 +1,2 @@
 ---
-exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile.lock|type-lists\//
+exclude: !ruby/regexp /(tmp|swp)$|CVS|TAGS|\.(svn|git|hg|DS_Store|idea)|Gemfile\.lock|type-lists\/|\.gemspec/

data/Gemfile

@@ -5,17 +5,17 @@
 source "https://rubygems.org/"
 
 
-gem "hoe", "~>3.4", :group => [:development, :test]
+gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "minitest", "~>4.7", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", "~>1.2", :group => [:development, :test]
 gem "hoe-doofus", "~>1.0", :group => [:development, :test]
 gem "hoe-gemspec", "~>1.0", :group => [:development, :test]
 gem "hoe-git", "~>1.5", :group => [:development, :test]
 gem "hoe-rubygems", "~>1.0", :group => [:development, :test]
 gem "hoe-travis", "~>1.2", :group => [:development, :test]
-gem "minitest", "~>4.5", :group => [:development, :test]
-gem "nokogiri", "~>1.5", :group => [:development]
+gem "nokogiri", "~>1.5", :group => [:development, :test]
 gem "rake", "~>10.0", :group => [:development, :test]
-gem "rdoc", "~>3.10", :group => [:development, :test]
-gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "hoe", "~>3.6", :group => [:development, :test]
 
 # vim: syntax=ruby

data/History.rdoc

@@ -1,3 +1,22 @@
+== 1.23 / 2013-04-20
+
+* New Feature:
+  * Arnaud Meuret (ameuret) suggested that it could be useful if the MIME type
+    collection was enumerable, so he implemented it in #30. Thanks for the
+    contribution! https://github.com/halostatue/mime-types/pull/30
+* Updated MIME Types:
+  * RFC6910 was adopted (application/call-completion).
+  * RFC6902 was adopted (application/json-patch\+json).
+  * RFC6917 was adopted (application/mrb-consumer\+xml,
+    application/mrb-publish\+xml).
+  * RFC6922 was adopted (application/sql).
+  * RFC2560 is being
+    {updated}[http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis].
+* Administrivia:
+  * The gemspec now includes information about the licenses under which the
+    mime-types gem is available.
+  * Using hoe-gemspec2 instead of hoe-gemspec.
+
 == 1.22 / 2013-03-30
 
 * New MIME Types:

data/Manifest.txt

@@ -36,6 +36,5 @@ lib/mime/types/text.vms
 lib/mime/types/video
 lib/mime/types/video.nonstandard
 lib/mime/types/video.obsolete
-mime-types.gemspec
 test/test_mime_type.rb
 test/test_mime_types.rb

data/README.rdoc

@@ -8,17 +8,17 @@ rdoc :: http://mime-types.rubyforge.org/
 == Description
 
 This library allows for the identification of a file's likely MIME content
-type. This is release 1.22 with new MIME types. The identification of MIME
-content type is based on a file's filename extensions.
-
-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 provides the ability for detailed information about MIME
-entities (provided as a set of MIME::Type objects) to be determined and
-used programmatically. There are many types defined by RFCs and vendors,
-so the list is long but not complete; don't hesitate to ask to add
-additional information. This library follows the IANA collection of MIME
-types (see below for reference).
+type. This is release 1.23 that adds the ability to enumerate over the
+collection of MIME types and updates the sources of a few MIME types. The
+identification of MIME content type is based on a file's filename extensions.
+
+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
+provides the ability for detailed information about MIME entities (provided as
+a set of MIME::Type objects) to be determined and used programmatically. There
+are many types defined by RFCs and vendors, so the list is long but not
+complete; don't hesitate to ask to add additional information. This library
+follows the IANA collection of MIME types (see below for reference).
 
 MIME::Types for Ruby was originally based on and synchronized with MIME::Types
 for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
@@ -52,6 +52,8 @@ files). A MIME::Type stores the known information about one MIME type.
     puts plaintext == 'text/plain'       # => true
     puts MIME::Type.simplified('x-appl/x-zip') # => 'appl/zip'
 
+    puts MIME::Types.any? { |type| type.content_type == 'text/plain' }
+
 == Continuous Integration Status
 
 {<img src="https://travis-ci.org/halostatue/mime-types.png" />}[https://travis-ci.org/halostatue/mime-types]

data/Rakefile

@@ -6,7 +6,7 @@ require 'hoe'
 Hoe.plugin :bundler
 Hoe.plugin :doofus
 Hoe.plugin :email
-Hoe.plugin :gemspec
+Hoe.plugin :gemspec2
 Hoe.plugin :git
 Hoe.plugin :rubyforge
 Hoe.plugin :minitest
@@ -21,10 +21,11 @@ spec = Hoe.spec 'mime-types' do
   self.history_file = 'History.rdoc'
   self.readme_file = 'README.rdoc'
   self.extra_rdoc_files = FileList["*.rdoc"].to_a
+  self.licenses = ["MIT", "Artistic 2.0", "GPL-2"]
 
   self.extra_dev_deps << ['hoe-bundler', '~> 1.2']
   self.extra_dev_deps << ['hoe-doofus', '~> 1.0']
-  self.extra_dev_deps << ['hoe-gemspec', '~> 1.0']
+  self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
   self.extra_dev_deps << ['hoe-git', '~> 1.5']
   self.extra_dev_deps << ['hoe-rubygems', '~> 1.0']
   self.extra_dev_deps << ['hoe-travis', '~> 1.2']
@@ -195,7 +196,7 @@ namespace :mime do
 http://www.ltsw.se/knbase/internet/mime.htp
 http://www.webmaster-toolkit.com/mime-types.shtml
 http://plugindoc.mozdev.org/winmime.php
-http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html  
+http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 http://www.feedforall.com/mime-types.htm
 http://www.iana.org/assignments/media-types/
   EOS

data/lib/mime/types.rb

@@ -25,7 +25,7 @@ module MIME
   #
   class Type
     # The released version of Ruby MIME::Types
-    VERSION = '1.22'
+    VERSION = '1.23'
 
     include Comparable
 
@@ -596,6 +596,17 @@ 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)
 
@@ -820,6 +831,16 @@ module MIME
         @__types__[type_id, flags]
       end
 
+      include Enumerable
+  
+      def count
+        @__types__.count
+      end
+
+      def each
+        @__types__.each {|t| yield t }
+      end
+
       # Return the list of MIME::Types which belongs to the file based on
       # its filename extension. If +platform+ is +true+, then only file
       # types that are specific to the current platform will be returned.

data/lib/mime/types/application

@@ -12,7 +12,7 @@ application/auth-policy+xml :8bit 'IANA,RFC4745
 application/batch-SMTP 'IANA,RFC2442
 application/beep+xml 'IANA,RFC3080
 application/calendar+xml 'IANA,RFC6321
-application/call-completion 'IANA,{RFC-ietf-bliss-call-completion-19=http://tools.ietf.org/html/draft-ietf-bliss-call-completion}
+application/call-completion 'IANA,RFC6910
 application/cals-1840 'IANA,RFC1895
 application/ccmp+xml 'IANA,RFC6503
 application/ccxml+xml 'IANA,RFC4267
@@ -81,7 +81,7 @@ application/ipp 'IANA,RFC2910
 application/isup 'IANA,RFC3204
 application/javascript @js :8bit 'IANA,RFC4329
 application/json @json :8bit 'IANA,RFC4627
-application/json-patch+json 'IANA,{RFC-ietf-appsawg-json-patch-10=http://tools.ietf.org/html/draft-ietf-appsawg-json-patch}
+application/json-patch+json 'IANA,RFC6902
 application/kpml-request+xml 'IANA,RFC4730
 application/kpml-response+xml 'IANA,RFC4730
 application/link-format 'IANA,RFC6690
@@ -123,8 +123,8 @@ application/mp4 @mp4,mpg4 'IANA,RFC4337,RFC6381
 application/mpeg4-generic 'IANA,RFC3640
 application/mpeg4-iod 'IANA,RFC4337
 application/mpeg4-iod-xmt 'IANA,RFC4337
-application/mrb-consumer+xml 'IANA,{RFC-ietf-mediactrl-mrb-19=http://tools.ietf.org/html/draft-ietf-mediactrl-mrb}
-application/mrb-publish+xml 'IANA,{RFC-ietf-mediactrl-mrb-19=http://tools.ietf.org/html/draft-ietf-mediactrl-mrb}
+application/mrb-consumer+xml 'IANA,RFC6917
+application/mrb-publish+xml 'IANA,RFC6917
 application/msc-ivr+xml 'IANA,RFC6231
 application/msc-mixer+xml 'IANA,RFC6505
 application/msword @doc,dot,wrd :base64 'IANA,[Lindner]
@@ -135,8 +135,8 @@ application/news-groupinfo 'IANA,RFC5537
 application/news-transmission 'IANA,RFC5537
 application/nlsml+xml 'IANA,RFC6787
 application/nss 'IANA,[Hammer]
-application/ocsp-request 'IANA,RFC2560
-application/ocsp-response 'IANA,RFC2560
+application/ocsp-request 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
+application/ocsp-response 'IANA,{RFC-ietf-pkix-rfc2560bis-20=http://tools.ietf.org/html/draft-ietf-pkix-rfc2560bis}
 application/octet-stream @bin,dms,lha,lzh,exe,class,ani,pgp,so,dll,dylib :base64 'IANA,RFC2045,RFC2046
 application/oda @oda 'IANA,RFC2045,RFC2046
 application/oebps-package+xml 'IANA,RFC4839
@@ -217,7 +217,7 @@ application/soap+xml 'IANA,RFC3902
 application/sparql-query 'IANA,[W3C]
 application/sparql-results+xml 'IANA,[W3C]
 application/spirits-event+xml 'IANA,RFC3910
-application/sql 'IANA,{RFC-shafranovich-mime-sql-06=http://tools.ietf.org/html/draft-shafranovich-mime-sql}
+application/sql 'IANA,RFC6922
 application/srgs 'IANA,RFC4267
 application/srgs+xml 'IANA,RFC4267
 application/sru+xml 'IANA,RFC6207

data/test/test_mime_types.rb

@@ -71,6 +71,14 @@ class TestMIME_Types < MiniTest::Unit::TestCase #:nodoc:
     assert(MIME::Types.of('zzz').empty?)
   end
 
+  def test_class_enumerable
+    assert( MIME::Types.any? {|type| type.content_type == 'text/plain'} )
+  end
+
+  def test_class_count
+    assert(MIME::Types.count > 42, "A lot of types are expected to be known.")
+  end
+
   def test_ebook_formats
     assert_equal( MIME::Types['application/x-mobipocket-ebook'],  MIME::Types.type_for("book.mobi"))
     assert_equal( MIME::Types['application/epub+zip'],  MIME::Types.type_for("book.epub"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mime-types
 version: !ruby/object:Gem::Version
-  version: '1.22'
+  version: '1.23'
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,13 +133,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-gemspec
+  name: hoe-gemspec2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -243,30 +243,30 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 description: ! 'This library allows for the identification of a file''s likely MIME
   content
 
-  type. This is release 1.22 with new MIME types. The identification of MIME
+  type. This is release 1.23 that adds the ability to enumerate over the
 
-  content type is based on a file''s filename extensions.
+  collection of MIME types and updates the sources of a few MIME types. The
 
+  identification of MIME content type is based on a file''s filename extensions.
 
-  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 are used in MIME-compliant communications, as in e-mail or HTTP
 
-  MIME::Types provides the ability for detailed information about MIME
+  traffic, to indicate the type of content which is transmitted. MIME::Types
 
-  entities (provided as a set of MIME::Type objects) to be determined and
+  provides the ability for detailed information about MIME entities (provided as
 
-  used programmatically. There are many types defined by RFCs and vendors,
+  a set of MIME::Type objects) to be determined and used programmatically. There
 
-  so the list is long but not complete; don''t hesitate to ask to add
+  are many types defined by RFCs and vendors, so the list is long but not
 
-  additional information. This library follows the IANA collection of MIME
+  complete; don''t hesitate to ask to add additional information. This library
 
-  types (see below for reference).
+  follows the IANA collection of MIME types (see below for reference).
 
 
   MIME::Types for Ruby was originally based on and synchronized with MIME::Types
@@ -336,11 +336,13 @@ files:
 - lib/mime/types/video
 - lib/mime/types/video.nonstandard
 - lib/mime/types/video.obsolete
-- mime-types.gemspec
 - test/test_mime_type.rb
 - test/test_mime_types.rb
 homepage: http://mime-types.rubyforge.org/
-licenses: []
+licenses:
+- MIT
+- Artistic 2.0
+- GPL-2
 post_install_message: 
 rdoc_options:
 - --main

data/mime-types.gemspec

@@ -1,66 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "mime-types"
-  s.version = "1.20.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Austin Ziegler"]
-  s.date = "2013-02-04"
-  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.20.1 with new MIME types. The identification of MIME\ncontent type is based on a file's filename extensions.\n\nMIME types are used in MIME-compliant communications, as in e-mail or\nHTTP traffic, to indicate the type of content which is transmitted.\nMIME::Types provides the ability for detailed information about MIME\nentities (provided as a set of MIME::Type objects) to be determined and\nused programmatically. There are many types defined by RFCs and vendors,\nso the list is long but not complete; don't hesitate to ask to add\nadditional information. This library follows the IANA collection of MIME\ntypes (see below for reference).\n\nMIME::Types for Ruby was originally based on and synchronized with MIME::Types\nfor Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data\nformat for the MIME::Type list has changed and the synchronization will no\nlonger happen.\n\nMIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It\nfollows the official {IANA registry}[http://www.iana.org/assignments/media-types/]\n({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types\nadded from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp]."
-  s.email = ["austin@rubyforge.org"]
-  s.extra_rdoc_files = ["Contributing.rdoc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History.rdoc", "Licence.rdoc", "README.rdoc"]
-  s.files = [".travis.yml", "Contributing.rdoc", "Gemfile", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "docs/COPYING.txt", "docs/artistic.txt", "lib/mime-types.rb", "lib/mime/types.rb", "lib/mime/types/application", "lib/mime/types/application.mac", "lib/mime/types/application.nonstandard", "lib/mime/types/application.obsolete", "lib/mime/types/audio", "lib/mime/types/audio.nonstandard", "lib/mime/types/audio.obsolete", "lib/mime/types/image", "lib/mime/types/image.nonstandard", "lib/mime/types/image.obsolete", "lib/mime/types/message", "lib/mime/types/message.obsolete", "lib/mime/types/model", "lib/mime/types/multipart", "lib/mime/types/multipart.nonstandard", "lib/mime/types/multipart.obsolete", "lib/mime/types/other.nonstandard", "lib/mime/types/text", "lib/mime/types/text.nonstandard", "lib/mime/types/text.obsolete", "lib/mime/types/text.vms", "lib/mime/types/video", "lib/mime/types/video.nonstandard", "lib/mime/types/video.obsolete", "mime-types.gemspec", "test/test_mime_type.rb", "test/test_mime_types.rb", ".gemtest"]
-  s.homepage = "http://mime-types.rubyforge.org/"
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "mime-types"
-  s.rubygems_version = "1.8.25"
-  s.summary = "This library allows for the identification of a file's likely MIME content type"
-  s.test_files = ["test/test_mime_type.rb", "test/test_mime_types.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_development_dependency(%q<minitest>, ["~> 4.5"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2"])
-      s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-git>, ["~> 1.5"])
-      s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe-travis>, ["~> 1.2"])
-      s.add_development_dependency(%q<nokogiri>, ["~> 1.5"])
-      s.add_development_dependency(%q<rake>, ["~> 10.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
-    else
-      s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_dependency(%q<minitest>, ["~> 4.5"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
-      s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
-      s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-git>, ["~> 1.5"])
-      s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
-      s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.5"])
-      s.add_dependency(%q<rake>, ["~> 10.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
-    end
-  else
-    s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<minitest>, ["~> 4.5"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
-    s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
-    s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-git>, ["~> 1.5"])
-    s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
-    s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.5"])
-    s.add_dependency(%q<rake>, ["~> 10.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
-  end
-end