5416: Merge branch 'master' into 5416-arv-git-httpd

[arvados.git] / apps / workbench / config / initializers / mime_types.rb

diff --git a/apps/workbench/config/initializers/mime_types.rb b/apps/workbench/config/initializers/mime_types.rb
index ef95f43c246bd53a780790d905da0203371b7922..13d15e2d4dd0abcb79c8645c254e911fc289f11d 100644 (file)
--- a/apps/workbench/config/initializers/mime_types.rb
+++ b/apps/workbench/config/initializers/mime_types.rb
@@ -4,18 +4,17 @@
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
 
-# add new mime types to register
-Mime::Type.register "application/fa", :fa
-Mime::Type.register "application/fasta", :fasta
-Mime::Type.register "application/go", :go
-Mime::Type.register "application/r", :r
-Mime::Type.register "application/sam", :sam
+# add new mime types to MIME from mime_types gem
 
-# register MIME type with MIME::Type gem 
 require 'mime/types'
 include MIME
-MIME::Types.add(MIME::Type.from_array("application/fa", %(fa)))
-MIME::Types.add(MIME::Type.from_array("application/fasta", %(fasta)))
-MIME::Types.add(MIME::Type.from_array("application/go", %(go)))
-MIME::Types.add(MIME::Type.from_array("application/r", %(r)))
-MIME::Types.add(MIME::Type.from_array("application/sam", %(sam)))
+[
+  %w(fasta fa fas fsa seq),
+  %w(go),
+  %w(r),
+  %w(sam),
+].each do |suffixes|
+  if (MIME::Types.type_for(suffixes[0]).first.nil?)
+    MIME::Types.add(MIME::Type.new(["application/#{suffixes[0]}", suffixes]))
+  end
+end