mimemagic 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6da483b1c1d4378db22986ec169a3ec569d138a8ab29f5daeb065af66d39fbd
-  data.tar.gz: e987b92b51834ade1b3529b6cb7761d444d6e7089c070e2324ce97e9a22d135c
+  metadata.gz: 1d84538302b0c1f003f3e36f11e0e2835ca9b540a6e9a1d4a47b924fdf4776e6
+  data.tar.gz: 6d93e1248f0316bc5044ddd0e8d52de3578d3a75421b157a5de2e3679a091ea0
 SHA512:
-  metadata.gz: 250747be3d00f5deb7d0fef8cb6682b8f7589c26b640192aa4f53d6ee4025119063a59d64e2eea20aafb31e4abc231042ce3d1bca35555f8b6e94be220205aa8
-  data.tar.gz: 24a9b36f0ff3c788ec4f62e97e9526ec93b4b71625e3f722bc0b1d234fa879ee4ce7287913618471d8c8dedf8693eebfa1081afbd3933233ff5a9a7214018dd7
+  metadata.gz: 4df9042b85cb9ad4a775eb16a7b0818c7968e231c461acf03bb2d6e23aaacdb18d01949816be8f5978f963ce0285d59a3b393124c66b880b0eec5d0625642606
+  data.tar.gz: 52c7730c100af91b4231850ddc733b896b56db96513cc9661d984884bb19c61c46f1210959bb2608666488141d1eb54e33b610ebee9d3654d4c8f7b192ba0a00

data/CHANGELOG.md

@@ -18,6 +18,18 @@ None
 
 None
 
+## 0.3.9 (2021-03-25)
+
+* Resolve issues parsing the version of freedesktop.org.xml shipped with
+  Ubuntu Trusty.
+
+* Make Rake a runtime dependency.
+
+## 0.3.8 (2021-03-25)
+
+Relax the dependency on Nokogiri to something less specific in order
+to avoid conflicting with other dependencies in people's applications.
+
 ## 0.3.7 (2021-03-25)
 
 Add a dependency on having a preinstalled version of the fd.o shared

data/ext/mimemagic/Rakefile

@@ -9,13 +9,13 @@ def locate_mime_database
     "/usr/share/mime/packages/freedesktop.org.xml"
   ].compact
   path = possible_paths.find { |candidate| File.exist?(candidate) }
-  
+
   return path unless path.nil?
-  raise(<<~ERROR)
+  raise(<<-ERROR.gsub(/^ {3}/, ""))
    Could not find MIME type database in the following locations: #{possible_paths}
-   
-   Ensure you have either installed the shared-mime-types package for your distribution, or 
-   obtain a version of freedesktop.org.xml and set FREEDESKTOP_MIME_TYPES_PATH to the location 
+
+   Ensure you have either installed the shared-mime-info package for your distribution, or
+   obtain a version of freedesktop.org.xml and set FREEDESKTOP_MIME_TYPES_PATH to the location
    of that file.
   ERROR
 end
@@ -30,4 +30,4 @@ task :default do
       end
     })
   end
-end
+end

data/lib/mimemagic/overlay.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+ # Extra magic
+
+[['application/vnd.openxmlformats-officedocument.presentationml.presentation', [[0, "PK\003\004", [[0..5000, '[Content_Types].xml', [[0..5000, 'ppt/']]]]]]],
+ ['application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', [[0, "PK\003\004", [[0..5000, '[Content_Types].xml', [[0..5000, 'xl/']]]]]]],
+ ['application/vnd.openxmlformats-officedocument.wordprocessingml.document', [[0, "PK\003\004", [[0..5000, '[Content_Types].xml', [[0..5000, 'word/']]]]]]]].each do |magic|
+   MimeMagic.add(magic[0], magic: magic[1])
+end

data/lib/mimemagic/tables.rb

@@ -26,7 +26,16 @@ class MimeMagic
         offset = offset.size == 2 ? offset[0]..offset[1] : offset[0]
         case type
         when 'string'
-          value.gsub!(/\\(x[\dA-Fa-f]{1,2}|0\d{1,3}|\d{1,3}|.)/) { eval("\"\\#{$1}\"") }
+          # This *one* pattern match, in the entirety of fd.o's mime types blows up the parser
+          # because of the escape character \c, so right here we have a hideous hack to
+          # accommodate that.
+          if value == '\chapter'
+            '\chapter'
+          else
+            value.gsub!(/\\(x[\dA-Fa-f]{1,2}|0\d{1,3}|\d{1,3}|.)/) {
+              eval("\"\\#{$1}\"")
+            }
+          end
         when 'big16'
           value = str2int(value)
           value = ((value >> 8).chr + (value & 0xFF).chr)

data/lib/mimemagic/version.rb

@@ -1,5 +1,5 @@
 class MimeMagic
   # MimeMagic version string
   # @api public
-  VERSION = '0.3.7'
+  VERSION = '0.3.9'
 end

data/mimemagic.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/mimemagicrb/mimemagic'
   s.license = 'MIT'
 
-  s.add_dependency('nokogiri', '~> 1.11.2')
+  s.add_dependency('nokogiri', '~> 1')
+  s.add_dependency('rake')
 
   s.add_development_dependency('minitest', '~> 5.14')
-  s.add_development_dependency('rake', '~> 13.0')
 
   if s.respond_to?(:metadata)
     s.metadata['changelog_uri'] = "https://github.com/mimemagicrb/mimemagic/blob/master/CHANGELOG.md"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mimemagic
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Daniel Mendler
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '5.14'
 description: Fast mime detection by extension or content in pure ruby (Uses freedesktop.org.xml
   shared-mime-info database)
 email: