code cleanup, test added

chrugail · Jan 23, 2011 · 13b726a · 13b726a
1 parent 1926810
commit 13b726a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/mimemagic.rb b/lib/mimemagic.rb
@@ -9,9 +9,8 @@ class MimeMagic
 
   # Mime type by type string
   def initialize(type)
-    @type      = type
-    @mediatype = @type.split('/')[0]
-    @subtype   = @type.split('/')[1]
+    @type = type
+    @mediatype, @subtype = type.split('/', 2)
   end
 
   # Add custom mime type. Arguments:

diff --git a/test/mimemagic_test.rb b/test/mimemagic_test.rb
@@ -2,6 +2,12 @@
 require 'mimemagic'
 
 describe 'MimeMagic' do
+  it 'should have type, mediatype and subtype' do
+    MimeMagic.new('text/html').type.should.equal 'text/html'
+    MimeMagic.new('text/html').mediatype.should.equal 'text'
+    MimeMagic.new('text/html').subtype.should.equal 'html'
+  end
+
   it 'should have mediatype helpers' do
     MimeMagic.new('text/plain').should.be.text
     MimeMagic.new('text/html').should.be.text