Make the collection Enumerable

2 files changed, 26 insertions, 0 deletions

diff --git a/lib/mime/types.rb b/lib/mime/types.rb
index c5d637750b..f1caf3c883 100644
--- a/lib/mime/types.rb
+++ b/lib/mime/types.rb
@@ -596,6 +596,14 @@ module MIME
     def defined_types #:nodoc:
       @type_variants.values.flatten
     end
+  
+    def count
+      @type_variants.size
+    end
+  
+    def each
+      @type_variants.each { |t| yield t }
+    end
 
     @__types__ = self.new(VERSION)
 
@@ -820,6 +828,16 @@ module MIME
         @__types__[type_id, flags]
       end
 
+      include Enumerable
+  
+      def count
+        @__types__.count
+      end
+
+      def each
+        @__types__.each {|t| yield t }
+      end
+
       # Return the list of MIME::Types which belongs to the file based on
       # its filename extension. If +platform+ is +true+, then only file
       # types that are specific to the current platform will be returned.
diff --git a/test/test_mime_types.rb b/test/test_mime_types.rb
index 77add31af6..0e476382c8 100644
--- a/test/test_mime_types.rb
+++ b/test/test_mime_types.rb
@@ -70,6 +70,14 @@ class TestMIME_Types < MiniTest::Unit::TestCase #:nodoc:
     assert_equal(MIME::Types.of('gif', true), MIME::Types['image/gif'])
     assert(MIME::Types.of('zzz').empty?)
   end
+  
+  def test_class_enumerable
+    assert( MIME::Types.any? {|types| types[0] == 'text/plain'} )
+  end
+  
+  def test_class_count
+    assert(MIME::Types.count > 42, "A lot of types are expected to be known.")
+  end
 
   def test_ebook_formats
     assert_equal( MIME::Types['application/x-mobipocket-ebook'],  MIME::Types.type_for("book.mobi"))