marcel 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebeab11624d6c1b4b72a14e95c14890dd764fcffb69b9a5100610bffdc2e2bd4
-  data.tar.gz: 0d16f4a85114b6fc2c86e14790b43cb43b384a97f829052e6ad5bb6a3af79661
+  metadata.gz: bc7fbdfb0773a80f6826742b37b9cda29b8052b0bfd150db03b6ba032bac9c1c
+  data.tar.gz: c69cee83d060a359318b4302703d276e1ad24aaa73f9c42b4e5af5870a96420e
 SHA512:
-  metadata.gz: e330a2b09a87d7bc1c03161798837e802db8ee5e9bae26959d472c4a38d95199be6a810291e1a472bc387ffb5c156b303677f51c3c75a76f5548bade4082829e
-  data.tar.gz: a37db2e01024e41ec3acd03923a50860c435430f9600aca27c47d7626ccc9de3f2415bd3a665f5e76e97956b27d851acd30734636d3a6070795c06e589a0d5a8
+  metadata.gz: 67ba30b3d8d1f0955397411e478b03844fb53219ceb557411a3059523f21c72fcb5379ae7d9095de1f3053e9c12c3751052db74b27d47a102a78080bb9083776
+  data.tar.gz: 7a3178742ed80dcc0f04781baba63dc8758b979d46c11a4ad9f0a365f334cd5ebd9a54ddd39da40f0f9583221bb50e157deee766a67a86fb2525cd19235a8194

data/lib/marcel/mime_type/definitions.rb

@@ -38,5 +38,7 @@ Marcel::MimeType.extend "image/heic", magic: [[4, "ftypheic"]], extensions: %w(
 Marcel::MimeType.extend "video/mp4", magic: [[4, "ftypisom"], [4, "ftypM4V "]], extensions: %w( mp4 m4v )
 
 Marcel::MimeType.extend "font/ttf", magic: [[0, "\x00\x01\x00\x00"]], extensions: %w( ttf ttc )
+Marcel::MimeType.extend "font/otf", magic: [[0, "OTTO"]], extensions: %w( otf ), parents: "font/ttf"
 Marcel::MimeType.extend "application/vnd.adobe.flash.movie", magic: [[0, "FWS"], [0, "CWS"]], extensions: %w( swf )
 Marcel::MimeType.extend "application/sql", extensions: %w( sql )
+Marcel::MimeType.extend "text/vcard", magic: [[0, "BEGIN:VCARD"]], extensions: %w( vcf ), parents: "text/plain"

data/lib/marcel/tables.rb

@@ -1139,6 +1139,8 @@ module Marcel
     'wmv' => 'video/x-ms-wmv',
     'wmx' => 'video/x-ms-wmx',
     'wmz' => 'application/x-ms-wmz',
+    'woff' => 'font/woff',
+    'woff2' => 'font/woff2',
     'wp' => 'application/vnd.wordperfect',
     'wp5' => 'application/vnd.wordperfect',
     'wp6' => 'application/vnd.wordperfect',
@@ -1908,6 +1910,8 @@ module Marcel
     'chemical/x-csml' => [%w(csml), %w(), nil],
     'chemical/x-pdb' => [%w(pdb), %w(), 'Brookhaven Protein Databank File'],
     'chemical/x-xyz' => [%w(xyz), %w(), nil],
+    'font/woff' => [%w(woff), %w(), nil],
+    'font/woff2' => [%w(woff2), %w(), nil],
     'image/aces' => [%w(exr), %w(), 'ACES Image Container File'],
     'image/avif' => [%w(avif), %w(), 'AV1 Image File'],
     'image/bmp' => [%w(bmp dib), %w(), 'Windows bitmap'],
@@ -2160,11 +2164,11 @@ module Marcel
     ['audio/mpeg', [[0, "\377\362"], [0, "\377\363"], [0, "\377\364"], [0, "\377\365"], [0, "\377\366"], [0, "\377\367"], [0, "\377\372"], [0, "\377\373"], [0, "\377\374"], [0, "\377\375"], [0, "\377\377"], [0, 'ID3']]],
     ['application/pdf', [[0, '%PDF-'], [0, "\357\273\277%PDF-"]]],
     ['application/msword', [[0..8, "\320\317\021\340\241\261\032\341", [[546, 'jbjb'], [546, 'bjbj']]]]],
-    ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', [[0, "PK\003\004", [[30, '[Content_Types].xml', [[0..4096, 'word/']]], [30, '_rels/.rels', [[0..4096, 'word/']]]]]]],
+    ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', [[0, "PK\003\004", [[30..65536, '[Content_Types].xml', [[0..4096, 'word/']]], [30, '_rels/.rels', [[0..4096, 'word/']]]]]]],
     ['application/vnd.ms-powerpoint', [[0..8, "\320\317\021\340\241\261\032\341", [[1152..4096, "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, "PK\003\004", [[30, '[Content_Types].xml', [[0..4096, 'ppt/']]], [30, '_rels/.rels', [[0..4096, 'ppt/']]]]]]],
+    ['application/vnd.openxmlformats-officedocument.presentationml.presentation', [[0, "PK\003\004", [[30..65536, '[Content_Types].xml', [[0..4096, 'ppt/']]], [30, '_rels/.rels', [[0..4096, 'ppt/']]]]]]],
     ['application/vnd.ms-excel', [[2080, 'Microsoft Excel 5.0 Worksheet'], [2080, 'Foglio di lavoro Microsoft Exce'], [2114, 'Biff5'], [2121, 'Biff5'], [0..8, "\320\317\021\340\241\261\032\341", [[1152..4096, "W\000o\000r\000k\000b\000o\000o\000k"]]]]],
-    ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', [[0, "PK\003\004", [[30, '[Content_Types].xml', [[0..4096, 'xl/']]], [30, '_rels/.rels', [[0..4096, 'xl/']]]]]]],
+    ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', [[0, "PK\003\004", [[30..65536, '[Content_Types].xml', [[0..4096, 'xl/']]], [30, '_rels/.rels', [[0..4096, 'xl/']]]]]]],
     ['application/x-dbf', [[0, "(?s)^[\\\\002\\\\003\\\\060\\\\061\\\\062\\\\103\\\\143\\\\203\\\\213\\\\313\\\\365\\\\345\\\\373].[\\\\001-\\\\014][\\\\001-\\\\037].{4}(?:.[^\\\\000]|[\\\\101-\\\\377].)(?:[^\\\\000\\\\001].|.[^\\\\000]).{31}(?<=[\\\\000][^\\\\000]{0,10})[A-Z@+]"]]],
     ['image/x-tga', [[1, "\001\001\000\000", [[8, ".*[\\\\124\\\\122\\\\125\\\\105\\\\126\\\\111\\\\123\\\\111\\\\117\\\\116\\\\055\\\\130\\\\106\\\\111\\\\114\\\\105\\\\056\\\\000]"]]], [1, "\000\002\000\000", [[8, ".*[\\\\124\\\\122\\\\125\\\\105\\\\126\\\\111\\\\123\\\\111\\\\117\\\\116\\\\055\\\\130\\\\106\\\\111\\\\114\\\\105\\\\056\\\\000]"]]], [1, "\000\003\000\000", [[8, ".*[\\\\124\\\\122\\\\125\\\\105\\\\126\\\\111\\\\123\\\\111\\\\117\\\\116\\\\055\\\\130\\\\106\\\\111\\\\114\\\\105\\\\056\\\\000]"]]]]],
     ['application/x-endnote-refer', [[0..50, '%A ', [[0..1000, "\n%D ", [[0..1000, "\n%T "]]]]]]],
@@ -2240,6 +2244,7 @@ module Marcel
     ['video/x-ogm', [[0, 'OggS', [[29, 'ideo']]]]],
     ['application/x-msdownload;format=pe', [[0, 'MZ', [[128, "PE\000\000"], [176, "PE\000\000"], [208, "PE\000\000"], [240, "PE\000\000"]]]]],
     ['application/applefile', [[0, "\000\005\026\000"]]],
+    ['application/dash+xml', [[0, '<MPD']]],
     ['application/dicom', [[128, 'DICM']]],
     ['application/epub+zip', [[0, "PK\003\004", [[30, 'mimetypeapplication/epub+zip']]]]],
     ['application/fits', [[0, 'SIMPLE  =                    T'], [0, 'SIMPLE  =                T']]],
@@ -2260,6 +2265,7 @@ module Marcel
     ['application/sereal;version=2', [[0, '=srl']]],
     ['application/sereal;version=3', [[0, "=\363rl"]]],
     ['application/timestamped-data', [[0, "0\200\006\v*\206H\206\367"]]],
+    ['application/vnd.apple.mpegurl', [[0, '#EXTM3U']]],
     ['application/vnd.digilite.prolights', [[0, "\177\fD+"]]],
     ['application/vnd.fdf', [[0, '%FDF-']]],
     ['application/vnd.java.hprof ', [[0, "JAVA PROFILE \\\\d\\\\.\\\\d\\\\.\\\\d\\\\u0000"]]],
@@ -2277,11 +2283,28 @@ module Marcel
     ['application/vnd.ms-outlook-pst', [[0, '!BDN', [[8, 'SM']]]]],
     ['application/vnd.ms-tnef', [[0, "x\237>\""]]],
     ['application/vnd.ms-works', [[0..8, "\320\317\021\340\241\261\032\341", [[1152..4096, "M\000a\000t\000O\000S\000T"]]]]],
+    ['application/vnd.oasis.opendocument.chart', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.chart']]]]],
+    ['application/vnd.oasis.opendocument.chart-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.chart-template']]]]],
+    ['application/vnd.oasis.opendocument.formula', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.formula']]]]],
+    ['application/vnd.oasis.opendocument.formula-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.formula-template']]]]],
+    ['application/vnd.oasis.opendocument.graphics', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.graphics']]]]],
+    ['application/vnd.oasis.opendocument.graphics-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.graphics-template']]]]],
+    ['application/vnd.oasis.opendocument.image', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.image']]]]],
+    ['application/vnd.oasis.opendocument.image-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.image-template']]]]],
+    ['application/vnd.oasis.opendocument.presentation', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.presentation']]]]],
+    ['application/vnd.oasis.opendocument.presentation-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.presentation-template']]]]],
+    ['application/vnd.oasis.opendocument.spreadsheet', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.spreadsheet']]]]],
+    ['application/vnd.oasis.opendocument.spreadsheet-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.spreadsheet-template']]]]],
+    ['application/vnd.oasis.opendocument.text', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text']]]]],
+    ['application/vnd.oasis.opendocument.text-master', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text-master']]]]],
+    ['application/vnd.oasis.opendocument.text-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text-template']]]]],
+    ['application/vnd.oasis.opendocument.text-web', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text-web']]]]],
     ['application/vnd.rn-realmedia', [[0, '.RMF']]],
     ['application/vnd.stardivision.calc', [[0..8, "\320\317\021\340\241\261\032\341", [[2048..2207, 'StarCalc']]]]],
     ['application/vnd.stardivision.draw', [[0..8, "\320\317\021\340\241\261\032\341", [[2048..2207, 'StarDraw']]]]],
     ['application/vnd.stardivision.impress', [[0..8, "\320\317\021\340\241\261\032\341", [[2048..2207, 'StarImpress']]]]],
     ['application/vnd.stardivision.writer', [[0..8, "\320\317\021\340\241\261\032\341", [[2048..2207, 'StarWriter']]]]],
+    ['application/vnd.sun.xml.writer', [[0, 'PK', [[30, 'mimetypeapplication/vnd.sun.xml.writer']]]]],
     ['application/vnd.symbian.install', [[8, "\031\004\000\020"]]],
     ['application/vnd.tcpdump.pcap', [[0, "\241\262\303\324"], [0, "\324\303\262\241"]]],
     ['application/vnd.wolfram.wl', [[0, '#!/usr/bin/env wolframscript']]],
@@ -2316,6 +2339,7 @@ module Marcel
     ['application/x-erdas-hfa', [[0, 'EHFA_HEADER_TAG']]],
     ['application/x-executable', [[0, "\177ELF", [[16, "\002\000"], [16, "\000\002"]]]]],
     ['application/x-filemaker', [[14, "\300HBAM7", [[525, "HBAM2101OCT99\301\002H\aPro 7.0\300\300"]]]]],
+    ['application/x-foxmail', [[0, "\020\020\020\020\020\020\020\021\021\021\021\021\021S"]]],
     ['application/x-gnumeric', [[39, '=<gmr:Workbook']]],
     ['application/x-grib', [[0, 'GRIB']]],
     ['application/x-gtar', [[257, "ustar  \000"]]],
@@ -2379,6 +2403,8 @@ module Marcel
     ['audio/x-ms-wma', [[0..8192, 'Windows Media Audio']]],
     ['audio/x-pn-realaudio', [[0, ".ra\375"]]],
     ['chemical/x-cdx', [[0, 'VjCD0100']]],
+    ['font/woff', [[0, 'wOFF']]],
+    ['font/woff2', [[0, 'wOF2']]],
     ['image/aces', [[0, "v/1\001\002\000\000\000"], [0, "v/1\001\002\004\000\000"]]],
     ['image/cgm', [[0, 'BEGMF']]],
     ['image/emf', [[0, "\001\000\000\000", [[40, ' EMF']]]]],
@@ -2435,6 +2461,7 @@ module Marcel
     ['video/mj2', [[0, "\000\000\000\fjP  \r\n\207\n", [[20, 'mjp2']]]]],
     ['video/x-jng', [[0, "\213JNG"]]],
     ['video/x-mng', [[0, "\212MNG"]]],
+    ['video/x-ms-asf', [[0, "0&\262u"]]],
     ['video/x-sgi-movie', [[0, "MOVI\000"], [0, "MOVI\001"], [0, "MOVI\002"], [0, "MOVI\376"], [0, "MOVI\377"]]],
     ['application/gzip', [[0, "\037\213"], [0, "\037\213"]]],
     ['application/zlib', [[0, "x\001"], [0, 'x^'], [0, "x\234"], [0, "x\332"]]],
@@ -2484,26 +2511,5 @@ module Marcel
     ['text/html', [[128..8192, '<html']]],
     ['text/plain', [[0, 'This is TeX,'], [0, 'This is METAFONT,'], [0, '/*'], [0, '//'], [0, ';;'], [0, "\376\377"], [0, "\377\376"], [0, "\357\273\277"]]],
     ['text/x-makefile', [[0, '# Makefile.in generated by'], [0, '#!make'], [0, '#!/usr/bin/make'], [0, '#!/usr/local/bin/make'], [0, '#!/usr/bin/env make']]],
-    ['application/dash+xml', [[0, '<MPD']]],
-    ['application/vnd.apple.mpegurl', [[0, '#EXTM3U']]],
-    ['application/vnd.oasis.opendocument.chart', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.chart']]]]],
-    ['application/vnd.oasis.opendocument.chart-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.chart-template']]]]],
-    ['application/vnd.oasis.opendocument.formula', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.formula']]]]],
-    ['application/vnd.oasis.opendocument.formula-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.formula-template']]]]],
-    ['application/vnd.oasis.opendocument.graphics', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.graphics']]]]],
-    ['application/vnd.oasis.opendocument.graphics-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.graphics-template']]]]],
-    ['application/vnd.oasis.opendocument.image', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.image']]]]],
-    ['application/vnd.oasis.opendocument.image-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.image-template']]]]],
-    ['application/vnd.oasis.opendocument.presentation', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.presentation']]]]],
-    ['application/vnd.oasis.opendocument.presentation-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.presentation-template']]]]],
-    ['application/vnd.oasis.opendocument.spreadsheet', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.spreadsheet']]]]],
-    ['application/vnd.oasis.opendocument.spreadsheet-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.spreadsheet-template']]]]],
-    ['application/vnd.oasis.opendocument.text', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text']]]]],
-    ['application/vnd.oasis.opendocument.text-master', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text-master']]]]],
-    ['application/vnd.oasis.opendocument.text-template', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text-template']]]]],
-    ['application/vnd.oasis.opendocument.text-web', [[0, 'PK', [[30, 'mimetypeapplication/vnd.oasis.opendocument.text-web']]]]],
-    ['application/vnd.sun.xml.writer', [[0, 'PK', [[30, 'mimetypeapplication/vnd.sun.xml.writer']]]]],
-    ['application/x-foxmail', [[0, "\020\020\020\020\020\020\020\021\021\021\021\021\021S"]]],
-    ['video/x-ms-asf', [[0, "0&\262u"]]],
   ]
 end

data/lib/marcel/version.rb

@@ -1,3 +1,3 @@
 module Marcel
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marcel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tom Ward
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -70,14 +70,14 @@ dependencies:
   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
 - !ruby/object:Gem::Dependency
@@ -108,7 +108,7 @@ files:
 - lib/marcel/mime_type/definitions.rb
 - lib/marcel/tables.rb
 - lib/marcel/version.rb
-homepage: https://github.com/basecamp/marcel
+homepage: https://github.com/rails/marcel
 licenses:
 - MIT
 - Apache-2.0