From f126518566d31f494b555b11c1ce305af8abe35b Mon Sep 17 00:00:00 2001 From: Kyle Banker Date: Tue, 23 Feb 2010 18:25:28 -0500 Subject: [PATCH] use mime types only if we can load it --- lib/mongo/gridfs/grid_io.rb | 9 ++++++--- test/grid_io_test.rb | 13 ++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/mongo/gridfs/grid_io.rb b/lib/mongo/gridfs/grid_io.rb index 29f9137..e4a0089 100644 --- a/lib/mongo/gridfs/grid_io.rb +++ b/lib/mongo/gridfs/grid_io.rb @@ -15,7 +15,10 @@ # ++ require 'digest/md5' +begin require 'mime/types' +rescue LoadError +end module Mongo @@ -44,8 +47,8 @@ module Mongo # @options opts [ObjectID] :_id (ObjectID) a unique id for # the file to be use in lieu of an automatically generated one. # @options opts [String] :content_type ('binary/octet-stream') If no content type is specified, - # the content type will be inferred from the filename extension. If that can't be done, the default - # content type of 'binary/octet-stream' will be used. + # the content type will may be inferred from the filename extension if the mime-types gem can be + # loaded. Otherwise, the content type 'binary/octet-stream' will be used. # @options opts [Boolean] :safe (false) When safe mode is enabled, the chunks sent to the server # will be validated using an md5 hash. If validation fails, an exception will be raised. def initialize(files, chunks, filename, mode, opts={}) @@ -284,7 +287,7 @@ module Mongo # Initialize the class for writing a file. def init_write(opts) @files_id = opts[:_id] || Mongo::ObjectID.new - @content_type = opts[:content_type] || get_content_type || DEFAULT_CONTENT_TYPE + @content_type = opts[:content_type] || (defined? MIME) && get_content_type || DEFAULT_CONTENT_TYPE @chunk_size = opts[:chunk_size] || DEFAULT_CHUNK_SIZE @file_length = 0 @metadata = opts[:metadata] if opts[:metadata] diff --git a/test/grid_io_test.rb b/test/grid_io_test.rb index b93ee63..a8ac059 100644 --- a/test/grid_io_test.rb +++ b/test/grid_io_test.rb @@ -52,12 +52,15 @@ class GridIOTest < Test::Unit::TestCase end context "Content types" do - should "determine common content types from the extension" do - file = GridIO.new(@files, @chunks, 'sample.pdf', 'w') - assert_equal 'application/pdf', file.content_type - file = GridIO.new(@files, @chunks, 'sample.txt', 'w') - assert_equal 'text/plain', file.content_type + if defined?(MIME) + should "determine common content types from the extension" do + file = GridIO.new(@files, @chunks, 'sample.pdf', 'w') + assert_equal 'application/pdf', file.content_type + + file = GridIO.new(@files, @chunks, 'sample.txt', 'w') + assert_equal 'text/plain', file.content_type + end end should "default to binary/octet-stream when type is unknown" do