epitools 0.4.48 → 0.4.49

data/VERSION

@@ -1 +1 @@
-0.4.48
+0.4.49

data/epitools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.48"
+  s.version = "0.4.49"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]

data/lib/epitools/mimemagic.rb

@@ -74,6 +74,11 @@ class MimeMagic
   def extensions
     TYPES.key?(type) ? TYPES[type][0] : []
   end
+  
+  # Default extension
+  def ext
+    extensions.first
+  end
 
   # Get mime comment
   def comment
@@ -131,11 +136,11 @@ class MimeMagic
   def self.magic_match(io, matches)
     matches.any? do |offset, value, children|
       match = if Range === offset
-		io.seek(offset.begin)
+                io.seek(offset.begin)
                 io.read(offset.end - offset.begin + value.length).include?(value)
               else
                 io.seek(offset)
-		value == io.read(value.length)
+                value == io.read(value.length)
               end
       match && (!children || magic_match(io, children))
     end

data/lib/epitools/mimemagic_tables.rb

@@ -1,4 +1,10 @@
 # Generated from freedesktop.org.xml
+
+#
+# TODO:
+#   Order by popularity, to speed up the MAGIC.find command.
+#
+
 class MimeMagic
   private
   EXTENSIONS = {
@@ -764,8 +770,8 @@ class MimeMagic
     'application/ogg' => [%w(ogx), %w(), "Ogg multimedia file"],
     'application/oxps' => [%w(oxps xps), %w(application/zip), "XPS document"],
     'application/pdf' => [%w(pdf), %w(), "PDF document"],
-    'application/pgp-encrypted' => [%w(asc gpg pgp), %w(), "PGP/MIME-encrypted message header"],
-    'application/pgp-keys' => [%w(asc pkr skr), %w(text/plain), "PGP keys"],
+    'application/pgp-encrypted' => [%w(pgp gpg asc), %w(), "PGP/MIME-encrypted message header"],
+    'application/pgp-keys' => [%w(pkr skr asc), %w(text/plain), "PGP keys"],
     'application/pkcs10' => [%w(p10), %w(), "PKCS#10 certification request"],
     'application/pkcs7-signature' => [%w(p7s), %w(text/plain), "detached S/MIME signature"],
     'application/pkcs8' => [%w(p8), %w(), "PKCS#8 private key"],
@@ -774,13 +780,13 @@ class MimeMagic
     'application/pkix-pkipath' => [%w(pkipath), %w(), "PkiPath certification path"],
     'application/postscript' => [%w(ps), %w(text/plain), "PS document"],
     'application/ram' => [%w(ram), %w(), "RealMedia Metafile"],
-    'application/rdf+xml' => [%w(owl rdf rdfs), %w(application/xml), "RDF file"],
+    'application/rdf+xml' => [%w(rdf owl rdfs), %w(application/xml), "RDF file"],
     'application/relax-ng-compact-syntax' => [%w(rnc), %w(text/plain), "RELAX NG XML schema"],
     'application/rss+xml' => [%w(rss), %w(application/xml), "RSS summary"],
     'application/rtf' => [%w(rtf), %w(text/plain), "RTF document"],
     'application/sdp' => [%w(sdp), %w(), "SDP multicast stream file"],
     'application/sieve' => [%w(siv), %w(application/xml), "Sieve mail filter script"],
-    'application/smil' => [%w(kino smi smil sml), %w(application/xml), "SMIL document"],
+    'application/smil' => [%w(smil kino smi sml), %w(application/xml), "SMIL document"],
     'application/vnd.apple.mpegurl' => [%w(m3u m3u8), %w(), "HTTP Live Streaming playlist"],
     'application/vnd.corel-draw' => [%w(cdr), %w(), "Corel Draw drawing"],
     'application/vnd.emusic-emusic_package' => [%w(emp), %w(), "eMusic download package"],
@@ -793,10 +799,10 @@ class MimeMagic
     'application/vnd.mozilla.xul+xml' => [%w(xul), %w(application/xml), "XUL interface document"],
     'application/vnd.ms-access' => [%w(mdb), %w(), "JET database"],
     'application/vnd.ms-cab-compressed' => [%w(cab), %w(), "Microsoft Cabinet archive"],
-    'application/vnd.ms-excel' => [%w(xla xlc xld xll xlm xls xlt xlw), %w(), "Excel spreadsheet"],
-    'application/vnd.ms-powerpoint' => [%w(pot pps ppt ppz), %w(), "PowerPoint presentation"],
+    'application/vnd.ms-excel' => [%w(xls xla xlc xld xll xlm xlt xlw), %w(), "Excel spreadsheet"],
+    'application/vnd.ms-powerpoint' => [%w(ppt pot pps ppz), %w(), "PowerPoint presentation"],
     'application/vnd.ms-tnef' => [%w(tnef tnf), %w(), "TNEF message"],
-    'application/vnd.ms-works' => [%w(wcm wdb wks wps), %w(application/x-ole-storage), "Microsoft Works document"],
+    'application/vnd.ms-works' => [%w(wks wcm wdb wps), %w(application/x-ole-storage), "Microsoft Works document"],
     'application/vnd.ms-wpl' => [%w(wpl), %w(), "WPL playlist"],
     'application/vnd.oasis.opendocument.chart' => [%w(odc), %w(application/zip), "ODC chart"],
     'application/vnd.oasis.opendocument.chart-template' => [%w(otc), %w(application/zip), "ODC template"],
@@ -819,10 +825,10 @@ class MimeMagic
     'application/vnd.oasis.opendocument.text-template' => [%w(ott), %w(application/zip), "ODT template"],
     'application/vnd.oasis.opendocument.text-web' => [%w(oth), %w(application/zip), "OTH template"],
     'application/vnd.openofficeorg.extension' => [%w(oxt), %w(application/zip), "OpenOffice.org extension"],
-    'application/vnd.openxmlformats-officedocument.presentationml.presentation' => [%w(pptm pptx), %w(application/zip), "PowerPoint 2007 presentation"],
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation' => [%w(pptx pptm), %w(application/zip), "PowerPoint 2007 presentation"],
     'application/vnd.openxmlformats-officedocument.presentationml.slideshow' => [%w(ppsx), %w(application/zip), "PowerPoint 2007 show"],
-    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => [%w(xlsm xlsx), %w(application/zip), "Excel 2007 spreadsheet"],
-    'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => [%w(docm docx), %w(application/zip), "Word 2007 document"],
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => [%w(xlsx xlsm), %w(application/zip), "Excel 2007 spreadsheet"],
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => [%w(docx docm), %w(application/zip), "Word 2007 document"],
     'application/vnd.rn-realmedia' => [%w(rm rmj rmm rms rmvb rmx), %w(), "RealMedia document"],
     'application/vnd.stardivision.calc' => [%w(sdc), %w(), "StarCalc spreadsheet"],
     'application/vnd.stardivision.chart' => [%w(sds), %w(), "StarChart chart"],
@@ -858,10 +864,10 @@ class MimeMagic
     'application/x-awk' => [%w(awk), %w(application/x-executable text/plain), "AWK script"],
     'application/x-bcpio' => [%w(bcpio), %w(), "BCPIO document"],
     'application/x-bittorrent' => [%w(torrent), %w(), "BitTorrent seed file"],
-    'application/x-blender' => [%w(blend blend blender), %w(), "Blender scene"],
+    'application/x-blender' => [%w(blender blend), %w(), "Blender scene"],
     'application/x-bzdvi' => [%w(dvi.bz2), %w(), "TeX DVI document (bzip-compressed)"],
-    'application/x-bzip' => [%w(bz bz2), %w(), "Bzip archive"],
-    'application/x-bzip-compressed-tar' => [%w(tar.bz tar.bz2 tbz tbz2), %w(application/x-bzip), "Tar archive (bzip-compressed)"],
+    'application/x-bzip' => [%w(bz2 bz), %w(), "Bzip archive"],
+    'application/x-bzip-compressed-tar' => [%w(tar.bz2 tar.bz tbz tbz2), %w(application/x-bzip), "Tar archive (bzip-compressed)"],
     'application/x-bzpdf' => [%w(pdf.bz2), %w(), "PDF document (bzip-compressed)"],
     'application/x-bzpostscript' => [%w(ps.bz2), %w(), "PostScript document (bzip-compressed)"],
     'application/x-cb7' => [%w(cb7), %w(application/x-7z-compressed), "comic book archive"],
@@ -874,7 +880,7 @@ class MimeMagic
     'application/x-chm' => [%w(chm), %w(), "CHM document"],
     'application/x-cisco-vpn-settings' => [%w(pcf), %w(), "Cisco VPN Settings"],
     'application/x-compress' => [%w(z), %w(), "UNIX-compressed file"],
-    'application/x-compressed-tar' => [%w(tar.gz taz tgz), %w(), "Tar archive (gzip-compressed)"],
+    'application/x-compressed-tar' => [%w(tar.gz tgz taz), %w(), "Tar archive (gzip-compressed)"],
     'application/x-cpio' => [%w(cpio), %w(), "CPIO archive"],
     'application/x-cpio-compressed' => [%w(cpio.gz), %w(), "CPIO archive (gzip-compressed)"],
     'application/x-csh' => [%w(csh), %w(application/x-shellscript text/plain), "C shell script"],
@@ -898,16 +904,16 @@ class MimeMagic
     'application/x-font-otf' => [%w(otf), %w(), "OpenType font"],
     'application/x-font-pcf' => [%w(pcf pcf.gz pcf.z), %w(), "PCF font"],
     'application/x-font-speedo' => [%w(spd), %w(), "Speedo font"],
-    'application/x-font-ttf' => [%w(ttc ttf), %w(), "TrueType font"],
+    'application/x-font-ttf' => [%w(ttf ttc), %w(), "TrueType font"],
     'application/x-font-ttx' => [%w(ttx), %w(text/xml), "TrueType XML font"],
-    'application/x-font-type1' => [%w(gsf pfa pfb), %w(application/postscript), "Postscript type-1 font"],
+    'application/x-font-type1' => [%w(pfb pfa gsf), %w(application/postscript), "Postscript type-1 font"],
     'application/x-gameboy-rom' => [%w(gb), %w(), "Game Boy ROM"],
     'application/x-gba-rom' => [%w(gba), %w(), "Game Boy Advance ROM"],
     'application/x-gedcom' => [%w(ged gedcom), %w(), "GEDCOM family history"],
     'application/x-genesis-rom' => [%w(gen md), %w(), "Genesis ROM"],
     'application/x-gettext-translation' => [%w(gmo mo), %w(), "translated messages (machine-readable)"],
     'application/x-glade' => [%w(glade), %w(application/xml), "Glade project"],
-    'application/x-gnucash' => [%w(gnc gnucash xac), %w(), "GnuCash financial data"],
+    'application/x-gnucash' => [%w(gnucash gnc xac), %w(), "GnuCash financial data"],
     'application/x-gnumeric' => [%w(gnumeric), %w(), "Gnumeric spreadsheet"],
     'application/x-gnuplot' => [%w(gnuplot gp gplt), %w(text/plain), "Gnuplot document"],
     'application/x-go-sgf' => [%w(sgf), %w(text/plain), "SGF record"],
@@ -917,7 +923,7 @@ class MimeMagic
     'application/x-gzip' => [%w(gz), %w(), "Gzip archive"],
     'application/x-gzpdf' => [%w(pdf.gz), %w(application/x-gzip), "PDF document (gzip-compressed)"],
     'application/x-gzpostscript' => [%w(ps.gz), %w(application/x-gzip), "PostScript document (gzip-compressed)"],
-    'application/x-hdf' => [%w(h4 h5 hdf hdf4 hdf5), %w(), "HDF document"],
+    'application/x-hdf' => [%w(hdf hdf4 hdf5 h4 h5), %w(), "HDF document"],
     'application/x-hwp' => [%w(hwp), %w(), "Haansoft Hangul document"],
     'application/x-hwt' => [%w(hwt), %w(), "Haansoft Hangul document template"],
     'application/x-ica' => [%w(ica), %w(text/plain), "Citrix ICA settings file"],
@@ -945,7 +951,7 @@ class MimeMagic
     'application/x-kspread' => [%w(ksp), %w(), "KSpread spreadsheet"],
     'application/x-kugar' => [%w(kud), %w(), "Kugar document"],
     'application/x-kword' => [%w(kwd kwt), %w(), "KWord document"],
-    'application/x-lha' => [%w(lha lzh), %w(), "LHA archive"],
+    'application/x-lha' => [%w(lzh lha), %w(), "LHA archive"],
     'application/x-lhz' => [%w(lhz), %w(), "LHZ archive"],
     'application/x-lrzip' => [%w(lrz), %w(), "Lrzip archive"],
     'application/x-lrzip-compressed-tar' => [%w(tar.lrz tlrz), %w(application/x-lrzip), "Tar archive (lrzip-compressed)"],
@@ -974,7 +980,7 @@ class MimeMagic
     'application/x-pak' => [%w(pak), %w(), "PAK archive"],
     'application/x-palm-database' => [%w(pdb prc), %w(), "Palm OS database"],
     'application/x-par2' => [%w(par2 par2), %w(), "Parchive archive"],
-    'application/x-perl' => [%w(al perl pl pm), %w(application/x-executable text/plain), "Perl script"],
+    'application/x-perl' => [%w(perl pl pm al), %w(application/x-executable text/plain), "Perl script"],
     'application/x-php' => [%w(php php3 php4), %w(text/plain), "PHP script"],
     'application/x-pkcs12' => [%w(p12 pfx), %w(), "PKCS#12 certificate bundle"],
     'application/x-pkcs7-certificates' => [%w(p7b spc), %w(), "PKCS#7 certificate bundle"],
@@ -1007,7 +1013,7 @@ class MimeMagic
     'application/x-sv4cpio' => [%w(sv4cpio), %w(), "SV4 CPIO archive"],
     'application/x-sv4crc' => [%w(sv4crc), %w(), "SV4 CPIO archive (with CRC)"],
     'application/x-t602' => [%w(602), %w(), "T602 document"],
-    'application/x-tar' => [%w(gem gtar tar), %w(), "Tar archive"],
+    'application/x-tar' => [%w(tar gtar gem), %w(), "Tar archive"],
     'application/x-tarz' => [%w(tar.z), %w(), "Tar archive (compressed)"],
     'application/x-tex-gf' => [%w(gf), %w(), "generic font file"],
     'application/x-tex-pk' => [%w(pk), %w(), "packed font file"],
@@ -1034,7 +1040,7 @@ class MimeMagic
     'application/xml' => [%w(rng xbl xml xsd), %w(text/plain), "XML document"],
     'application/xml-dtd' => [%w(dtd), %w(text/plain), "DTD file"],
     'application/xml-external-parsed-entity' => [%w(ent), %w(application/xml), "XML entities document"],
-    'application/xslt+xml' => [%w(xsl xslt), %w(application/xml), "XSLT stylesheet"],
+    'application/xslt+xml' => [%w(xslt xsl), %w(application/xml), "XSLT stylesheet"],
     'application/xspf+xml' => [%w(xspf), %w(application/xml), "XSPF playlist"],
     'application/zip' => [%w(zip), %w(), "Zip archive"],
     'audio/AMR' => [%w(amr), %w(), "AMR audio"],
@@ -1043,14 +1049,14 @@ class MimeMagic
     'audio/annodex' => [%w(axa), %w(application/annodex), "Annodex Audio"],
     'audio/basic' => [%w(au snd), %w(), "ULAW (Sun) audio"],
     'audio/flac' => [%w(flac), %w(), "FLAC audio"],
-    'audio/midi' => [%w(kar mid midi), %w(), "MIDI audio"],
+    'audio/midi' => [%w(midi mid kar), %w(), "MIDI audio"],
     'audio/mp2' => [%w(mp2), %w(), "MP2 audio"],
-    'audio/mp4' => [%w(aac f4a m4a), %w(), "MPEG-4 audio"],
+    'audio/mp4' => [%w(m4a aac f4a), %w(), "MPEG-4 audio"],
     'audio/mpeg' => [%w(mp3 mpga), %w(), "MP3 audio"],
-    'audio/ogg' => [%w(oga ogg spx), %w(application/ogg), "Ogg Audio"],
+    'audio/ogg' => [%w(ogg oga spx), %w(application/ogg), "Ogg Audio"],
     'audio/prs.sid' => [%w(psid sid), %w(), "Commodore 64 audio"],
     'audio/vnd.rn-realaudio' => [%w(ra rax), %w(), "RealAudio document"],
-    'audio/x-aiff' => [%w(aif aifc aiff), %w(), "AIFF/Amiga/Mac audio"],
+    'audio/x-aiff' => [%w(aiff aif aifc), %w(), "AIFF/Amiga/Mac audio"],
     'audio/x-ape' => [%w(ape), %w(), "Monkey's audio"],
     'audio/x-flac+ogg' => [%w(ogg), %w(audio/ogg), "Ogg FLAC audio"],
     'audio/x-gsm' => [%w(gsm), %w(), "GSM 06.10 audio"],
@@ -1060,7 +1066,7 @@ class MimeMagic
     'audio/x-matroska' => [%w(mka), %w(application/x-matroska), "Matroska audio"],
     'audio/x-minipsf' => [%w(minipsf), %w(audio/x-psf), "MiniPSF audio"],
     'audio/x-mo3' => [%w(mo3), %w(), "compressed Tracker audio"],
-    'audio/x-mod' => [%w(669 m15 med mod mtm ult uni), %w(), "Amiga SoundTracker audio"],
+    'audio/x-mod' => [%w(mod 669 m15 med mtm ult uni), %w(), "Amiga SoundTracker audio"],
     'audio/x-mpegurl' => [%w(m3u m3u8 vlc), %w(text/plain), "MP3 audio (streamed)"],
     'audio/x-ms-asx' => [%w(asx wax wmx wvx), %w(), "Microsoft ASX playlist"],
     'audio/x-ms-wma' => [%w(wma), %w(video/x-ms-asf), "Windows Media audio"],
@@ -1087,16 +1093,16 @@ class MimeMagic
     'image/fits' => [%w(fits), %w(), "FITS document"],
     'image/gif' => [%w(gif), %w(), "GIF image"],
     'image/ief' => [%w(ief), %w(), "IEF image"],
-    'image/jp2' => [%w(j2k jp2 jpc jpf jpx), %w(), "JPEG-2000 image"],
+    'image/jp2' => [%w(jp2 j2k jpc jpf jpx), %w(), "JPEG-2000 image"],
     'image/jpeg' => [%w(jpeg jpg jpe), %w(), "JPEG image"],
     'image/openraster' => [%w(ora), %w(), "OpenRaster archiving image"],
     'image/png' => [%w(png), %w(), "PNG image"],
     'image/rle' => [%w(rle), %w(), "Run Length Encoded bitmap image"],
     'image/svg+xml' => [%w(svg), %w(application/xml), "SVG image"],
     'image/svg+xml-compressed' => [%w(svgz), %w(application/x-gzip), "compressed SVG image"],
-    'image/tiff' => [%w(tif tiff), %w(), "TIFF image"],
+    'image/tiff' => [%w(tiff tif), %w(), "TIFF image"],
     'image/vnd.adobe.photoshop' => [%w(psd), %w(), "Photoshop image"],
-    'image/vnd.djvu' => [%w(djv djvu), %w(), "DjVu image"],
+    'image/vnd.djvu' => [%w(djvu djv), %w(), "DjVu image"],
     'image/vnd.dwg' => [%w(dwg), %w(), "AutoCAD image"],
     'image/vnd.dxf' => [%w(dxf), %w(), "DXF vector image"],
     'image/vnd.microsoft.icon' => [%w(ico), %w(), "Microsoft icon"],
@@ -1164,11 +1170,11 @@ class MimeMagic
     'text/calendar' => [%w(ics vcs), %w(text/plain), "VCS/ICS calendar"],
     'text/css' => [%w(css cssl), %w(text/x-csrc), "CSS stylesheet"],
     'text/csv' => [%w(csv), %w(text/plain), "CSV document"],
-    'text/directory' => [%w(gcrd vcf vct), %w(text/plain), "electronic business card"],
-    'text/html' => [%w(htm html), %w(text/plain), "HTML document"],
-    'text/plain' => [%w(asc txt), %w(), "plain text document"],
+    'text/directory' => [%w(vcf vct gcrd), %w(text/plain), "electronic business card"],
+    'text/html' => [%w(html htm), %w(text/plain), "HTML document"],
+    'text/plain' => [%w(txt asc), %w(), "plain text document"],
     'text/richtext' => [%w(rtx), %w(text/plain), "rich text document"],
-    'text/sgml' => [%w(sgm sgml), %w(text/plain), "SGML document"],
+    'text/sgml' => [%w(sgml sgm), %w(text/plain), "SGML document"],
     'text/spreadsheet' => [%w(slk sylk), %w(text/plain), "spreadsheet interchange document"],
     'text/tab-separated-values' => [%w(tsv), %w(text/plain), "TSV document"],
     'text/troff' => [%w(roff t tr), %w(text/plain), "Troff document"],
@@ -1178,10 +1184,10 @@ class MimeMagic
     'text/vnd.trolltech.linguist' => [%w(ts), %w(application/xml), "message catalog"],
     'text/vnd.wap.wml' => [%w(wml), %w(application/xml), "WML document"],
     'text/vnd.wap.wmlscript' => [%w(wmls), %w(), "WMLScript program"],
-    'text/x-adasrc' => [%w(adb ads), %w(text/plain), "Ada source code"],
+    'text/x-adasrc' => [%w(ads adb), %w(text/plain), "Ada source code"],
     'text/x-bibtex' => [%w(bib), %w(text/plain), "BibTeX document"],
-    'text/x-c++hdr' => [%w(h++ hh hp hpp hxx), %w(text/x-chdr), "C++ header"],
-    'text/x-c++src' => [%w(c c++ cc cpp cxx), %w(text/x-csrc), "C++ source code"],
+    'text/x-c++hdr' => [%w(hpp hh h++ hp hxx), %w(text/x-chdr), "C++ header"],
+    'text/x-c++src' => [%w(cpp c++ cc cxx c), %w(text/x-csrc), "C++ source code"],
     'text/x-chdr' => [%w(h), %w(text/x-csrc), "C header"],
     'text/x-cmake' => [%w(cmake), %w(text/plain), "CMake source code"],
     'text/x-cobol' => [%w(cbl cob), %w(text/plain), "COBOL source file"],
@@ -1213,17 +1219,17 @@ class MimeMagic
     'text/x-moc' => [%w(moc), %w(text/plain), "Qt MOC file"],
     'text/x-mof' => [%w(mof), %w(text/x-csrc), "Managed Object Format"],
     'text/x-mpsub' => [%w(sub), %w(text/plain), "MPSub subtitles"],
-    'text/x-mrml' => [%w(mrl mrml), %w(), "MRML playlist"],
+    'text/x-mrml' => [%w(mrml mrl), %w(), "MRML playlist"],
     'text/x-ms-regedit' => [%w(reg), %w(text/plain), "Windows Registry extract"],
     'text/x-mup' => [%w(mup not), %w(text/plain), "Mup publication"],
-    'text/x-nfo' => [%w(nfo), %w(text/x-readme), "NFO document"],
+    'text/x-nfo' => [%w(nfo), %w(text/x-readme), "NFO file"],
     'text/x-objcsrc' => [%w(m), %w(text/x-csrc), "Objective-C source code"],
     'text/x-ocaml' => [%w(ml mli), %w(), "OCaml source code"],
     'text/x-ocl' => [%w(ocl), %w(text/plain), "OCL file"],
     'text/x-ooc' => [%w(ooc), %w(text/x-csrc), "OOC source code"],
     'text/x-opml+xml' => [%w(opml), %w(application/xml), "OPML syndication feed"],
-    'text/x-pascal' => [%w(p pas), %w(text/plain), "Pascal source code"],
-    'text/x-patch' => [%w(diff patch), %w(text/plain), "differences between files"],
+    'text/x-pascal' => [%w(pas p), %w(text/plain), "Pascal source code"],
+    'text/x-patch' => [%w(patch diff), %w(text/plain), "differences between files"],
     'text/x-python' => [%w(py), %w(application/x-executable text/plain), "Python script"],
     'text/x-rpm-spec' => [%w(spec), %w(text/plain), "RPM spec file"],
     'text/x-scheme' => [%w(scm), %w(text/plain), "Scheme source code"],
@@ -1241,7 +1247,7 @@ class MimeMagic
     'text/x-troff-ms' => [%w(ms), %w(text/plain), "Troff MS input document"],
     'text/x-txt2tags' => [%w(t2t), %w(text/plain), "txt2tags document"],
     'text/x-uil' => [%w(uil), %w(text/plain), "X-Motif UIL table"],
-    'text/x-uri' => [%w(uri url), %w(text/plain), "resource location"],
+    'text/x-uri' => [%w(url uri), %w(text/plain), "resource location"],
     'text/x-vala' => [%w(vala vapi), %w(text/x-csrc), "Vala source code"],
     'text/x-verilog' => [%w(v), %w(text/plain), "Verilog source code"],
     'text/x-vhdl' => [%w(vhd vhdl), %w(text/plain), "VHDL source code"],
@@ -1251,15 +1257,15 @@ class MimeMagic
     'video/3gpp2' => [%w(3g2 3gp2 3gpp2), %w(video/mp4), "3GPP2 multimedia file"],
     'video/annodex' => [%w(axv), %w(application/annodex), "Annodex Video"],
     'video/dv' => [%w(dv), %w(), "DV video"],
-    'video/mp2t' => [%w(bdm bdmv clpi cpi m2t m2ts mpl mpls mts ts), %w(), "MPEG-2 transport stream"],
-    'video/mp4' => [%w(f4v m4v mp4), %w(), "MPEG-4 video"],
-    'video/mpeg' => [%w(mp2 mpe mpeg mpg vob), %w(), "MPEG video"],
+    'video/mp2t' => [%w(m2ts m2t bdm bdmv clpi cpi mpl mpls mts ts), %w(), "MPEG-2 transport stream"],
+    'video/mp4' => [%w(mp4 m4v f4v), %w(), "MPEG-4 video"],
+    'video/mpeg' => [%w(mpeg mpg mp2 mpe vob), %w(), "MPEG video"],
     'video/ogg' => [%w(ogv), %w(application/ogg), "Ogg Video"],
-    'video/quicktime' => [%w(moov mov qt qtvr), %w(), "QuickTime video"],
+    'video/quicktime' => [%w(mov qt moov qtvr), %w(), "QuickTime video"],
     'video/vivo' => [%w(viv vivo), %w(), "Vivo video"],
     'video/vnd.rn-realvideo' => [%w(rv rvx), %w(), "RealVideo document"],
     'video/webm' => [%w(webm), %w(), "WebM video"],
-    'video/x-flic' => [%w(flc fli), %w(), "FLIC animation"],
+    'video/x-flic' => [%w(fli flc), %w(), "FLIC animation"],
     'video/x-flv' => [%w(flv), %w(), "Flash video"],
     'video/x-javafx' => [%w(fxm), %w(video/x-flv), "JavaFX video"],
     'video/x-matroska' => [%w(mkv), %w(application/x-matroska), "Matroska video"],

data/lib/epitools/path.rb

@@ -458,6 +458,14 @@ class Path
     open { |io| MimeMagic.by_magic(io) }
   end
   
+  #
+  # The filetype (as a standard file extension), verified with Magic.
+  #
+  # (In other words, this will give you the *true* extension, even if the file's
+  # extension is wrong.)
+  #
+  # Note: Prefers long extensions (eg: jpeg over jpg)
+  #
   def type
     @magictype ||= proc do 
       
@@ -465,7 +473,7 @@ class Path
       magic = self.magic
       
       if !ext and magic
-        magic.extensions.first
+        magic.ext
       elsif ext and !magic
         ext
       elsif !ext and !magic
@@ -474,7 +482,7 @@ class Path
         if magic.extensions.include? ext
           ext
         else
-          magic.extensions.first # just incase the extension is incorrect
+          magic.ext # in case the supplied extension is wrong...
         end
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.4.48
+  version: 0.4.49
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75924720 !ruby/object:Gem::Requirement
+  requirement: &75824280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *75924720
+  version_requirements: *75824280
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &75924440 !ruby/object:Gem::Requirement
+  requirement: &75824040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *75924440
+  version_requirements: *75824040
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &75924150 !ruby/object:Gem::Requirement
+  requirement: &75823750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75924150
+  version_requirements: *75823750
 description: Miscellaneous utility libraries to make my life easier.
 email: chris@ill-logic.com
 executables: []