diff options
author | Arnaud Meuret <arnaud@meuret.net> | 2013-04-15 16:12:12 +0200 |
---|---|---|
committer | Arnaud Meuret <arnaud@meuret.net> | 2013-04-15 16:12:12 +0200 |
commit | 644259db36c69884735aa66aa6fdee690dfa9f7b (patch) | |
tree | b3d03b94398d67ae8138944250cd8a39eb465721 | |
parent | fd53425e33046932cebcf0d3d8f92c3e35cd4472 (diff) | |
download | git-644259db36c69884735aa66aa6fdee690dfa9f7b.tar.gz |
Enumerate MIME::Type objects instead of assoc arrays
-rw-r--r-- | lib/mime/types.rb | 5 | ||||
-rw-r--r-- | test/test_mime_types.rb | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/mime/types.rb b/lib/mime/types.rb index f1caf3c883..de2afec25c 100644 --- a/lib/mime/types.rb +++ b/lib/mime/types.rb @@ -597,12 +597,13 @@ module MIME @type_variants.values.flatten end + # Returns the number of known types. A shortcut of MIME::Types[//].size def count - @type_variants.size + defined_types.size end def each - @type_variants.each { |t| yield t } + defined_types.each { |t| yield t } end @__types__ = self.new(VERSION) diff --git a/test/test_mime_types.rb b/test/test_mime_types.rb index 0e476382c8..f8bfd2f9ba 100644 --- a/test/test_mime_types.rb +++ b/test/test_mime_types.rb @@ -72,7 +72,7 @@ class TestMIME_Types < MiniTest::Unit::TestCase #:nodoc: end def test_class_enumerable - assert( MIME::Types.any? {|types| types[0] == 'text/plain'} ) + assert( MIME::Types.any? {|type| type.content_type == 'text/plain'} ) end def test_class_count |