mime-types 1.17.2 → 1.18

data/.gitignore

@@ -0,0 +1,8 @@
+*.swp
+*~
+.rake_tasks~
+html
+doc
+pkg
+publish
+coverage

data/.hoerc

@@ -1,8 +1,6 @@
 --- 
 publish_on_announce: false
 exclude: !ruby/regexp /\.(?:svn|git)|(?:\.(?:swp|hoerc|DS_Store)|~|email.txt)$|(?:coverage|type-lists)\//
-signing_key_file: ~/.gem/gem-private_key.pem
-signing_cert_file: ~/.gem/gem-public_cert.pem
 blogs: 
 - user: user
   url: url

data/History.rdoc

@@ -1,3 +1,18 @@
+== MIME::Types 1.18 / 2012-03-20
+* New MIME Types:
+  * Types reported in Issue #6 (https://github.com/halostatue/mime-types/issues/6):
+    * CoffeeScript (text/x-coffeescript; .coffee; 8bit).
+    * AIR (application/vnd.adobe.air-applicationinstaller-package+zip, .air; base64).
+    * WOFF (application/font-woff; .woff; base64).
+    * TrueType (application/x-font-truetype; .ttf; base64).
+    * OpenType (application/x-font-opentype; .otf; base64).
+  * WebM (audio/webm, video/webm; .webm). Issue #11 (https://github.com/halostatue/mime-types/issues/11).
+* New extensions:
+  * f4v/f4p (video/mp4, used by Adobe); f4a/fb4 (audio/mp4, used by Adobe).
+* Bug Fixes:
+  * It was pointed out that Licence.txt was incorrectly named. Fixed by renaming to Licence.rdoc (from Issue/Pull Request #8, https://github.com/halostatue/mime-types/issues/8).
+  * It was pointed out that a plan to have the test output generated automatically never went through. Issue #10 (https://github.com/halostatue/mime-types/issues/10)
+
 == MIME::Types 1.17.2 / 2011-10-25
 * Bug Fixes:
   * Fixed an issue with Ruby 1.9 and file encoding.
@@ -51,7 +66,7 @@
 * Added two new best-guess implementations of functions found in Perl's
   MIME::Types implementation (1.13). Do not rely on these until the purpose
   and implementation is stabilised.
-* Updated the MIME list to reflect changes noted by 
+* Updated the MIME list to reflect changes noted by
   Ville Skyttä <ville.skytta@iki.fi>.
 * Added a new constant to MIME::Types, DATA_VERSION. This will allow the Ruby
   version number to be updated separately from the Perl version while keeping
@@ -115,14 +130,3 @@
 
 == MIME::Types 1.003
 * Initial release based on Perl MIME::Types 1.003.
-
-== Copyright
-  MIME::Types
-  A Ruby implementation of a MIME Types information library. Based in spirit
-  on the Perl MIME::Types information library by Mark Overmeer.
-  http://rubyforge.org/projects/mime-types/
-
-  Licensed under the Ruby disjunctive licence with the GNU GPL or the Perl
-  Artistic licence. See Licence.txt for more information.
-
-  Copyright 2003 - 2009 Austin Ziegler

data/Licence.rdoc

@@ -0,0 +1,12 @@
+== Licence
+
+This software is available under a triple disjunctive licence:
+{Ruby's licence}[http://www.ruby-lang.org/en/LICENSE.txt],
+the
+{Perl Artistic licence}[http://www.perl.com/pub/a/language/misc/Artistic.html],
+or the {GNU GPL version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html]
+(or at your option, any later verison).
+
+If you do not accept one of these licences, you may not use this software.
+
+* Copyright 2003–2012 Austin Ziegler.

data/Manifest.txt

@@ -1,6 +1,7 @@
+.gitignore
 .hoerc
 History.rdoc
-License.rdoc
+Licence.rdoc
 Manifest.txt
 README.rdoc
 Rakefile

data/README.rdoc

@@ -1,5 +1,10 @@
 = MIME::Types for Ruby
 
+home :: http://mime-types.rubyforge.org/
+code :: https://github.com/halostatue/mime-types/
+bugs :: https://github.com/halostatue/mime-types/issues
+rdoc :: http://mime-types.rubyforge.org/
+
 == Description
 
 This library allows for the identification of a file's likely MIME content
@@ -11,9 +16,4 @@ Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
 format for the MIME::Type list has changed and the synchronization will no
 longer happen.
 
-Homepage::  http://mime-types.rubyforge.org/
-GitHub::    http://github.com/halostatue/mime-types/
-Copyright:: 2002 - 2011, Austin Ziegler
-            Based in part on prior work copyright Mark Overmeer
-
-:include: License.rdoc
+:include: Licence.rdoc

data/Rakefile

@@ -14,8 +14,7 @@ spec = Hoe.spec 'mime-types' do
 
   developer('Austin Ziegler', 'austin@rubyforge.org')
 
-  self.url = "http://mime-types.rubyforge.org/"
-  self.remote_rdoc_dir = 'rdoc'
+  self.remote_rdoc_dir = '.'
   self.rsync_args << ' --exclude=statsvn/'
 
   self.history_file = 'History.rdoc'

data/lib/mime/types.rb

@@ -24,7 +24,8 @@ module MIME
   #  puts MIME::Type.simplified('x-appl/x-zip') # => 'appl/zip'
   #
   class Type
-    VERSION = '1.17.2'
+    # The released version of Ruby MIME::Types
+    VERSION = '1.18'
 
     include Comparable
 
@@ -44,7 +45,7 @@ module MIME
     LTSW_URL      = "http://www.ltsw.se/knbase/internet/%s.htp"
     CONTACT_URL   = "http://www.iana.org/assignments/contact-people.htm#%s"
 
-    # Returns +true+ if the simplified type matches the current 
+    # Returns +true+ if the simplified type matches the current
     def like?(other)
       if other.respond_to?(:simplified)
         @simplified == other.simplified
@@ -138,7 +139,7 @@ module MIME
     #   x-chemical/x-pdb  => pdb
     attr_reader :sub_type
     # Returns the media type of the unmodified MIME type.
-    # 
+    #
     #   text/plain        => plain
     #   x-chemical/x-pdb  => x-pdb
     attr_reader :raw_sub_type
@@ -185,7 +186,7 @@ module MIME
     # The regexp for the operating system that this MIME::Type is specific
     # to.
     attr_accessor :system
-    remove_method :system= ; 
+    remove_method :system= ;
     def system=(os) #:nodoc:
       if os.nil? or os.kind_of?(Regexp)
         @system = os
@@ -359,7 +360,7 @@ module MIME
       #   end
       def from_hash(hash) #:yields MIME::Type.new:
         type = {}
-        hash.each_pair do |k, v| 
+        hash.each_pair do |k, v|
           type[k.to_s.tr('A-Z', 'a-z').gsub(/-/, '_').to_sym] = v
         end
 
@@ -400,7 +401,7 @@ module MIME
           t.registered = mime_type.registered?
 
           mime_type.docs && t.docs = mime_type.docs.dup
-          
+
         end
 
         yield m if block_given?
@@ -566,7 +567,7 @@ module MIME
   # = Author
   # Copyright:: Copyright (c) 2002 - 2009 by Austin Ziegler
   #             <austin@rubyforge.org>
-  # Version::   1.17.2
+  # Version::   1.18
   # Based On::  Perl
   #             MIME::Types[http://search.cpan.org/author/MARKOV/MIME-Types-1.27/MIME/Types.pm],
   #             Copyright (c) 2001 - 2009 by Mark Overmeer
@@ -577,7 +578,7 @@ module MIME
   #
   class Types
     # The released version of Ruby MIME::Types
-    VERSION = '1.17.2'
+    VERSION = MIME::Type::VERSION
 
       # The data version.
     attr_reader :data_version
@@ -651,10 +652,12 @@ module MIME
     # filename extension. If +platform+ is +true+, then only file types that
     # are specific to the current platform will be returned.
     #
+    # This will always return an array.
+    #
     #   puts "MIME::Types.type_for('citydesk.xml')
-    #     => "#{MIME::Types.type_for('citydesk.xml')}"
+    #     => [application/xml, text/xml]
     #   puts "MIME::Types.type_for('citydesk.gif')
-    #     => "#{MIME::Types.type_for('citydesk.gif')}"
+    #     => [image/gif]
     def type_for(filename, platform = false)
       ext = filename.chomp.downcase.gsub(/.*\./o, '')
       list = @extension_index[ext]
@@ -765,7 +768,7 @@ module MIME
 
           begin
             m = TEXT_FORMAT_RE.match(item).captures
-          rescue Exception => ex
+          rescue Exception
             puts "#{filename}:#{index}: Parsing error in MIME type definitions."
             puts "=> #{line}"
             raise
@@ -814,10 +817,12 @@ module MIME
       # its filename extension. If +platform+ is +true+, then only file
       # types that are specific to the current platform will be returned.
       #
+      # This will always return an array.
+      #
       #   puts "MIME::Types.type_for('citydesk.xml')
-      #     => "#{MIME::Types.type_for('citydesk.xml')}"
+      #     => [application/xml, text/xml]
       #   puts "MIME::Types.type_for('citydesk.gif')
-      #     => "#{MIME::Types.type_for('citydesk.gif')}"
+      #     => [image/gif]
       def type_for(filename, platform = false)
         @__types__.type_for(filename, platform)
       end

data/lib/mime/types/application

@@ -53,6 +53,7 @@ application/fastinfoset 'IANA,[ITU-T ASN.1 Rapporteur]
 application/fastsoap 'IANA,[ITU-T ASN.1 Rapporteur]
 application/fits 'IANA,RFC4047
 application/font-tdpfr @pfr 'IANA,RFC3073
+application/font-woff @woff :base64 'W3C,{WOFF=http://www.w3.org/TR/WOFF/#appendix-b}
 application/framework-attributes+xml 'IANA,RFC6230
 application/held+xml 'IANA,RFC5985
 application/http 'IANA,RFC2616
@@ -247,6 +248,7 @@ application/vnd.accpac.simply.aso 'IANA,[Leow]
 application/vnd.accpac.simply.imp 'IANA,[Leow]
 application/vnd.acucobol 'IANA,[Lubin]
 application/vnd.acucorp @atc,acutc :7bit 'IANA,[Lubin]
+application/vnd.adobe.air-applicationinstaller-package+zip @air :base64
 application/vnd.adobe.fxp 'IANA,[Brambley],[Heintz]
 application/vnd.adobe.partial-upload 'IANA,[Otala]
 application/vnd.adobe.xdp+xml 'IANA,[Brinkman]
@@ -259,6 +261,7 @@ application/vnd.airzip.filesecure.azs 'IANA,[Mould],[Clueit]
 application/vnd.americandynamics.acc 'IANA,[Sands]
 application/vnd.amiga.ami @ami 'IANA,[Blumberg]
 application/vnd.amundsen.maze+xml 'IANA,[Amundsen]
+application/vnd.android.package-archive @apk
 application/vnd.anser-web-certificate-issue-initiation 'IANA,[Mori]
 application/vnd.antix.game-component 'IANA,[Shelton]
 application/vnd.apple.installer+xml 'IANA,[Bierman]

data/lib/mime/types/application.nonstandard

@@ -53,6 +53,8 @@ application/x-drafting
 application/x-dvi @dvi :base64 'LTSW
 application/x-dxf
 application/x-excel
+application/x-font-truetype @ttf :base64
+application/x-font-opentype @otf :base64
 application/x-fractals
 application/x-futuresplash @spl
 application/x-ghostview
@@ -76,11 +78,14 @@ application/x-macbinary
 application/x-maker @frm,maker,frame,fm,fb,book,fbdoc =use-instead:application/vnd.framemaker
 application/x-mathematica-old
 application/x-mif @mif 'LTSW
+application/x-ms-wmd @wmd
+application/x-ms-wmz @wmz
 application/x-msaccess @mda,mdb,mde,mdf
 application/x-msdos-program @cmd,bat,com,exe :base64
 application/x-msdownload @exe,com :base64
 application/x-netcdf @nc,cdf
 application/x-ns-proxy-autoconfig @pac
+application/x-opera-extension @oex
 application/x-pagemaker @pm,pm5,pt5
 application/x-perl @pl,pm :8bit
 application/x-pgp
@@ -110,5 +115,3 @@ application/x-ustar @ustar :base64 'LTSW
 application/x-wais-source @src 'LTSW
 application/x-wordperfect6.1 @wp6
 application/x-x509-ca-cert @crt :base64
-application/x-ms-wmz @wmz
-application/x-ms-wmd @wmd

data/lib/mime/types/audio

@@ -2,16 +2,27 @@ audio/1d-interleaved-parityfec 'IANA,RFC6015
 audio/32kadpcm 'IANA,RFC3802,RFC2421
 audio/3gpp 'IANA,RFC3839,RFC6381
 audio/3gpp2 'IANA,RFC4393,RFC6381
+audio/ac3 'IANA,RFC4184
 audio/AMR @amr :base64 'RFC4867
 audio/AMR-WB @awb :base64 'RFC4867
+audio/amr-wb+ 'IANA,RFC4352
+audio/asc 'IANA,RFC6295
 audio/ATRAC-ADVANCED-LOSSLESS 'IANA,RFC5584
 audio/ATRAC-X 'IANA,RFC5584
 audio/ATRAC3 'IANA,RFC5584
+audio/basic @au,snd :base64 'IANA,RFC2045,RFC2046
 audio/BV16 'IANA,RFC4298
 audio/BV32 'IANA,RFC4298
+audio/clearmode 'IANA,RFC4040
 audio/CN 'IANA,RFC3389
 audio/DAT12 'IANA,RFC3190
+audio/dls 'IANA,RFC4613
+audio/dsr-es201108 'IANA,RFC3557
+audio/dsr-es202050 'IANA,RFC4060
+audio/dsr-es202211 'IANA,RFC4060
+audio/dsr-es202212 'IANA,RFC4060
 audio/DVI4 'IANA,RFC4856
+audio/eac3 'IANA,RFC4598
 audio/EVRC @evc 'IANA,RFC4788
 audio/EVRC-QCP 'IANA,RFC3625
 audio/EVRC0 'IANA,RFC4788
@@ -22,6 +33,8 @@ audio/EVRCB1 'IANA,RFC4788
 audio/EVRCWB 'IANA,RFC5188
 audio/EVRCWB0 'IANA,RFC5188
 audio/EVRCWB1 'IANA,RFC5188
+audio/example 'IANA,RFC4735
+audio/fwdred 'IANA,RFC6354
 audio/G719 'IANA,RFC5404
 audio/G722 'IANA,RFC4856
 audio/G7221 'IANA,RFC5577
@@ -38,62 +51,49 @@ audio/G729E 'IANA,RFC4856
 audio/GSM 'IANA,RFC4856
 audio/GSM-EFR 'IANA,RFC4856
 audio/GSM-HR-08 'IANA,RFC5993
+audio/iLBC 'IANA,RFC3952
+audio/ip-mr_v2.5 'IANA,RFC6262
 audio/L16 @l16 'IANA,RFC4856
 audio/L20 'IANA,RFC3190
 audio/L24 'IANA,RFC3190
 audio/L8 'IANA,RFC4856
 audio/LPC 'IANA,RFC4856
-audio/MP4A-LATM 'IANA,RFC6416
+audio/mobile-xmf 'IANA,RFC4723
+audio/mp4 @mp4,mpg4,f4a,f4b 'IANA,RFC4337,{Adobe=http://www.kaourantin.net/2007/10/new-file-extensions-and-mime-types.html}
+audio/MP4A-LATM @m4a 'IANA,RFC6416
 audio/MPA 'IANA,RFC3555
+audio/mpa-robust 'IANA,RFC5219
+audio/mpeg @mpga,mp2,mp3 :base64 'IANA,RFC3003
+audio/mpeg4-generic 'IANA,RFC3640,RFC5691,RFC6295
+audio/ogg @ogg 'IANA,RFC5334
+audio/parityfec 'IANA,RFC5109
 audio/PCMA 'IANA,RFC4856
 audio/PCMA-WB 'IANA,RFC5391
 audio/PCMU 'IANA,RFC4856
 audio/PCMU-WB 'IANA,RFC5391
+audio/prs.sid 'IANA,[Walleij]
 audio/QCELP 'IANA,RFC3555,RFC3625
 audio/RED 'IANA,RFC3555
-audio/SMV @smv 'IANA,RFC3558
-audio/SMV-QCP 'IANA,RFC3625
-audio/SMV0 'IANA,RFC3558
-audio/UEMCLIP 'IANA,RFC5686
-audio/VDVI 'IANA,RFC4856
-audio/VMR-WB 'IANA,RFC4348,RFC4424
-audio/ac3 'IANA,RFC4184
-audio/amr-wb+ 'IANA,RFC4352
-audio/asc 'IANA,RFC6295
-audio/basic @au,snd :base64 'IANA,RFC2045,RFC2046
-audio/clearmode 'IANA,RFC4040
-audio/dls 'IANA,RFC4613
-audio/dsr-es201108 'IANA,RFC3557
-audio/dsr-es202050 'IANA,RFC4060
-audio/dsr-es202211 'IANA,RFC4060
-audio/dsr-es202212 'IANA,RFC4060
-audio/eac3 'IANA,RFC4598
-audio/example 'IANA,RFC4735
-audio/fwdred 'IANA,RFC6354
-audio/iLBC 'IANA,RFC3952
-audio/ip-mr_v2.5 'IANA,RFC6262
-audio/mobile-xmf 'IANA,RFC4723
-audio/mp4 @mp4,mpg4 'IANA,RFC4337
-audio/mpa-robust 'IANA,RFC5219
-audio/mpeg @mpga,mp2,mp3 :base64 'IANA,RFC3003
-audio/mpeg4-generic 'IANA,RFC3640,RFC5691,RFC6295
-audio/ogg 'IANA,RFC5334
-audio/parityfec 'IANA,RFC5109
-audio/prs.sid 'IANA,[Walleij]
 audio/rtp-enc-aescm128 'IANA,[3GPP]
 audio/rtp-midi 'IANA,RFC6295
 audio/rtx 'IANA,RFC4588
+audio/SMV @smv 'IANA,RFC3558
+audio/SMV-QCP 'IANA,RFC3625
+audio/SMV0 'IANA,RFC3558
 audio/sp-midi 'IANA,[Kosonen],[T. White=T.White]
 audio/speex 'IANA,RFC5574
 audio/t140c 'IANA,RFC4351
 audio/t38 'IANA,RFC4612
 audio/telephone-event 'IANA,RFC4733
 audio/tone 'IANA,RFC4733
+audio/UEMCLIP 'IANA,RFC5686
 audio/ulpfec 'IANA,RFC5109
+audio/VDVI 'IANA,RFC4856
+audio/VMR-WB 'IANA,RFC4348,RFC4424
 audio/vnd.3gpp.iufp 'IANA,[Belling]
 audio/vnd.4SB 'IANA,[De Jaham]
-audio/vnd.CELP 'IANA,[De Jaham]
 audio/vnd.audiokoz 'IANA,[DeBarros]
+audio/vnd.CELP 'IANA,[De Jaham]
 audio/vnd.cisco.nse 'IANA,[Kumar]
 audio/vnd.cmles.radio-events 'IANA,[Goulet]
 audio/vnd.cns.anp1 'IANA,[McLaughlin]
@@ -129,3 +129,4 @@ audio/vnd.sealedmedia.softseal.mpeg @smp3,smp,s1m 'IANA,[Petersen]
 audio/vnd.vmx.cvsd 'IANA,[Vaudreuil]
 audio/vorbis 'IANA,RFC5215
 audio/vorbis-config 'IANA,RFC5215
+audio/webm @webm '{WebM=http://www.webmproject.org/code/specs/container/}

data/lib/mime/types/text.nonstandard

@@ -3,3 +3,4 @@ text/x-setext @etx
 text/x-vcalendar @vcs :8bit
 text/x-vcard @vcf :8bit
 text/x-yaml @yaml,yml :8bit
+text/x-coffescript @coffee :8bit

data/lib/mime/types/video

@@ -6,6 +6,7 @@ video/BMPEG 'IANA,RFC3555
 video/BT656 'IANA,RFC3555
 video/CelB 'IANA,RFC3555
 video/DV 'IANA,RFC3189
+video/example 'IANA,RFC4735
 video/H261 'IANA,RFC4587
 video/H263 'IANA,RFC3555
 video/H263-1998 'IANA,RFC4629
@@ -14,18 +15,16 @@ video/H264 'IANA,RFC6184
 video/H264-RCDO 'IANA,RFC6185
 video/H264-SVC 'IANA,RFC6190
 video/JPEG 'IANA,RFC3555
+video/jpeg2000 'IANA,RFC5371,RFC5372
 video/MJ2 @mj2,mjp2 'IANA,RFC3745
 video/MP1S 'IANA,RFC3555
 video/MP2P 'IANA,RFC3555
 video/MP2T 'IANA,RFC3555
+video/mp4 @mp4,mpg4,f4v,f4p 'IANA,RFC4337,RFC6381,{Adobe=http://www.kaourantin.net/2007/10/new-file-extensions-and-mime-types.html}
 video/MP4V-ES 'IANA,RFC6416
-video/MPV 'IANA,RFC3555
-video/SMPTE292M 'IANA,RFC3497
-video/example 'IANA,RFC4735
-video/jpeg2000 'IANA,RFC5371,RFC5372
-video/mp4 @mp4,mpg4 'IANA,RFC4337,RFC6381
 video/mpeg @mp2,mpe,mp3g,mpg :base64 'IANA,RFC2045,RFC2046
 video/mpeg4-generic 'IANA,RFC3640
+video/MPV 'IANA,RFC3555
 video/nv 'IANA,RFC4856
 video/ogg @ogv 'IANA,RFC5334
 video/parityfec 'IANA,RFC5109
@@ -34,6 +33,7 @@ video/quicktime @qt,mov :base64 'IANA,[Lindner]
 video/raw 'IANA,RFC4175
 video/rtp-enc-aescm128 'IANA,[3GPP]
 video/rtx 'IANA,RFC4588
+video/SMPTE292M 'IANA,RFC3497
 video/ulpfec 'IANA,RFC5109
 video/vc1 'IANA,RFC4425
 video/vnd.CCTV 'IANA,[Rottmann]
@@ -59,10 +59,11 @@ video/vnd.mpegurl @mxu,m4u :8bit 'IANA,[Recktenwald]
 video/vnd.ms-playready.media.pyv 'IANA,[DiAcetis]
 video/vnd.nokia.interleaved-multimedia @nim 'IANA,[Kangaslampi]
 video/vnd.nokia.videovoip 'IANA,[Nokia]
-video/vnd.objectvideo @mp4 'IANA,[Clark]
+video/vnd.objectvideo @mp4,m4v 'IANA,[Clark]
 video/vnd.sealed.mpeg1 @s11 'IANA,[Petersen]
 video/vnd.sealed.mpeg4 @smpg,s14 'IANA,[Petersen]
 video/vnd.sealed.swf @sswf,ssw 'IANA,[Petersen]
 video/vnd.sealedmedia.softseal.mov @smov,smo,s1q 'IANA,[Petersen]
 video/vnd.uvvu.mp4 'IANA,[Dolan]
 video/vnd.vivo @viv,vivo 'IANA,[Wolfe]
+video/webm @webm '{WebM=http://www.webmproject.org/code/specs/container/}

data/mime-types.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "mime-types"
-  s.version = "1.17.2"
+  s.version = "1.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Ziegler"]
-  s.date = "2011-10-25"
-  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.17.2. The identification of MIME content type is based\non a file's filename extensions.\n\nMIME::Types for Ruby originally based on and synchronized with MIME::Types for\nPerl 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\nHomepage::  http://mime-types.rubyforge.org/\nGitHub::    http://github.com/halostatue/mime-types/\nCopyright:: 2002 - 2011, Austin Ziegler\n            Based in part on prior work copyright Mark Overmeer\n\n:include: License.rdoc"
+  s.date = "2012-03-21"
+  s.description = "This library allows for the identification of a file's likely MIME content\ntype. This is release 1.17.2. The identification of MIME content type is based\non a file's filename extensions.\n\nMIME::Types for Ruby originally based on and synchronized with MIME::Types for\nPerl 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\n:include: Licence.rdoc"
   s.email = ["austin@rubyforge.org"]
-  s.extra_rdoc_files = ["Manifest.txt", "type-lists/application.txt", "type-lists/audio.txt", "type-lists/image.txt", "type-lists/message.txt", "type-lists/model.txt", "type-lists/multipart.txt", "type-lists/text.txt", "type-lists/video.txt", "History.rdoc", "License.rdoc", "README.rdoc"]
-  s.files = [".hoerc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "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", "type-lists/application.txt", "type-lists/audio.txt", "type-lists/image.txt", "type-lists/message.txt", "type-lists/model.txt", "type-lists/multipart.txt", "type-lists/text.txt", "type-lists/video.txt", "License.rdoc", ".gemtest"]
+  s.extra_rdoc_files = ["History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "type-lists/application.txt", "type-lists/audio.txt", "type-lists/image.txt", "type-lists/message.txt", "type-lists/model.txt", "type-lists/multipart.txt", "type-lists/text.txt", "type-lists/video.txt", "History.rdoc", "Licence.rdoc", "README.rdoc"]
+  s.files = [".gitignore", ".hoerc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "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", "type-lists/application.txt", "type-lists/audio.txt", "type-lists/image.txt", "type-lists/message.txt", "type-lists/model.txt", "type-lists/multipart.txt", "type-lists/text.txt", "type-lists/video.txt", ".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.10"
+  s.rubygems_version = "1.8.19"
   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"]
 
@@ -24,34 +24,34 @@ Gem::Specification.new do |s|
 
     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>, [">= 2.6.2"])
+      s.add_development_dependency(%q<minitest>, ["~> 2.11"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<nokogiri>, ["~> 1.5"])
-      s.add_development_dependency(%q<minitest>, ["~> 2.0"])
       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.0"])
       s.add_development_dependency(%q<hoe-seattlerb>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
       s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_dependency(%q<minitest>, [">= 2.6.2"])
+      s.add_dependency(%q<minitest>, ["~> 2.11"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<nokogiri>, ["~> 1.5"])
-      s.add_dependency(%q<minitest>, ["~> 2.0"])
       s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
       s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
       s.add_dependency(%q<hoe-git>, ["~> 1.0"])
       s.add_dependency(%q<hoe-seattlerb>, ["~> 1.0"])
-      s.add_dependency(%q<hoe>, ["~> 2.12"])
+      s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<minitest>, [">= 2.6.2"])
+    s.add_dependency(%q<minitest>, ["~> 2.11"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<nokogiri>, ["~> 1.5"])
-    s.add_dependency(%q<minitest>, ["~> 2.0"])
     s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
     s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
     s.add_dependency(%q<hoe-git>, ["~> 1.0"])
     s.add_dependency(%q<hoe-seattlerb>, ["~> 1.0"])
-    s.add_dependency(%q<hoe>, ["~> 2.12"])
+    s.add_dependency(%q<hoe>, ["~> 3.0"])
   end
 end

data/test/test_mime_type.rb

@@ -6,7 +6,7 @@ require 'minitest/autorun'
 
 class TestMIME_Type < MiniTest::Unit::TestCase
   def yaml_mime_type_from_array
-    yaml = MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'linux')
+    MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'linux')
   end
 
   def setup

metadata

@@ -1,183 +1,187 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mime-types
-version: !ruby/object:Gem::Version 
-  hash: 87
+version: !ruby/object:Gem::Version
+  version: '1.18'
   prerelease: 
-  segments: 
-  - 1
-  - 17
-  - 2
-  version: 1.17.2
 platform: ruby
-authors: 
+authors:
 - Austin Ziegler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.4
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe-doofus
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: hoe-doofus
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe-gemspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hoe-gemspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe-git
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hoe-git
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: hoe-seattlerb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hoe-seattlerb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id009
-description: |-
-  This library allows for the identification of a file's likely MIME content
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'This library allows for the identification of a file''s likely MIME
+  content
+
   type. This is release 1.17.2. The identification of MIME content type is based
-  on a file's filename extensions.
-  
+
+  on a file''s filename extensions.
+
+
   MIME::Types for Ruby originally based on and synchronized with MIME::Types for
+
   Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data
+
   format for the MIME::Type list has changed and the synchronization will no
+
   longer happen.
-  
-  Homepage::  http://mime-types.rubyforge.org/
-  GitHub::    http://github.com/halostatue/mime-types/
-  Copyright:: 2002 - 2011, Austin Ziegler
-              Based in part on prior work copyright Mark Overmeer
-  
-  :include: License.rdoc
-email: 
+
+
+  :include: Licence.rdoc'
+email:
 - austin@rubyforge.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- History.rdoc
+- Licence.rdoc
 - Manifest.txt
+- README.rdoc
 - type-lists/application.txt
 - type-lists/audio.txt
 - type-lists/image.txt
@@ -186,13 +190,11 @@ extra_rdoc_files:
 - type-lists/multipart.txt
 - type-lists/text.txt
 - type-lists/video.txt
-- History.rdoc
-- License.rdoc
-- README.rdoc
-files: 
+files:
+- .gitignore
 - .hoerc
 - History.rdoc
-- License.rdoc
+- Licence.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
@@ -235,38 +237,31 @@ files:
 - .gemtest
 homepage: http://mime-types.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mime-types
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
-summary: This library allows for the identification of a file's likely MIME content type
-test_files: 
+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

data/License.rdoc

@@ -1,10 +0,0 @@
-== License
-
-This software is available under a triple disjunctive license:
-{Ruby's license}[http://www.ruby-lang.org/en/LICENSE.txt],
-the
-{Perl Artistic license}[http://www.perl.com/pub/a/language/misc/Artistic.html],
-or the {GNU GPL version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html]
-(or at your option, any later verison).
-
-If you do not accept one of these licences, you may not use this software.