marcel 1.2.1 → 2.1.0

data/lib/marcel/tables.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # This file is auto-generated. Instead of editing this file, please
-# add MIMEs to data/custom.xml or lib/marcel/mime_type/definitions.rb.
+# add MIMEs to data/custom.xml or the definitions files under lib/marcel.
 
 module Marcel
   # @private
@@ -414,6 +414,7 @@ module Marcel
     'grv' => 'application/vnd.groove-injector',
     'grxml' => 'application/srgs+xml',
     'gsf' => 'application/x-font-ghostscript',
+    'gsheet' => 'application/vnd.google-apps.spreadsheet',
     'gslib' => 'audio/x-psf',
     'gtar' => 'application/x-gtar',
     'gtm' => 'application/vnd.groove-tool-message',
@@ -441,7 +442,7 @@ module Marcel
     'hpgl' => 'application/vnd.hp-hpgl',
     'hpid' => 'application/vnd.hp-hpid',
     'hpp' => 'text/x-c++hdr',
-    'hprof' => 'application/vnd.java.hprof ',
+    'hprof' => 'application/vnd.java.hprof',
     'hprof.txt' => 'application/vnd.java.hprof.text',
     'hps' => 'application/vnd.hp-hps',
     'hqx' => 'application/mac-binhex40',
@@ -769,7 +770,7 @@ module Marcel
     'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
     'ott' => 'application/vnd.oasis.opendocument.text-template',
     'owl' => 'application/rdf+xml',
-    'oxps' => 'application/vnd.ms-xpsdocument',
+    'oxps' => 'application/oxps',
     'oxt' => 'application/vnd.openofficeorg.extension',
     'p' => 'text/x-pascal',
     'p10' => 'application/pkcs10',
@@ -1360,6 +1361,7 @@ module Marcel
     'application/onenote; format=package' => %w(onepkg), # OneNote Package
     'application/onenote;format=one' => %w(one),
     'application/onenote;format=onetoc2' => %w(onetoc onetoc2), # OneNote Table of Contents
+    'application/oxps' => %w(oxps), # Open XML Paper Specification (OpenXPS)
     'application/patch-ops-error+xml' => %w(xer),
     'application/pdf' => %w(pdf), # Portable Document Format
     'application/pgp-encrypted' => %w(pgp gpg),
@@ -1496,6 +1498,7 @@ module Marcel
     'application/vnd.geogebra.tool' => %w(ggt),
     'application/vnd.geometry-explorer' => %w(gex gre),
     'application/vnd.gmx' => %w(gmx),
+    'application/vnd.google-apps.spreadsheet' => %w(gsheet), # Google Sheets
     'application/vnd.google-earth.kml+xml' => %w(kml), # Keyhole Markup Language
     'application/vnd.google-earth.kmz' => %w(kmz),
     'application/vnd.grafeq' => %w(gqf gqs),
@@ -1617,7 +1620,7 @@ module Marcel
     'application/vnd.ms-word.template.macroenabled.12' => %w(dotm), # Office Open XML Document Template (macro-enabled)
     'application/vnd.ms-works' => %w(wps wks wcm wdb),
     'application/vnd.ms-wpl' => %w(wpl),
-    'application/vnd.ms-xpsdocument' => %w(xps oxps), # Open XML Paper Specification
+    'application/vnd.ms-xpsdocument' => %w(xps), # Open XML Paper Specification
     'application/vnd.msa-disk-image' => %w(msa), # Magic Shadow Archiver
     'application/vnd.mseq' => %w(mseq),
     'application/vnd.musician' => %w(mus),
@@ -2238,7 +2241,163 @@ module Marcel
     'video/x-sgi-movie' => %w(movie),
     'x-conference/x-cooltalk' => %w(ice), # Cooltalk Audio
   }
+  # @private
+  # :nodoc:
+  TYPE_ALIASES = {
+    'application/acad' => 'image/vnd.dwg',
+    'application/autocad_dwg' => 'image/vnd.dwg',
+    'application/bat' => 'application/x-bat',
+    'application/binhex' => 'application/mac-binhex40',
+    'application/cdr' => 'application/coreldraw',
+    'application/dwg' => 'image/vnd.dwg',
+    'application/font-woff' => 'font/woff',
+    'application/font-woff2' => 'font/woff2',
+    'application/gzip-compressed' => 'application/gzip',
+    'application/gzipped' => 'application/gzip',
+    'application/javascript' => 'text/javascript',
+    'application/mac-binhex' => 'application/mac-binhex40',
+    'application/matlab-mat' => 'application/x-matlab-data',
+    'application/ms-tnef' => 'application/vnd.ms-tnef',
+    'application/msexcel' => 'application/vnd.ms-excel',
+    'application/msonenote' => 'application/onenote',
+    'application/mspowerpoint' => 'application/vnd.ms-powerpoint',
+    'application/pgp' => 'application/pgp-encrypted',
+    'application/photoshop' => 'image/vnd.adobe.photoshop',
+    'application/smil' => 'application/smil+xml',
+    'application/vnd.debian.binary-package' => 'application/x-debian-package',
+    'application/vnd.ms-opentype' => 'application/x-font-otf',
+    'application/vnd.ms-visio' => 'application/vnd.visio',
+    'application/vnd.ms-word' => 'application/msword',
+    'application/vnd.oasis.opendocument.database' => 'application/vnd.oasis.opendocument.base',
+    'application/x-123' => 'application/vnd.lotus-1-2-3',
+    'application/x-acad' => 'image/vnd.dwg',
+    'application/x-arj-compressed' => 'application/x-arj',
+    'application/x-autocad' => 'image/vnd.dwg',
+    'application/x-cdr' => 'application/coreldraw',
+    'application/x-coreldraw' => 'application/coreldraw',
+    'application/x-dbm' => 'application/x-berkeley-db',
+    'application/x-deflate' => 'application/zlib',
+    'application/x-dwg' => 'image/vnd.dwg',
+    'application/x-emf' => 'image/emf',
+    'application/x-frame' => 'application/vnd.mif',
+    'application/x-gnumeric-spreadsheet' => 'application/x-gnumeric',
+    'application/x-gunzip' => 'application/gzip',
+    'application/x-gzip' => 'application/gzip',
+    'application/x-gzip-compressed' => 'application/gzip',
+    'application/x-httpd-jsp' => 'text/x-jsp',
+    'application/x-java' => 'application/java-vm',
+    'application/x-java-vm' => 'application/java-vm',
+    'application/x-javascript' => 'text/javascript',
+    'application/x-kchart' => 'application/vnd.kde.kchart',
+    'application/x-koan' => 'application/vnd.koan',
+    'application/x-kpresenter' => 'application/vnd.kde.kpresenter',
+    'application/x-kspread' => 'application/vnd.kde.kspread',
+    'application/x-kword' => 'application/vnd.kde.kword',
+    'application/x-mif' => 'application/vnd.mif',
+    'application/x-mimearchive' => 'multipart/related',
+    'application/x-ms-emz' => 'image/x-emf-compressed',
+    'application/x-msi' => 'application/x-ms-installer',
+    'application/x-msmetafile' => 'image/wmf',
+    'application/x-ogg' => 'audio/vorbis',
+    'application/x-pdf' => 'application/pdf',
+    'application/x-rar' => 'application/x-rar-compressed',
+    'application/x-setupscript' => 'application/inf',
+    'application/x-speex' => 'audio/speex',
+    'application/x-tcl' => 'text/x-tcl',
+    'application/x-troff' => 'text/troff',
+    'application/x-troff-man' => 'text/troff',
+    'application/x-troff-me' => 'text/troff',
+    'application/x-troff-ms' => 'text/troff',
+    'application/x-unix-archive' => 'application/x-archive',
+    'application/x-vnd.oasis.opendocument.chart' => 'application/vnd.oasis.opendocument.chart',
+    'application/x-vnd.oasis.opendocument.chart-template' => 'application/vnd.oasis.opendocument.chart-template',
+    'application/x-vnd.oasis.opendocument.formula' => 'application/vnd.oasis.opendocument.formula',
+    'application/x-vnd.oasis.opendocument.formula-template' => 'application/vnd.oasis.opendocument.formula-template',
+    'application/x-vnd.oasis.opendocument.graphics' => 'application/vnd.oasis.opendocument.graphics',
+    'application/x-vnd.oasis.opendocument.graphics-template' => 'application/vnd.oasis.opendocument.graphics-template',
+    'application/x-vnd.oasis.opendocument.image' => 'application/vnd.oasis.opendocument.image',
+    'application/x-vnd.oasis.opendocument.image-template' => 'application/vnd.oasis.opendocument.image-template',
+    'application/x-vnd.oasis.opendocument.presentation' => 'application/vnd.oasis.opendocument.presentation',
+    'application/x-vnd.oasis.opendocument.presentation-template' => 'application/vnd.oasis.opendocument.presentation-template',
+    'application/x-vnd.oasis.opendocument.spreadsheet' => 'application/vnd.oasis.opendocument.spreadsheet',
+    'application/x-vnd.oasis.opendocument.spreadsheet-template' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+    'application/x-vnd.oasis.opendocument.text' => 'application/vnd.oasis.opendocument.text',
+    'application/x-vnd.oasis.opendocument.text-master' => 'application/vnd.oasis.opendocument.text-master',
+    'application/x-vnd.oasis.opendocument.text-template' => 'application/vnd.oasis.opendocument.text-template',
+    'application/x-vnd.oasis.opendocument.text-web' => 'application/vnd.oasis.opendocument.text-web',
+    'application/x-vnd.sun.xml.writer' => 'application/vnd.sun.xml.writer',
+    'application/x-windows-installer' => 'application/x-ms-installer',
+    'application/x-wine-extension-inf' => 'application/inf',
+    'application/x-x509-user-cert' => 'application/x-x509-cert',
+    'application/x-xml' => 'application/xml',
+    'application/x-yaml' => 'text/x-yaml',
+    'application/x-yml' => 'text/x-yaml',
+    'application/x-zip-compressed' => 'application/zip',
+    'application/yaml' => 'text/x-yaml',
+    'audio/aac' => 'audio/x-aac',
+    'audio/aiff' => 'audio/x-aiff',
+    'audio/flac' => 'audio/x-flac',
+    'audio/wav' => 'audio/vnd.wave',
+    'audio/wave' => 'audio/vnd.wave',
+    'audio/x-m4a' => 'audio/mp4',
+    'audio/x-mp4a' => 'audio/mp4',
+    'audio/x-mpeg' => 'audio/mpeg',
+    'audio/x-ogg-flac' => 'audio/x-oggflac',
+    'audio/x-ogg-pcm' => 'audio/x-oggpcm',
+    'audio/x-realaudio' => 'audio/x-pn-realaudio',
+    'audio/x-wav' => 'audio/vnd.wave',
+    'drawing/dwg' => 'image/vnd.dwg',
+    'drawing/x-dwf' => 'model/vnd.dwf',
+    'gzip/document' => 'application/gzip',
+    'image/cdr' => 'application/coreldraw',
+    'image/hevc' => 'image/heic',
+    'image/hevc-sequence' => 'image/heic-sequence',
+    'image/ntf' => 'image/nitf',
+    'image/vnd.dgn;ver=8' => 'image/vnd.dgn;version=8',
+    'image/x-bmp' => 'image/bmp',
+    'image/x-cdr' => 'application/coreldraw',
+    'image/x-dcx' => 'image/vnd.zbrush.dcx',
+    'image/x-dwg' => 'image/vnd.dwg',
+    'image/x-emf' => 'image/emf',
+    'image/x-icon' => 'image/vnd.microsoft.icon',
+    'image/x-jb2' => 'image/x-jbig2',
+    'image/x-ms-bmp' => 'image/bmp',
+    'image/x-pc-paintbrush' => 'image/vnd.zbrush.pcx',
+    'image/x-pcx' => 'image/vnd.zbrush.pcx',
+    'image/x-psd' => 'image/vnd.adobe.photoshop',
+    'image/x-targa' => 'image/x-tga',
+    'image/x-wmf' => 'image/wmf',
+    'image/xcf' => 'image/x-xcf',
+    'message/rfc2557' => 'multipart/related',
+    'text/properties' => 'text/x-java-properties',
+    'text/rss' => 'application/rss+xml',
+    'text/rtf' => 'application/rtf',
+    'text/vnd.yaml' => 'text/x-yaml',
+    'text/x-asm' => 'text/x-assembly',
+    'text/x-c' => 'text/x-csrc',
+    'text/x-dtd' => 'application/xml-dtd',
+    'text/x-java' => 'text/x-java-source',
+    'text/x-markdown' => 'text/markdown',
+    'text/x-properties' => 'text/x-java-properties',
+    'text/x-tex' => 'application/x-tex',
+    'text/x-texinfo' => 'application/x-texinfo',
+    'text/x-web-markdown' => 'text/markdown',
+    'text/x-yml' => 'text/x-yaml',
+    'text/xml' => 'application/xml',
+    'text/xml-external-parsed-entity' => 'application/xml-external-parsed-entity',
+    'text/xsl' => 'application/xslt+xml',
+    'text/yaml' => 'text/x-yaml',
+    'video/avi' => 'video/x-msvideo',
+    'video/jpm' => 'image/jpm',
+    'video/msvideo' => 'video/x-msvideo',
+    'video/x-daala' => 'video/daala',
+    'video/x-ogg-rgb' => 'video/x-oggrgb',
+    'video/x-ogg-uvs' => 'video/x-ogguvs',
+    'video/x-ogg-yuv' => 'video/x-oggyuv',
+    'video/x-theora' => 'video/theora',
+  }
   TYPE_PARENTS = {
+    'application/atom+xml' => %w(application/xml),
     'application/bizagi-modeler' => %w(application/zip),
     'application/dash+xml' => %w(application/xml),
     'application/dif+xml' => %w(application/xml),
@@ -2258,8 +2417,10 @@ module Marcel
     'application/onenote; format=package' => %w(application/vnd.ms-cab-compressed),
     'application/onenote;format=one' => %w(application/onenote),
     'application/onenote;format=onetoc2' => %w(application/onenote),
+    'application/oxps' => %w(application/x-tika-ooxml),
     'application/rdf+xml' => %w(application/xml),
     'application/relax-ng-compact-syntax' => %w(text/plain),
+    'application/rss+xml' => %w(application/xml),
     'application/rtf' => %w(text/plain),
     'application/sldworks' => %w(application/x-tika-msoffice),
     'application/smil+xml' => %w(application/xml),
@@ -2273,6 +2434,7 @@ module Marcel
     'application/vnd.apple.pages' => %w(application/vnd.apple.iwork),
     'application/vnd.etsi.asic-e+zip' => %w(application/zip),
     'application/vnd.etsi.asic-s+zip' => %w(application/zip),
+    'application/vnd.google-apps.spreadsheet' => %w(application/json),
     'application/vnd.google-earth.kml+xml' => %w(application/xml),
     'application/vnd.google-earth.kmz' => %w(application/zip),
     'application/vnd.iptc.g2.newsmessage+xml' => %w(application/xml),
@@ -2388,9 +2550,13 @@ module Marcel
     'application/x-xliff+xml' => %w(application/xml),
     'application/x-xliff+zip' => %w(application/zip),
     'application/x-xmind' => %w(application/zip),
+    'application/xhtml+xml' => %w(application/xml),
     'application/xml' => %w(text/plain),
     'application/xml-dtd' => %w(text/plain),
     'application/xquery' => %w(text/plain),
+    'application/xslfo+xml' => %w(application/xml),
+    'application/xslt+xml' => %w(application/xml),
+    'application/xspf+xml' => %w(application/xml),
     'audio/mp4' => %w(video/mp4),
     'audio/ogg' => %w(application/ogg),
     'audio/opus' => %w(audio/ogg),
@@ -2510,6 +2676,79 @@ module Marcel
     'video/x-ms-wmv' => %w(video/x-ms-asf),
     'video/x-ogm' => %w(video/ogg),
   }
+  # @private
+  # :nodoc:
+  ROOT_XML = {
+    [nil, 'ASX'] => 'application/x-ms-asx',
+    [nil, 'BODY'] => 'text/html',
+    [nil, 'DIF'] => 'application/dif+xml',
+    [nil, 'FRAMESET'] => 'text/html',
+    [nil, 'HTML'] => 'text/html',
+    [nil, 'IFRAME'] => 'text/html',
+    [nil, 'LINK'] => 'text/html',
+    [nil, 'MD_metadata'] => 'text/iso19139+xml',
+    [nil, 'ONIXMessage'] => 'application/onix-message+xml',
+    [nil, 'P'] => 'text/html',
+    [nil, 'PremiereData'] => 'image/vnd.adobe.premiere',
+    [nil, 'RDF'] => 'application/rdf+xml',
+    [nil, 'SCRIPT'] => 'text/html',
+    [nil, 'Workbook'] => 'application/vnd.ms-spreadsheetml',
+    [nil, 'amf'] => 'application/x-amf',
+    [nil, 'asx'] => 'application/x-ms-asx',
+    [nil, 'body'] => 'text/html',
+    [nil, 'concept'] => 'application/dita+xml;format=concept',
+    [nil, 'frameset'] => 'text/html',
+    [nil, 'html'] => 'text/html',
+    [nil, 'iframe'] => 'text/html',
+    [nil, 'kml'] => 'application/vnd.google-earth.kml+xml',
+    [nil, 'link'] => 'text/html',
+    [nil, 'map'] => 'application/dita+xml;format=map',
+    [nil, 'newsMessage'] => 'application/vnd.iptc.g2.newsmessage+xml',
+    [nil, 'p'] => 'text/html',
+    [nil, 'plist'] => 'application/x-plist',
+    [nil, 'rss'] => 'application/rss+xml',
+    [nil, 'script'] => 'text/html',
+    [nil, 'smil'] => 'application/smil+xml',
+    [nil, 'stata_dta'] => 'application/x-stata-dta',
+    [nil, 'task'] => 'application/dita+xml;format=task',
+    [nil, 'topic'] => 'application/dita+xml;format=topic',
+    [nil, 'val'] => 'application/dita+xml;format=val',
+    [nil, 'wordDocument'] => 'application/vnd.ms-wordml',
+    ['http://developer.apple.com/namespaces/keynote2', 'presentation'] => 'application/vnd.apple.keynote',
+    ['http://developer.apple.com/namespaces/ls', 'document'] => 'application/vnd.apple.numbers',
+    ['http://developer.apple.com/namespaces/sl', 'document'] => 'application/vnd.apple.pages',
+    ['http://docs.oasis-open.org/namespace', 'concept'] => 'application/dita+xml;format=concept',
+    ['http://docs.oasis-open.org/namespace', 'map'] => 'application/dita+xml;format=map',
+    ['http://docs.oasis-open.org/namespace', 'task'] => 'application/dita+xml;format=task',
+    ['http://docs.oasis-open.org/namespace', 'topic'] => 'application/dita+xml;format=topic',
+    ['http://docs.oasis-open.org/namespace', 'val'] => 'application/dita+xml;format=val',
+    ['http://earth.google.com/kml/2.0', 'kml'] => 'application/vnd.google-earth.kml+xml',
+    ['http://earth.google.com/kml/2.1', 'kml'] => 'application/vnd.google-earth.kml+xml',
+    ['http://earth.google.com/kml/2.2', 'kml'] => 'application/vnd.google-earth.kml+xml',
+    ['http://gcmd.gsfc.nasa.gov/Aboutus/xml/dif/', 'DIF'] => 'application/dif+xml',
+    ['http://iptc.org/std/nar/2006-10-01/', 'newsMessage'] => 'application/vnd.iptc.g2.newsmessage+xml',
+    ['http://ns.adobe.com/xdp/', 'xdp'] => 'application/vnd.adobe.xdp+xml',
+    ['http://ns.adobe.com/xfdf/', 'xfdf'] => 'application/vnd.adobe.xfdf',
+    ['http://ns.editeur.org/onix/3.0/reference', 'ONIXMessage'] => 'application/onix-message+xml',
+    ['http://ns.editeur.org/onix/3.0/short', 'ONIXmessage'] => 'application/onix-message+xml',
+    ['http://purl.org/atom/ns#', 'feed'] => 'application/atom+xml',
+    ['http://schemas.microsoft.com/office/2006/xmlPackage', 'package'] => 'application/vnd.ms-word2006ml',
+    ['http://schemas.microsoft.com/office/word/2003/wordml', 'wordDocument'] => 'application/vnd.ms-wordml',
+    ['http://www.gribuser.ru/xml/fictionbook/2.0', 'FictionBook'] => 'application/x-fictionbook+xml',
+    ['http://www.isotc211.org/2005/gmd', 'MD_metadata'] => 'text/iso19139+xml',
+    ['http://www.opengis.net/kml/2.2', 'kml'] => 'application/vnd.google-earth.kml+xml',
+    ['http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'RDF'] => 'application/rdf+xml',
+    ['http://www.w3.org/1999/XSL/Format', 'root'] => 'application/xslfo+xml',
+    ['http://www.w3.org/1999/XSL/Transform', 'stylesheet'] => 'application/xslt+xml',
+    ['http://www.w3.org/1999/xhtml', 'html'] => 'application/xhtml+xml',
+    ['http://www.w3.org/2000/svg', 'svg'] => 'image/svg+xml',
+    ['http://www.w3.org/2005/Atom', 'feed'] => 'application/atom+xml',
+    ['http://www.w3.org/ns/ttml', 'tt'] => 'application/ttml+xml',
+    ['http://xspf.org/ns/0/', 'playlist'] => 'application/xspf+xml',
+    ['urn:oasis:names:tc:opendocument:xmlns:office:1.0', 'document'] => 'application/vnd.oasis.opendocument.tika.flat.document',
+    ['urn:oasis:names:tc:xliff:document:1.2', 'xliff'] => 'application/x-xliff+xml',
+    ['urn:schemas-microsoft-com:office:spreadsheet', 'Workbook'] => 'application/vnd.ms-spreadsheetml',
+  }
   b = Hash.new { |h, k| h[k] = k.b.freeze }
   # @private
   # :nodoc:
@@ -2517,16 +2756,22 @@ module Marcel
     ['image/jpeg', [[0, b["\377\330\377"]]]],
     ['image/png', [[0, b["\211PNG\r\n\032\n"]]]],
     ['image/gif', [[0, b['GIF87a']], [0, b['GIF89a']]]],
+    ['image/x-canon-cr2', [[0, b["MM\000*"], [[8, b['CR']]]], [0, b["II*\000"], [[8, b['CR']]]], [0, b["MM\000+"], [[8, b['CR']]]]]],
     ['image/tiff', [[0, b["MM\000*"]], [0, b["II*\000"]], [0, b["MM\000+"]]]],
     ['image/bmp', [[0, b['BM'], [[26, b["\001\000"], [[0, nil, [[0, nil, [[28, b["\000\000"]], [28, b["\001\000"]], [28, b["\004\000"]], [28, b["\b\000"]], [28, b["\020\000"]], [28, b["\030\000"]], [28, b[" \000"]]]], [30, b["\000\000\000\000"]]]]]]]]]],
     ['image/vnd.adobe.photoshop', [[0, b["8BPS\000\001"]], [0, b["8BPS\000\002"]]]],
     ['image/webp', [[0, b['RIFF'], [[8, b['WEBP']]]]]],
-    ['text/html', [[0, /(?i)<(html|head|body|title|div)[ >]/], [0, /(?i)<h[123][ >]/]]],
     ['image/svg+xml', [[0, b['<svg']]]],
     ['video/x-msvideo', [[0, b['RIFF'], [[8, b['AVI ']]]], [8, b['AVI ']]]],
     ['video/x-ms-wmv', [[0..8192, b["W\000i\000n\000d\000o\000w\000s\000 \000M\000e\000d\000i\000a\000 \000V\000i\000d\000e\000o\000"]], [0..8192, b["V\000C\000-\0001\000 \000A\000d\000v\000a\000n\000c\000e\000d\000 \000P\000r\000o\000f\000i\000l\000e\000"]], [0..8192, b["w\000m\000v\0002\000"]]]],
     ['video/mp4', [[4, b['ftypmp41']], [4, b['ftypmp42']]]],
     ['audio/mp4', [[4, b['ftypM4A ']], [4, b['ftypM4B ']], [4, b['ftypF4A ']], [4, b['ftypF4B ']]]],
+    ['image/heic', [[4, b['ftypheic']], [4, b['ftypheix']]]],
+    ['image/heic-sequence', [[4, b['ftyphevc']], [4, b['ftyphevx']]]],
+    ['image/heif', [[4, b['ftypmif1']]]],
+    ['image/heif-sequence', [[4, b['ftypmsf1']]]],
+    ['image/x-canon-cr3', [[4, b['ftypcrx ']]]],
+    ['video/x-m4v', [[4, b['ftypM4V ']], [4, b['ftypM4VH']], [4, b['ftypM4VP']]]],
     ['video/quicktime', [[4, b["moov\000"]], [4, b["mdat\000"]], [4, b["free\000"]], [4, b["skip\000"]], [4, b["pnot\000"]], [4, b['ftyp']], [0, b["\000\000\000\bwide"]]]],
     ['video/mpeg', [[0, b["\000\000\001\263"]], [0, b["\000\000\001\272"]]]],
     ['video/webm', [[0, b["\032E\337\243"], [[4..4096, b["B\202"], [[4..4096, b['webm'], [[4..4096, b['V_VP8']], [4..4096, b['V_VP9']], [4..4096, b['V_AV1']]]]]]]]]],
@@ -2534,16 +2779,17 @@ module Marcel
     ['video/x-flv', [[0, b['FLV']]]],
     ['audio/mpeg', [[0, b["\377\362"]], [0, b["\377\363"]], [0, b["\377\364"]], [0, b["\377\365"]], [0, b["\377\366"]], [0, b["\377\367"]], [0, b["\377\372"]], [0, b["\377\373"]], [0, b["\377\374"]], [0, b["\377\375"]], [0, b["\377\343"]], [0, b['ID3']]]],
     ['application/pdf', [[0, b['%PDF-']], [0, b["\357\273\277%PDF-"]]]],
-    ['application/msword', [[0..8, b["\320\317\021\340\241\261\032\341"], [[546, b['jbjb']], [546, b['bjbj']]]]]],
+    ['application/msword', [[2080, b['Microsoft Word 6.0 Document']], [2080, b['Documento Microsoft Word 6']], [2112, b['MSWordDoc']], [0, b["1\276\000\000"]], [0, b['PO^Q`']], [0, b["\3767\000#"]], [0, b["\333\245-\000\000\000"]], [0, b["\224\246."]], [0..8, b["\320\317\021\340\241\261\032\341"], [[1152..4096, b["W\000o\000r\000d\000D\000o\000c\000u\000m\000e\000n\000t"]]]]]],
     ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', [[0, b["PK\003\004"], [[30..65536, b['[Content_Types].xml'], [[0..4096, b['word/']]]], [30, b['_rels/.rels'], [[0..4096, b['word/']]]]]]]],
     ['application/vnd.ms-powerpoint', [[0..8, b["\320\317\021\340\241\261\032\341"], [[1152..4096, b["P\000o\000w\000e\000r\000P\000o\000i\000n\000t\000 D\000o\000c\000u\000m\000e\000n\000t"]]]]]],
     ['application/vnd.openxmlformats-officedocument.presentationml.presentation', [[0, b["PK\003\004"], [[30..65536, b['[Content_Types].xml'], [[0..4096, b['ppt/']]]], [30, b['_rels/.rels'], [[0..4096, b['ppt/']]]]]]]],
+    ['application/x-tika-msworks-spreadsheet', [[0..8, b["\320\317\021\340\241\261\032\341"], [[1152..4096, b["W\000k\000s\000S\000S\000W\000o\000r\000k\000B\000o\000o\000k"]]]]]],
     ['application/vnd.ms-excel', [[2080, b['Microsoft Excel 5.0 Worksheet']], [2080, b['Foglio di lavoro Microsoft Exce']], [2114, b['Biff5']], [2121, b['Biff5']], [0..8, b["\320\317\021\340\241\261\032\341"], [[1152..4096, b["W\000o\000r\000k\000b\000o\000o\000k"]]]]]],
     ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', [[0, b["PK\003\004"], [[30..65536, b['[Content_Types].xml'], [[0..4096, b['xl/']]]], [30, b['_rels/.rels'], [[0..4096, b['xl/']]]]]]]],
     ['image/x-tga', [[1, b["\001\001\000\000"]], [1, b["\000\002\000\000"]], [1, b["\000\003\000\000"]]]],
     ['application/x-endnote-refer', [[0..50, b['%A '], [[0..1000, b["\n%D "], [[0..1000, b["\n%T "]]]]]]]],
     ['application/x-tmx', [[0..256, b['<tmx']]]],
-    ['image/svg+xml', [[0, b['<?xml'], [[25..512, b['<svg']]]]]],
+    ['image/svg+xml', [[0, b['<?xml'], [[21..512, b['<svg']]]]]],
     ['application/mbox', [[0, b['From '], [[32..256, b["\nFrom: "]], [32..256, b["\nDate: "]], [32..256, b["\nSubject: "]], [32..256, b["\nDelivered-To: "]], [32..256, b["\nReceived: by "]], [32..256, b["\nReceived: via "]], [32..256, b["\nReceived: from "]], [32..256, b["\nMime-Version: "]], [32..256, b["\nX-"], [[32..8192, b["\nFrom: "]], [32..8192, b["\nDate: "]], [32..8192, b["\nSubject: "]], [32..8192, b["\nDelivered-To: "]], [32..8192, b["\nReceived: by "]], [32..8192, b["\nReceived: via "]], [32..8192, b["\nReceived: from "]], [32..8192, b["\nMime-Version: "]]]]]]]],
     ['application/x-bplist', [[0, b["bplist\000\000"]], [0, b["bplist\000\001"]], [0, b["bplist@\000"]], [0, b['bplist00']], [0, b['bplist01']], [0, b['bplist10']], [0, b['bplist15']], [0, b['bplist16']]]],
     ['application/x-dvd-ifo', [[0, b['DVDVIDEO-VTS']], [0, b['DVDVIDEO-VMG']]]],
@@ -2553,6 +2799,8 @@ module Marcel
     ['image/svg+xml', [[0, b['<!--'], [[4..1024, b['<svg']]]]]],
     ['application/cbor', [[0, b["\331\331\367"]]]],
     ['application/coreldraw', [[0, b['RIFF'], [[8, b['CDR']], [8, b['cdr']], [8, b['DES']], [8, b['des']]]]]],
+    ['application/timestamped-data', [[0, b['0x30'], [[2..6, b["\006\v*\206H\206\367\r\001\t\020\001\037"]]]]]],
+    ['application/timestamped-data', [[0, b['0'], [[2..6, b["\006\v*\206H\206\367\r\001\t\020\001\037"]]]]]],
     ['application/vnd.etsi.asic-e+zip', [[0, b["PK\003\004"], [[30, b['mimetypeapplication/vnd.etsi.asic-e+zip']]]]]],
     ['application/vnd.etsi.asic-s+zip', [[0, b["PK\003\004"], [[30, b['mimetypeapplication/vnd.etsi.asic-s+zip']]]]]],
     ['application/vnd.ms-excel.sheet.2', [[0, b["\t\000\004\000"], [[4, b["\000\000\020\000"]], [4, b["\000\000 \000"]], [4, b["\000\000@\000"]]]]]],
@@ -2607,7 +2855,6 @@ module Marcel
     ['application/x-stata-dta;version=14', [[0, b['<stata_dta><header><release>118</release>']]]],
     ['application/x-stata-dta;version=8', [[0, b['<stata_dta><header><release>113</release>']]]],
     ['application/x-texnicard', [[0, b["SQLite format 3\000"], [[68, b["j\003WD"]]]]]],
-    ['application/x-tika-msworks-spreadsheet', [[0..8, b["\320\317\021\340\241\261\032\341"], [[1152..4096, b["W\000k\000s\000S\000S\000W\000o\000r\000k\000B\000o\000o\000k"]]]]]],
     ['audio/opus', [[0, b['OggS'], [[29, b['pusHead']]]]]],
     ['audio/speex', [[0, b['OggS'], [[29, b['peex   ']]]]]],
     ['audio/vorbis', [[0, b['OggS'], [[29, b['vorbis']]]]]],
@@ -2615,13 +2862,7 @@ module Marcel
     ['audio/x-oggflac', [[0, b['OggS'], [[29, b['LAC']]]]]],
     ['audio/x-oggpcm', [[0, b['OggS'], [[29, b['CM     ']]]]]],
     ['image/avif', [[4, b['ftypavif']]]],
-    ['image/heic', [[4, b['ftypheic']], [4, b['ftypheix']]]],
-    ['image/heic-sequence', [[4, b['ftyphevc']], [4, b['ftyphevx']]]],
-    ['image/heif', [[4, b['ftypmif1']]]],
-    ['image/heif-sequence', [[4, b['ftypmsf1']]]],
     ['image/svg+xml', [[0, b[' <svg']], [0, b["\n<svg"]], [0, b["\r<svg"]], [0, b["\r\n<svg"]], [0, b["\t<svg"]]]],
-    ['image/x-canon-cr2', [[0, b["MM\000*"], [[8, b['CR']]]], [0, b["II*\000"], [[8, b['CR']]]], [0, b["MM\000+"], [[8, b['CR']]]]]],
-    ['image/x-canon-cr3', [[4, b['ftypcrx ']]]],
     ['message/news', [[0, b['Path:']], [0, b['Xref:']]]],
     ['model/e57', [[0, b['ASTM-E57']]]],
     ['model/vnd.dwf;version=2', [[0, b['(DWF V00.22)']]]],
@@ -2634,7 +2875,6 @@ module Marcel
     ['video/daala', [[0, b['OggS'], [[29, b['daala']]]]]],
     ['video/theora', [[0, b['OggS'], [[29, b['theora']]]]]],
     ['video/x-dirac', [[0, b['OggS'], [[29, b['BCD']]]]]],
-    ['video/x-m4v', [[4, b['ftypM4V ']], [4, b['ftypM4VH']], [4, b['ftypM4VP']]]],
     ['video/x-oggrgb', [[0, b['OggS'], [[29, b['RGB']]]]]],
     ['video/x-ogguvs', [[0, b['OggS'], [[29, b['VS ']]]]]],
     ['video/x-oggyuv', [[0, b['OggS'], [[29, b['YUV']]]]]],
@@ -2661,7 +2901,7 @@ module Marcel
     ['application/java-vm', [[0, b["\312\376\272\276"]]]],
     ['application/mac-binhex40', [[11, b['must be converted with BinHex']]]],
     ['application/mathematica', [[0, b['(**']], [0, b['(* ']]]],
-    ['application/msword', [[2080, b['Microsoft Word 6.0 Document']], [2080, b['Documento Microsoft Word 6']], [2112, b['MSWordDoc']], [0, b["1\276\000\000"]], [0, b['PO^Q`']], [0, b["\3767\000#"]], [0, b["\333\245-\000\000\000"]], [0, b["\224\246."]], [0..8, b["\320\317\021\340\241\261\032\341"], [[1152..4096, b["W\000o\000r\000d\000D\000o\000c\000u\000m\000e\000n\000t"]]]]]],
+    ['application/msword', [[0..8, b["\320\317\021\340\241\261\032\341"], [[546, b['jbjb']], [546, b['bjbj']]]]]],
     ['application/msword2', [[0, b["\233\245"]], [0, b["\333\245"]]]],
     ['application/msword5', [[0, b["\3767"]]]],
     ['application/octet-stream', [[10, b['# This is a shell archive']], [0, b["\037\036"]], [0, b["\037\037"]], [0, b["\377\037"]], [0, b["\377\037"]], [0, b["\005\313"]]]],
@@ -2669,19 +2909,20 @@ module Marcel
     ['application/onenote;format=one', [[0, b["\344R\\{"], [[4, b["\214\330"], [[6, b["\247M"], [[8, b['0xAEB15378D02996D3']]]]]]]]]],
     ['application/onenote;format=onetoc2', [[0, b["\241/\377C"], [[4, b["\331\357"], [[6, b['vL'], [[8, b['0x9EE210EA5722765F']]]]]]]]]],
     ['application/pgp-encrypted', [[0, b["\205"], [[3, b["\003"]]]]]],
-    ['application/pkcs7-signature', [[0, b['-----BEGIN PKCS7']], [0, b['0x3080'], [[0, b["\006\t*\206H\206\367\r\001\a"], [[11, b["\240"]]]]]], [0, b['0x3081'], [[0, b["\006\t*\206H\206\367\r\001\a"], [[11, b["\240"]]]]]], [0, b['0x3082'], [[0, b["\006\t*\206H\206\367\r\001\a"], [[11, b["\240"]]]]]], [0, b['0x3083'], [[0, b["\006\t*\206H\206\367\r\001\a"], [[11, b["\240"]]]]]], [0, b['0x3084'], [[0, b["\006\t*\206H\206\367\r\001\a"], [[11, b["\240"]]]]]]]],
+    ['application/pkcs7-mime', [[0, b['0x30'], [[0, b["\006\v*\206H\206\367\r\001\t\020\001"]]]]]],
+    ['application/pkcs7-signature', [[0, b['-----BEGIN PKCS7']], [0, b['0x30'], [[0, b["\006\t*\206H\206\367\r\001\a"], [[11, b["\240"]]]]]]]],
     ['application/postscript', [[0, b['%!']], [0, b["\004%!"]], [0, b["\305\320\323\306"]], [0, b['%!PS-Adobe-3.0 EPSF-3.0']]]],
     ['application/rtf', [[0, b["{\\rtf"]]]],
     ['application/sereal;version=1', [[0, b['=srl']]]],
     ['application/sereal;version=2', [[0, b['=srl']]]],
     ['application/sereal;version=3', [[0, b["=\363rl"]]]],
-    ['application/timestamped-data', [[0, b["0\200\006\v*\206H\206\367"]]]],
+    ['application/vnd.android.axml', [[0, b["\003\000\b\000"], [[8, b["\001\000"]]]]]],
     ['application/vnd.apple.mpegurl', [[0, b['#EXTM3U']]]],
     ['application/vnd.digilite.prolights', [[0, b["\177\fD+"]]]],
     ['application/vnd.fdf', [[0, b['%FDF-']]]],
     ['application/vnd.iccprofile', [[36, b['acsp']]]],
-    ['application/vnd.java.hprof', [[0, /JAVA PROFILE \d\.\d\.\d\u0000/]]],
-    ['application/vnd.java.hprof.text', [[0, /JAVA PROFILE \d\.\d\.\d,/]]],
+    ['application/vnd.java.hprof', [[0, Regexp.new("JAVA PROFILE \\d\\.\\d\\.\\d\\u0000".b, 0).freeze]]],
+    ['application/vnd.java.hprof.text', [[0, Regexp.new("JAVA PROFILE \\d\\.\\d\\.\\d,".b, 0).freeze]]],
     ['application/vnd.lotus-1-2-3;version=1', [[0, b["\000\000\002\000\004\004"]]]],
     ['application/vnd.lotus-1-2-3;version=2', [[0, b["\000\000\002\000\006\004\006\000\b\000"]]]],
     ['application/vnd.lotus-1-2-3;version=3', [[0, b["\000\000\032\000\000\020\004\000"]]]],
@@ -2754,7 +2995,7 @@ module Marcel
     ['application/x-endnote-style', [[0, b["\000\b"], [[4, b["\000\000"], [[8, b['RSFTSTYL']], [8, b['ENDNENFT']]]]]]]],
     ['application/x-erdas-hfa', [[0, b['EHFA_HEADER_TAG']]]],
     ['application/x-executable', [[0, b["\177ELF"], [[16, b["\002\000"]], [16, b["\000\002"]]]]]],
-    ['application/x-fat-diskimage', [[0, b["\\353"], [[2, b["\\220"]]]]]],
+    ['application/x-fat-diskimage', [[0, b["\\xEB"], [[2, b["\\x90"]]]]]],
     ['application/x-filemaker', [[14, b["\300HBAM7"], [[525, b["HBAM2101OCT99\301\002H\aPro 7.0\300\300"]]]]]],
     ['application/x-foxmail', [[0, b["\020\020\020\020\020\020\020\021\021\021\021\021\021S"]]]],
     ['application/x-gnumeric', [[39, b['=<gmr:Workbook']]]],
@@ -2788,6 +3029,7 @@ module Marcel
     ['application/x-ole-storage', [[0..8, b["\320\317\021\340\241\261\032\341"]]]],
     ['application/x-parquet', [[0, b['PAR1']]]],
     ['application/x-pds', [[0, b['PDS_VERSION_ID']]]],
+    ['application/x-pkcs12', [[0, b['0x30'], [[2..6, b['0x02010330'], [[0, b["\006\t*\206H\206\367\r\001\a"]]]]]]]],
     ['application/x-project', [[0, b['MPX,Microsoft Project for Windows,']]]],
     ['application/x-prt', [[8, b['0M3C']]]],
     ['application/x-quattro-pro;version=1+5', [[0, b["\000\000\002\000\001\020"]]]],
@@ -2910,7 +3152,7 @@ module Marcel
     ['application/pdf', [[0..128, b['%%'], [[1..512, b['%PDF-1.']]]], [0..128, b['%%'], [[1..512, b['%PDF-2.']]]]]],
     ['application/vnd.wordperfect', [[0, b["\377WPC"]]]],
     ['application/x-bzip', [[0, b['BZ0']]]],
-    ['application/x-bzip2', [[0, /BZh[1-9]/]]],
+    ['application/x-bzip2', [[0, Regexp.new("BZh[1-9]".b, 0).freeze]]],
     ['application/x-font-adobe-metric', [[0, b['StartFontMetrics']]]],
     ['application/x-font-otf', [[0, b["OTTO\000"]]]],
     ['application/x-font-printer-metric', [[0, b["\000\001"], [[4, b["\000\000Copyr"]]]]]],
@@ -2925,13 +3167,11 @@ module Marcel
     ['application/x-stata-dta', [[0, b['<stata_dta>']]]],
     ['application/x-tar', [[257, b["ustar\000"]]]],
     ['application/x-tika-msoffice', [[0..8, b["\320\317\021\340\241\261\032\341"]]]],
-    ['application/xhtml+xml', [[0..8192, b['<html xmlns=']]]],
     ['audio/ac3', [[0, b["\vw"]]]],
     ['audio/amr', [[0, b["#!AMR\n"]], [0, b['#!AMR']]]],
     ['audio/x-aac', [[0, b['ID3']]]],
     ['image/vnd.zbrush.pcx', [[0, b["\n"], [[1, b["\000"]], [1, b["\002"]], [1, b["\003"]], [1, b["\004"]], [1, b["\005"]]]]]],
     ['message/rfc822', [[0..1000, b["\nMessage-ID:"]]]],
-    ['text/html', [[0..64, b['<!DOCTYPE HTML']], [0..64, b['<!DOCTYPE html']], [0..64, b['<!doctype HTML']], [0..64, b['<!doctype html']], [0..64, b['<HEAD']], [0..64, b['<head']], [0..64, b['<TITLE']], [0..64, b['<title']], [0..64, b['<HTML']], [0..128, b['<html']]]],
     ['text/vtt', [[0, b["WEBVTT\r"]], [0, b["WEBVTT\n"]], [0, b['0xfeff'], [[2, b["WEBVTT\r"]], [2, b["WEBVTT\n"]]]], [0, b['0xfeff'], [[2, b["WEBVTT\r"]], [2, b["WEBVTT\n"]]]], [0, b['0xefbbbf'], [[3, b["WEBVTT\r"]], [3, b["WEBVTT\n"]]]], [0, b["WEBVTT FILE\r"]], [0, b["WEBVTT FILE\n"]]]],
     ['application/inf', [[0, b['[version]']], [0, b['[strings]']]]],
     ['application/x-bibtex-text-file', [[0, b['%'], [[2..128, b["\n@article{"]], [2..128, b["\n@book{"]], [2..128, b["\n@inbook{"]], [2..128, b["\n@incollection{"]], [2..128, b["\n@inproceedings{"]], [2..128, b["\n@manual{"]], [2..128, b["\n@misc{"]], [2..128, b["\n@preamble{"]], [2..128, b["\n@phdthesis{"]], [2..128, b["\n@string{"]], [2..128, b["\n@techreport{"]], [2..128, b["\n@unpublished{"]]]]]],
@@ -2950,7 +3190,6 @@ module Marcel
     ['audio/x-aiff', [[0, b['FORM'], [[8, b['AIFF']]]], [0, b['FORM'], [[8, b['AIFC']]]], [0, b['FORM'], [[8, b['8SVX']]]], [0, b["FORM\000"]]]],
     ['audio/x-dec-adpcm', [[0, b["\000ds."], [[12, b["\000\000\000\027"]]]]]],
     ['audio/x-dec-basic', [[0, b["\000ds."], [[12, b["\000\000\000\001"]], [12, b["\000\000\000\002"]], [12, b["\000\000\000\003"]], [12, b["\000\000\000\004"]], [12, b["\000\000\000\005"]], [12, b["\000\000\000\006"]], [12, b["\000\000\000\a"]]]]]],
-    ['text/html', [[128..8192, b['<html']]]],
     ['text/plain', [[0, b['This is TeX,']], [0, b['This is METAFONT,']], [0, b['/*']], [0, b['//']], [0, b[';;']], [0, b["\376\377"]], [0, b["\377\376"]], [0, b["\357\273\277"]]]],
     ['text/x-makefile', [[0, b['# Makefile.in generated by']], [0, b['#!make']], [0, b['#!/usr/bin/make']], [0, b['#!/usr/local/bin/make']], [0, b['#!/usr/bin/env make']]]],
     ['audio/mpeg', [[0, b['ID3']]]],

data/lib/marcel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marcel
-  VERSION = "1.2.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marcel
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tom Ward
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -65,20 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.1
 email:
 - tom@basecamp.com
 executables: []
@@ -88,8 +74,12 @@ files:
 - APACHE-LICENSE
 - MIT-LICENSE
 - README.md
+- SECURITY.md
 - lib/marcel.rb
 - lib/marcel/magic.rb
+- lib/marcel/magic/definitions.rb
+- lib/marcel/magic/xml.rb
+- lib/marcel/magic/zip.rb
 - lib/marcel/mime_type.rb
 - lib/marcel/mime_type/definitions.rb
 - lib/marcel/tables.rb
@@ -107,14 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple mime type detection using magic numbers, filenames, and extensions
 test_files: []