marcel 0.3.3 → 1.0.1

data/lib/marcel/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: marcel
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 1.0.1
 platform: ruby
 authors:
 - Tom Ward
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-15 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +28,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+- !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
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+description:
 email:
 - tom@basecamp.com
 executables: []
@@ -88,16 +102,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.md
 - lib/marcel.rb
+- lib/marcel/magic.rb
 - lib/marcel/mime_type.rb
 - 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
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Simple mime type detection using magic numbers, filenames, and extensions
 test_files: []

data/README.md

@@ -1,50 +0,0 @@
-# Marcel
-
-Marcel attempts to choose the most appropriate content type for a given file by looking at the binary data, the filename, and any declared type (perhaps passed as a request header):
-
-It's used like this:
-
-    Marcel::MimeType.for Pathname.new("example.gif")
-      => "image/gif"
-
-    File.open "example.gif" do |file|
-      Marcel::MimeType.for file
-    end
-      => "image/gif"
-
-    Marcel::MimeType.for Pathname.new("unrecognisable-data"), name: "example.pdf"
-      => "application/pdf"
-
-    Marcel::MimeType.for extension: ".pdf"
-      => "application/pdf"
-
-    Marcel::MimeType.for Pathname.new("unrecognisable-data"), name: "example", declared_type: "image/png"
-      => "image/png"
-
-    Marcel::MimeType.for StringIO.new(File.read "unrecognisable-data")
-      => "application/octet-stream"
-
-By preference, the magic number data in any passed in file is used to determine the type. If this doesn't work, it uses the type gleaned from the filename, extension, and finally the declared type. If no valid type is found in any of these, "application/octet-stream" is returned.
-
-Some types aren't easily recognised solely by magic number data. For example Adobe Illustrator files have the same magic number as PDFs (and can usually even be viewed in PDF viewers!). For these types, Marcel uses both the magic number data and the file name to work out the type:
-
-    Marcel::MimeType.for Pathname.new("example.ai"), name: "example.ai"
-      => "application/illustrator"
-
-This only happens when the type from the filename is a more specific type of that from the magic number. If it isn't the magic number alone is used.
-
-    Marcel::MimeType.for Pathname.new("example.png"), name: "example.ai"
-      => "image/png"
-    # As "application/illustrator" is not a more specific type of "image/png", the filename is ignored
-
-## Motivation
-
-Marcel was extracted from Basecamp 3, in order to make our file detection logic both easily reusable but more importantly, easily testable. Test fixtures have been added for all of the most common file types uploaded to Basecamp, and other common file types too. We hope to expand this test coverage with other file types as and when problems are identified.
-
-## Implementation
-
-At present, marcel is mainly a thin wrapper around the mimemagic gem. It adds priority logic (preferring magic over name when given both), some extra type definitions, and common type subclasses (including Keynote, Pages, etc).
-
-## Testing
-
-The main test fixture files are split into two folders, those that can be recognised by magic numbers, and those that can only be recognised by name. Even though strictly unnecessary, the fixtures in both folders should all be valid files of the type they represent.