From 8fc89d1d4fff405bd2580c6e76331ccc0e2a5357 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 2 Jun 2011 10:49:36 -0500
Subject: [PATCH] Add flash mime type

---
 lib/linguist/mime.rb   | 2 +-
 lib/linguist/mimes.yml | 3 +++
 test/test_mime.rb      | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/linguist/mime.rb b/lib/linguist/mime.rb
index 2daf4f80..badaa4eb 100644
--- a/lib/linguist/mime.rb
+++ b/lib/linguist/mime.rb
@@ -4,7 +4,7 @@ require 'yaml'
 # Register additional mime type extensions
 mime_extensions = YAML.load_file(File.expand_path("../mimes.yml", __FILE__))
 mime_extensions.each do |mime_type, exts|
-  mime = MIME::Types[mime_type].first
+  mime = MIME::Types[mime_type].first || MIME::Type.new(mime_type)
   exts.each { |ext| mime.extensions << ext }
   MIME::Types.index_extensions(mime)
 end
diff --git a/lib/linguist/mimes.yml b/lib/linguist/mimes.yml
index 7b1ae561..2be62e35 100644
--- a/lib/linguist/mimes.yml
+++ b/lib/linguist/mimes.yml
@@ -9,3 +9,6 @@ application/octet-stream:
 application/java-archive:
 - ear
 - war
+
+application/x-shockwave-flash:
+- swf
diff --git a/test/test_mime.rb b/test/test_mime.rb
index 1dd08fe2..9829b306 100644
--- a/test/test_mime.rb
+++ b/test/test_mime.rb
@@ -17,6 +17,8 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'application/sh', Mime.mime_for(".sh")
     assert_equal 'application/latex', Mime.mime_for(".latex")
 
+    assert_equal 'application/shockwave-flash', Mime.mime_for(".swf")
+
     assert_equal 'application/octet-stream', Mime.mime_for(".dmg")
     assert_equal 'application/octet-stream', Mime.mime_for(".exe")
     assert_equal 'application/octet-stream', Mime.mime_for(".dll")
@@ -38,6 +40,7 @@ class TestMime < Test::Unit::TestCase
     assert_equal 'text/plain; charset=utf-8', Mime.content_type_for(".sh")
     assert_equal 'text/plain; charset=utf-8', Mime.content_type_for(".latex")
 
+    assert_equal 'application/octet-stream', Mime.content_type_for(".swf")
     assert_equal 'application/octet-stream', Mime.content_type_for(".dmg")
     assert_equal 'application/octet-stream', Mime.content_type_for(".exe")
     assert_equal 'application/octet-stream', Mime.content_type_for(".dll")