Merge pull request #37 from RobCherry/all_by_magic

Add support for returning all possible mime types by magic.

.travis.yml

@@ -3,9 +3,13 @@ rvm:
   - 1.9.3
   - 1.9.3
   - 2.0.0
   - 2.0.0
   - 2.1.0
   - 2.1.0
+  - 2.2.0
+  - 2.3.0
   - ruby-head
   - ruby-head
   - jruby-19mode
   - jruby-19mode
   - rbx
   - rbx
+before_install:
+  - gem install bundler # the default bundler version on travis is very old and causes 1.9.3 build issues
 matrix:
 matrix:
   allow_failures:
   allow_failures:
     - rvm: ruby-head
     - rvm: ruby-head

lib/mimemagic.rb

@@ -76,19 +76,16 @@ class MimeMagic
   # Lookup mime type by magic content analysis.
   # Lookup mime type by magic content analysis.
   # This is a slow operation.
   # This is a slow operation.
   def self.by_magic(io)
   def self.by_magic(io)
-    mime =
-      unless io.respond_to?(:seek) && io.respond_to?(:read)
-        str = io.respond_to?(:read) ? io.read : io.to_s
-        str = str.force_encoding(Encoding::BINARY) if str.respond_to? :force_encoding
-        MAGIC.find {|type, matches| magic_match_str(str, matches) }
-      else
-        io.binmode
-        io.set_encoding(Encoding::BINARY) if io.respond_to?(:set_encoding)
-        MAGIC.find {|type, matches| magic_match_io(io, matches) }
-      end
+    mime = magic_match(io, :find)
     mime && new(mime[0])
     mime && new(mime[0])
   end
   end
 
 
+  # Lookup all mime types by magic content analysis.
+  # This is a slower operation.
+  def self.all_by_magic(io)
+    magic_match(io, :select).map { |mime| new(mime[0]) }
+  end
+
   # Return type as string
   # Return type as string
   def to_s
   def to_s
     type
     type
@@ -109,6 +106,18 @@ class MimeMagic
     child == parent || TYPES.key?(child) && TYPES[child][1].any? {|p| child?(p, parent) }
     child == parent || TYPES.key?(child) && TYPES[child][1].any? {|p| child?(p, parent) }
   end
   end
 
 
+  def self.magic_match(io, method)
+    if io.respond_to?(:seek) && io.respond_to?(:read)
+      io.binmode
+      io.set_encoding(Encoding::BINARY) if io.respond_to?(:set_encoding)
+      MAGIC.send(method) { |type, matches| magic_match_io(io, matches) }
+    else
+      str = io.respond_to?(:read) ? io.read : io.to_s
+      str = str.force_encoding(Encoding::BINARY) if str.respond_to?(:force_encoding)
+      MAGIC.send(method) { |type, matches| magic_match_str(str, matches) }
+    end
+  end
+
   def self.magic_match_io(io, matches)
   def self.magic_match_io(io, matches)
     matches.any? do |offset, value, children|
     matches.any? do |offset, value, children|
       match =
       match =
@@ -137,5 +146,5 @@ class MimeMagic
     end
     end
   end
   end
 
 
-  private_class_method :magic_match_io, :magic_match_str
+  private_class_method :magic_match, :magic_match_io, :magic_match_str
 end
 end

test/mimemagic_test.rb

@@ -65,6 +65,13 @@ describe 'MimeMagic' do
     end
     end
   end
   end
 
 
+  it 'should recognize all by magic' do
+    require 'mimemagic/overlay'
+    file = 'test/files/application.vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    mimes = %w[application/vnd.openxmlformats-officedocument.spreadsheetml.sheet application/zip]
+    MimeMagic.all_by_magic(File.read(file)).map(&:type).should.equal mimes
+  end
+
   it 'should have add' do
   it 'should have add' do
     MimeMagic.add('application/mimemagic-test',
     MimeMagic.add('application/mimemagic-test',
                   extensions: %w(ext1 ext2),
                   extensions: %w(ext1 ext2),