mongoid-grid_fs 1.7.1 → 1.8.0

data/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails"
+
+gemspec

data/lib/mongoid-grid_fs.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     class GridFS
-      const_set :Version, '1.7.1'
+      const_set :Version, '1.8.0'
 
       class << GridFS
         def version
@@ -211,6 +211,7 @@
             file
           rescue
             chunks.each{|chunk| chunk.destroy rescue nil}
+            raise
           end
 
           if defined?(Moped)
@@ -516,18 +517,50 @@
 
       def GridFS.extract_basename(object)
         filename = nil
+
         [:original_path, :original_filename, :path, :filename, :pathname].each do |msg|
           if object.respond_to?(msg)
             filename = object.send(msg)
             break
           end
         end
+
         filename ? cleanname(filename) : nil
       end
 
-      def GridFS.extract_content_type(filename)
-        content_type = MIME::Types.type_for(::File.basename(filename.to_s)).first
-        content_type.to_s if content_type
+      MIME_TYPES = {
+        'md' => 'text/x-markdown; charset=UTF-8'
+      }
+
+      def GridFS.mime_types
+        MIME_TYPES
+      end
+
+      def GridFS.extract_content_type(filename, options = {})
+        options.to_options!
+
+        basename = ::File.basename(filename.to_s)
+        parts = basename.split('.')
+        parts.shift
+        ext = parts.pop
+
+        default =
+          case
+            when options[:default]==false
+              nil
+            when options[:default]==true
+              "application/octet-stream"
+            else
+              (options[:default] || "application/octet-stream").to_s
+          end
+
+        content_type = mime_types[ext] || MIME::Types.type_for(::File.basename(filename.to_s)).first
+
+        if content_type
+          content_type.to_s
+        else
+          default
+        end
       end
 
       def GridFS.cleanname(pathname)
@@ -546,4 +579,19 @@
     class Mongoid::GridFS::Engine < Rails::Engine
       paths['app/models'] = File.dirname(__FILE__)
     end
+
+    module Mongoid::GridFSHelper
+      def grid_fs_render(grid_fs_file, options = {})
+        options.to_options!
+
+        if options[:inline] == false or options[:attachment] == true
+          headers['Content-Disposition'] = "attachment; filename=#{ grid_fs_file.filename }"
+        end
+
+        self.content_type = grid_fs_file.content_type
+        self.response_body = grid_fs_file
+      end
+    end
+
+    Mongoid::GridFS::Helper = Mongoid::GridFSHelper
   end

data/mongoid-grid_fs.gemspec

@@ -3,13 +3,14 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-grid_fs"
-  spec.version = "1.7.1"
+  spec.version = "1.8.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-grid_fs"
   spec.description = "a mongoid 3/moped compatible implementation of the grid_fs specification"
 
   spec.files =
-["README.md",
+["Gemfile",
+ "README.md",
  "Rakefile",
  "lib",
  "lib/app",

data/test/mongoid-grid_fs_test.rb

@@ -35,6 +35,12 @@ Testing Mongoid::GridFs do
       assert{ g.filename == filename }
     end
 
+    test 'when error occurs (eg. missing file)' do
+      file = '/path/to/missing'
+
+      assert_raises(Errno::ENOENT){ GridFs.put(file) }
+    end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-grid_fs
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -49,6 +49,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - README.md
 - Rakefile
 - lib/app/models/mongoid/grid_fs.rb