jro_apps/redmine Commit - r12208:e1189c5335b9

Use the mime-types gem for getting mime types from filenames (#15790)....

Jean-Philippe Lang -

r12208:e1189c5335b9

parent child

Context file:

r12208:e1189c5335b9

Collapse all files

Gemfile +1 0

             source 'https://rubygems.org'
             gem "rails", "3.2.16"
             gem "jquery-rails", "~> 2.0.2"
             gem "coderay", "~> 1.1.0"
             gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
             gem "builder", "3.0.0"
+            gem "mime-types"
             # Optional gem for LDAP authentication
             group :ldap do
               gem "net-ldap", "~> 0.3.1"
             end
             # Optional gem for OpenID authentication
             group :openid do
               gem "ruby-openid", "~> 2.3.0", :require => "openid"
               gem "rack-openid"
             end
             platforms :mri, :mingw do
               # Optional gem for exporting the gantt to a PNG file, not supported with jruby
               group :rmagick do
                 # RMagick 2 supports ruby 1.9
                 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
                 # different requirements for the same gem on different platforms
                 gem "rmagick", ">= 2.0.0"
               end
               # Optional Markdown support, not for JRuby
               group :markdown do
                 # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
                 gem "redcarpet", "~> 2.3.0"
               end
             end
             platforms :jruby do
               # jruby-openssl is bundled with JRuby 1.7.0
               gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
               gem "activerecord-jdbc-adapter", "~> 1.3.2"
             end
             # Include database gems for the adapters found in the database
             # configuration file
             require 'erb'
             require 'yaml'
             database_file = File.join(File.dirname(__FILE__), "config/database.yml")
             if File.exist?(database_file)
               database_config = YAML::load(ERB.new(IO.read(database_file)).result)
               adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
               if adapters.any?
                 adapters.each do |adapter|
                   case adapter
                   when 'mysql2'
                     gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
                     gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
                   when 'mysql'
                     gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
                     gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
                   when /postgresql/
                     gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
                     gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
                   when /sqlite3/
                     gem "sqlite3", :platforms => [:mri, :mingw]
                     gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
                   when /sqlserver/
                     gem "tiny_tds", "~> 0.5.1", :platforms => [:mri, :mingw]
                     gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]
                   else
                     warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
                   end
                 end
               else
                 warn("No adapter found in config/database.yml, please configure it first")
               end
             else
               warn("Please configure your config/database.yml first")
             end
             group :development do
               gem "rdoc", ">= 2.4.2"
               gem "yard"
             end
             group :test do
               gem "shoulda", "~> 3.3.2"
               gem "mocha", ">= 0.14", :require => 'mocha/api'
               if RUBY_VERSION >= '1.9.3'
                 gem "capybara", "~> 2.1.0"
                 gem "selenium-webdriver"
               end
             end
             local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
             if File.exists?(local_gemfile)
               puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read(local_gemfile)
             end
             # Load plugins' Gemfiles
             Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
               puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
               #TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4)
               instance_eval File.read(file), file
             end

lib/redmine/mime_type.rb +7 -19

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+            require 'mime/types'
             module Redmine
               module MimeType
                 MIME_TYPES = {
                   'text/plain' => 'txt,tpl,properties,patch,diff,ini,readme,install,upgrade',
                   'text/css' => 'css',
                   'text/html' => 'html,htm,xhtml',
                   'text/jsp' => 'jsp',
                   'text/x-c' => 'c,cpp,cc,h,hh',
                   'text/x-csharp' => 'cs',
                   'text/x-java' => 'java',
                   'text/x-html-template' => 'rhtml',
                   'text/x-perl' => 'pl,pm',
                   'text/x-php' => 'php,php3,php4,php5',
                   'text/x-python' => 'py',
                   'text/x-ruby' => 'rb,rbw,ruby,rake,erb',
                   'text/x-csh' => 'csh',
                   'text/x-sh' => 'sh',
                   'text/xml' => 'xml,xsd,mxml',
                   'text/yaml' => 'yml,yaml',
                   'text/csv' => 'csv',
                   'text/x-po' => 'po',
                   'image/gif' => 'gif',
                   'image/jpeg' => 'jpg,jpeg,jpe',
                   'image/png' => 'png',
                   'image/tiff' => 'tiff,tif',
                   'image/x-ms-bmp' => 'bmp',
-                  'image/x-xpixmap' => 'xpm',
-                  'image/svg+xml'=> 'svg',
                   'application/javascript' => 'js',
                   'application/pdf' => 'pdf',
-                  'application/rtf' => 'rtf',
-                  'application/msword' => 'doc',
-                  'application/vnd.ms-excel' => 'xls',
-                  'application/vnd.ms-powerpoint' => 'ppt,pps',
-                  'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx',
-                  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
-                  'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
-                  'application/vnd.openxmlformats-officedocument.presentationml.slideshow' => 'ppsx',
-                  'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
-                  'application/vnd.oasis.opendocument.text' => 'odt',
-                  'application/vnd.oasis.opendocument.presentation' => 'odp',
-                  'application/x-7z-compressed' => '7z',
-                  'application/x-rar-compressed' => 'rar',
-                  'application/x-tar' => 'tar',
-                  'application/zip' => 'zip',
-                  'application/x-gzip' => 'gz',
                 }.freeze
                 EXTENSIONS = MIME_TYPES.inject({}) do |map, (type, exts)|
                   exts.split(',').each {|ext| map[ext.strip] = type}
                   map
                 end
                 # returns mime type for name or nil if unknown
                 def self.of(name)
                   return nil unless name
                   m = name.to_s.match(/(^|\.)([^\.]+)$/)
-                  EXTENSIONS[m[2].downcase] if m
+                  ext = m[2].downcase
+                  type = nil
+                  type = EXTENSIONS[ext] if m
+                  type ||= MIME::Types.find {|type| type.extensions.include?(ext)}.to_s.presence
+                  type
                 end
                 # Returns the css class associated to
                 # the mime type of name
                 def self.css_class_of(name)
                   mime = of(name)
                   mime && mime.gsub('/', '-')
                 end
                 def self.main_mimetype_of(name)
                   mimetype = of(name)
                   mimetype.split('/').first if mimetype
                 end
                 # return true if mime-type for name is type/*
                 # otherwise false
                 def self.is_type?(type, name)
                   main_mimetype = main_mimetype_of(name)
                   type.to_s == main_mimetype
                 end
               end
             end

test/unit/lib/redmine/mime_type_test.rb +5 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../test_helper', __FILE__)
             class Redmine::MimeTypeTest < ActiveSupport::TestCase
               def test_of
                 to_test = {'test.unk' => nil,
                            'test.txt' => 'text/plain',
                            'test.c' => 'text/x-c',
                            }
                 to_test.each do |name, expected|
                   assert_equal expected, Redmine::MimeType.of(name)
                 end
               end
               def test_css_class_of
                 to_test = {'test.unk' => nil,
                            'test.txt' => 'text-plain',
                            'test.c' => 'text-x-c',
                            }
                 to_test.each do |name, expected|
                   assert_equal expected, Redmine::MimeType.css_class_of(name)
                 end
               end
               def test_main_mimetype_of
                 to_test = {'test.unk' => nil,
                            'test.txt' => 'text',
                            'test.c' => 'text',
                            }
                 to_test.each do |name, expected|
                   assert_equal expected, Redmine::MimeType.main_mimetype_of(name)
                 end
               end
               def test_is_type
                 to_test = {['text', 'test.unk'] => false,
                            ['text', 'test.txt'] => true,
                            ['text', 'test.c'] => true,
                            }
                 to_test.each do |args, expected|
                   assert_equal expected, Redmine::MimeType.is_type?(*args)
                 end
               end
+              def test_should_default_to_mime_type_gem
+                assert !Redmine::MimeType::EXTENSIONS.keys.include?("zip")
+                assert_equal "application/zip", Redmine::MimeType.of("file.zip")
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages