mimemagic 0.3.10 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea73bdcae338c252c11c8277843f7eb8dc44973bd5914d7196dba814c0bb857
-  data.tar.gz: 6896a7a176e4adb7d4d27b8f99680176511d0c0db910fa339b20333adf394f78
+  metadata.gz: 0ad244513ca271eba15ef628d0eb5b3aa4f85c8a0a58762f60d84e9d53e3581a
+  data.tar.gz: aa54cf7d2a7989f8eb415a50426a78a6f5b0a24e0d4e9697da6b42f825262c3f
 SHA512:
-  metadata.gz: d1a8cad78a3938f61c11e9e8f8ab751db7e02f6f778f4128a215b186f71836ecf2169e81133f1cd5f6171214108ca46526ab161edc618127983fe92c51847546
-  data.tar.gz: 1e5bc77bb41ec5b3be0d19c7f1d8883e5e313df1b1035b6429c05eb7082f33323cdf48152be3f400853e3bbf0dc5b40c7ace4ffec50a39006d2494ea9835a10a
+  metadata.gz: dcbb0ec87d4c684068d327117b4c1b189cc41ae8814606b4d19c483abfa7996dd54f5249f9f3bea5114de01eeab7d7d9fd99efdb5289781fd08ded8168e6ac5d
+  data.tar.gz: 0e2dbd497c0ea86fde6a5900a5bdd04a39200295bcc693071624f92a29ba4e070792fbe0b694ad4d56d0d24b1b274ec5e3c3ae277e72e95303e16fb27ae03618

data/.gitignore

@@ -2,12 +2,5 @@
 *.gem
 Gemfile.lock
 .bundle
-
-# doc
 .yardoc
-doc/
-
-vendor
-
-# don't include generated files
-lib/mimemagic/path.rb
+vendor

data/.yardopts

@@ -1,6 +1,2 @@
---markup-provider=redcarpet
---markup=markdown
 --no-private
-- README.md
-- LICENSE
-- CHANGELOG.md
+- README.md

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ### Breaking Changes
 
+## 0.4.1
+
+Remove `mimemagic/overlay` as it contains outdated, little used, data.
+
 ## 0.3.7 (2021-03-25)
 
 You will now need to ensure you have a copy of the fd.o shared MIME
@@ -18,32 +22,12 @@ None
 
 None
 
-## 0.3.10
-
-* Improve the development/test experience (@coldnebo, @kachick)
-
-* Ensure the gem works in environments with gem caching (@haines)
-
-* Add support for MacPorts installed dependencies (@brlanier)
-
-* Allow using a dummy XML file in cases where the gem is just a transient
-  dependency. (@Scharrels)
-  
-## 0.3.9 (2021-03-25)
-
-* Resolve issues parsing the version of freedesktop.org.xml shipped with
-  Ubuntu Trusty.
+## 0.4.1
 
-* Reintroduce overlays, since it seems at least some people were using
-  them.
-  
-* Make Rake a runtime dependency.
 
-* Fix the test suite.
-## 0.3.8 (2021-03-25)
+## 0.4.0
 
-Relax the dependency on Nokogiri to something less specific in order
-to avoid conflicting with other dependencies in people's applications.
+Yanked release.
 
 ## 0.3.7 (2021-03-25)
 

data/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org/'
 gemspec
 
-gem 'yard'
-gem 'redcarpet'
-gem 'github-markup'

data/README.md

@@ -46,10 +46,10 @@ http://www.rubydoc.info/github/mimemagicrb/mimemagic
 Tests
 =====
 
-```console
-$ bundle install
+```
+bundle install
 
-$ bundle exec rake test
+rake test
 ```
 
 Authors
@@ -62,4 +62,4 @@ Authors
 LICENSE
 =======
 
-{file:LICENSE MIT}
+MIT

data/Rakefile

@@ -1,15 +1,9 @@
 require 'rake/testtask'
-require 'rake/clean'
-
-namespace :ext do
-  load 'ext/mimemagic/Rakefile'
-end
-CLOBBER.include("lib/mimemagic/path.rb")
 
 task :default => %w(test)
 
 desc 'Run tests with minitest'
-Rake::TestTask.new("test" => "ext:default") do |t|
+Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = 'test/*_test.rb'
 end

data/ext/mimemagic/Rakefile

@@ -6,48 +6,28 @@ def locate_mime_database
     (File.expand_path(ENV["FREEDESKTOP_MIME_TYPES_PATH"]) if ENV["FREEDESKTOP_MIME_TYPES_PATH"]),
     "/usr/local/share/mime/packages/freedesktop.org.xml",
     "/opt/homebrew/share/mime/packages/freedesktop.org.xml",
-    "/opt/local/share/mime/packages/freedesktop.org.xml",
     "/usr/share/mime/packages/freedesktop.org.xml"
   ].compact
   path = possible_paths.find { |candidate| File.exist?(candidate) }
-
+  
   return path unless path.nil?
-  raise(<<-ERROR.gsub(/^ {3}/, ""))
+  raise(<<~ERROR)
    Could not find MIME type database in the following locations: #{possible_paths}
-
-   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
+   
+   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 
    of that file.
-
-   This gem might be installed as a dependency of some bigger package, such as rails, activestorage,
-   axlsx or cucumber. While most of these packages use the functionality of this gem, some gems have
-   included this gem by accident. Set USE_FREEDESKTOP_PLACEHOLDER=true if you are certain that you
-   do not need this gem, and wish to skip the inclusion of freedesktop.org.xml.
-
-   The FREEDESKTOP_PLACEHOLDER option is meant as a transitional feature, and will be deprecated in
-   the next release.
   ERROR
 end
 
 desc "Build a file pointing at the database"
 task :default do
-  mime_database_path = nil
-  if ENV["USE_FREEDESKTOP_PLACEHOLDER"] == "true"
-    File.write("../../dummy.xml", "")
-    mime_database_path = File.expand_path("../../dummy.xml")
-  else
-    mime_database_path = locate_mime_database
-  end
-  
-  target_dir = "#{ENV.fetch("RUBYARCHDIR", "../lib")}/mimemagic"
-  mkdir_p target_dir
-
-  open("#{target_dir}/path.rb", "w") do |f|
-    f.print(<<~SOURCE
+  mime_database_path = locate_mime_database
+  open("../../lib/mimemagic/path.rb", "w") do |f|
+    f.print(%Q{
       class MimeMagic
         DATABASE_PATH="#{mime_database_path}"
       end
-      SOURCE
-    )
+    })
   end
-end
+end

data/lib/mimemagic/tables.rb

@@ -26,16 +26,7 @@ class MimeMagic
         offset = offset.size == 2 ? offset[0]..offset[1] : offset[0]
         case type
         when 'string'
-          # 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
+          value.gsub!(/\\(x[\dA-Fa-f]{1,2}|0\d{1,3}|\d{1,3}|.)/) { eval("\"\\#{$1}\"") }
         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.10'
+  VERSION = '0.4.1'
 end

data/mimemagic.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.extensions = %w(ext/mimemagic/Rakefile)
 
   s.summary = 'Fast mime detection by extension or content'
-  s.description = 'Fast mime detection by extension or content (Uses freedesktop.org.xml shared-mime-info database)'
+  s.description = 'Fast mime detection by extension or content in pure ruby (Uses freedesktop.org.xml shared-mime-info database)'
   s.homepage = 'https://github.com/mimemagicrb/mimemagic'
   s.license = 'MIT'
 
-  s.add_dependency('nokogiri', '~> 1')
-  s.add_dependency('rake')
+  s.add_dependency('nokogiri', '~> 1.11.2')
 
   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.10
+  version: 0.4.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -17,43 +17,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '5.14'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
-description: Fast mime detection by extension or content (Uses freedesktop.org.xml
+        version: '13.0'
+description: Fast mime detection by extension or content in pure ruby (Uses freedesktop.org.xml
   shared-mime-info database)
 email:
 - mail@daniel-mendler.de
@@ -73,7 +73,6 @@ files:
 - Rakefile
 - ext/mimemagic/Rakefile
 - lib/mimemagic.rb
-- lib/mimemagic/overlay.rb
 - lib/mimemagic/tables.rb
 - lib/mimemagic/version.rb
 - mimemagic.gemspec

data/lib/mimemagic/overlay.rb

@@ -1,8 +0,0 @@
-# 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