mongoid-grid_fs 1.9.2 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjEyOWUxN2IxNjBkN2U3NDdhZjc1MDg1MWM2ZDI1ODA4ZTdjNzQ3MA==
+    MzI1NDRlODVhMWVmODUwZmNlNGQzYmQ3NmZmYWM3MzNlYWQ4ZWZjMA==
   data.tar.gz: !binary |-
-    ZmM1YWZkMzY5ZjEyMGJhNDc5NzNjODk2ZGUxOWY0YWQwNjYwOTM3Nw==
+    ZGFiNDQ5YWIwMzZiN2JmZjllYzYyODQyODAyNTY0OTQ0YzE0MWNlMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Zjk0ZmYzMmRmY2I3N2MxZTdhYTM4MjY3M2E2ZjU1Y2RkYTE1MTdkNjg3YTRi
-    ODhhMmE2NWVkMTgwMTRiMWU2OThlNmMxMWYyNjRhZGJjZDNiODUwMDQ4ODg2
-    YWIxMWE2MzY2NjIwYmViYTYxODI3NWEwZGEwNjY1OTRjM2ViNGQ=
+    OTYyNWQ0ZTEzZmM4ZTYwZWUyOTc4NWE4NGEyNzE1MDJiOTMzMTkzNDQxNTEz
+    OGMwMGNhYzQ5ZmQ0NTAxOThiY2FkYTZiZmY2YjZhYzFjMmEyMGQ5NGQwMWJk
+    NGI3YWEzZTEyMTA3OWFlZGM2OTJmOGJlYjk4YjZhOTZkZWE5Y2M=
   data.tar.gz: !binary |-
-    OGJhOGQwMjAwYmU4NzM5MTczNjhhYjE4ZmJmNTE1NmMwMmQ0OTk0ZTA5Mzdh
-    M2VkNjI5MDZjN2NmYzM0NTQyMmRmZDc2ZDhmMzFhMTkxYTVkMGQ2MWU0Y2Ux
-    NzU5NzZmZjNiYjg4MGNjNmZmYTM4ZWFiZGE3MmI0NmU5M2NiMmE=
+    YWUxMjcwMGRkY2EzYTI2Njk3MzgyYTRlNDg5MmJhMjVmNDRiNzllODQwNzlm
+    ZDI4ZmIwOWE0MmZhNjgzZDBiOGQ4YTZkODU2NWRlMDQwN2IwZDUyOThkNmJh
+    MDg2ZTZjNWIyN2E5MjA4MGM5MTc5NmZkY2IwZWQzZDZlMjk5NjI=

data/Gemfile

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

data/README.md

@@ -8,31 +8,36 @@ INSTALL
 
 SYNOPSIS
 --------
+```ruby
+  require 'mongoid-grid_fs'
 
-````ruby
-require 'mongoid-grid_fs'
-grid_fs = Mongoid::GridFs
-g = grid_fs.put(readable)
-id = g.id
-grid_fs.get(id)
-grid_fs.delete(id)
-````
+  grid_fs = Mongoid::GridFs
+
+  g = grid_fs.put(readable)
+
+  id = g.id
+
+  grid_fs.get(id)
+
+  grid_fs.delete(id)
+```
 
 DESCRIPTION
 -----------
 mongoid_grid_fs is a pure mongoid 3  / moped implementation of the mongodb
 grid_fs specification
 
-ref: http://www.mongodb.org/display/DOCS/GridFS+Specification
+ref: http://docs.mongodb.org/manual/reference/gridfs/
 
 it has the following features:
 
 - implementation is on top of mongoid for portability.  moped (the driver) is
-  barely used
+  barely used, so the library should be quite durable except in the face of
+  massive changes to mongoid itself.
 
 - simple, REST-like api
 
-- support for custom namespaces (fs.files vs. image.files)
+- support for custom namespaces (fs.files vs. image.files, as per the spec)
 
 - pathnames and io-like objects can be written to the grid
 
@@ -43,8 +48,7 @@ it has the following features:
 - [] and []= methods which allow the grid to be used like a giant file
   hash in the sky
 
-- supprt for data_uris
-
+- supprt for data_uris, like a html5 boss
   ````erb
 
     <%= image_tag :src => file.data_uri %>

data/Rakefile

@@ -1,33 +1,22 @@
-This.name =
-  "Mongoid::GridFs"
-
-This.synopsis =
-  "a mongoid 3/moped compatible implementation of the grid_fs specification"
-
-This.rubyforge_project = 'codeforpeople'
-This.author            = "Ara T. Howard"
-This.email             = "ara.t.howard@gmail.com"
-This.homepage          = "https://github.com/ahoward/#{ This.lib }"
-
-This.setup!
-
-
+task :license do
+  open('LICENSE', 'w'){|fd| fd.puts "Ruby"}
+end
 
 task :default do
   puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
 end
 
 task :test do
-  This.run_tests!
+  run_tests!
 end
 
 namespace :test do
-  task(:unit){ This.run_tests!(:unit) }
-  task(:functional){ This.run_tests!(:functional) }
-  task(:integration){ This.run_tests!(:integration) }
+  task(:unit){ run_tests!(:unit) }
+  task(:functional){ run_tests!(:functional) }
+  task(:integration){ run_tests!(:integration) }
 end
 
-def This.run_tests!(which = nil)
+def run_tests!(which = nil)
   which ||= '**'
   test_dir = File.join(This.dir, "test")
   test_glob ||= File.join(test_dir, "#{ which }/**_test.rb")
@@ -38,28 +27,29 @@ def This.run_tests!(which = nil)
 
   test_rbs.each_with_index do |test_rb, index|
     testno = index + 1
-    command = "#{ File.basename(This.ruby) } -I ./lib -I ./test/lib #{ test_rb }"
+    #command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
+    command = "#{ This.ruby } -I ./lib -I ./test/lib #{ test_rb }"
 
     puts
-    This.say(div, :color => :cyan, :bold => true)
-    This.say("@#{ testno } => ", :bold => true, :method => :print)
-    This.say(command, :color => :cyan, :bold => true)
-    This.say(line, :color => :cyan, :bold => true)
+    say(div, :color => :cyan, :bold => true)
+    say("@#{ testno } => ", :bold => true, :method => :print)
+    say(command, :color => :cyan, :bold => true)
+    say(line, :color => :cyan, :bold => true)
 
     system(command)
 
-    This.say(line, :color => :cyan, :bold => true)
+    say(line, :color => :cyan, :bold => true)
 
     status = $?.exitstatus
 
     if status.zero? 
-      This.say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
-      This.say("SUCCESS", :color => :green, :bold => true)
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("SUCCESS", :color => :green, :bold => true)
     else
-      This.say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
-      This.say("FAILURE", :color => :red, :bold => true)
+      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
+      say("FAILURE", :color => :red, :bold => true)
     end
-    This.say(line, :color => :cyan, :bold => true)
+    say(line, :color => :cyan, :bold => true)
 
     exit(status) unless status.zero?
   end
@@ -68,10 +58,10 @@ end
 
 task :gemspec do
   ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
-  ignore_directories = ['pkg', 'db', 'vendor', 'gemfiles']
-  ignore_files = ['test/log', 'test/db.yml', 'a.rb', 'b.rb'] + Dir['Gemfile*'] + %w'db'
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
 
-  shiteless =
+  shiteless = 
     lambda do |list|
       list.delete_if do |entry|
         next unless test(?e, entry)
@@ -79,8 +69,9 @@ task :gemspec do
         ignore_extensions.any?{|ext| ext === extension}
       end
       list.delete_if do |entry|
+        next unless test(?d, entry)
         dirname = File.expand_path(entry)
-        ignore_directories.any?{|dir| dirname.include?(File.expand_path(dir)) }
+        ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
       end
       list.delete_if do |entry|
         next unless test(?f, entry)
@@ -95,10 +86,10 @@ task :gemspec do
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
   #has_rdoc    = true #File.exist?('doc')
-  test_files  = test(?e, "test/#{ lib }.rb") ? "test/#{ lib }.rb" : nil
-  summary     = This.summary || This.synopsis || "#{ lib } kicks the ass"
-  description = This.description || summary
-  license = 'Ruby' 
+  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
+  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
+  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
+  license     = object.respond_to?(:license) ? object.license : "Ruby"
 
   if This.extensions.nil?
     This.extensions = []
@@ -109,7 +100,6 @@ task :gemspec do
   end
   extensions = [extensions].flatten.compact
 
-# TODO
   if This.dependencies.nil?
     dependencies = []
   else
@@ -121,11 +111,15 @@ task :gemspec do
     end
   end
 
+  if license.nil? && test(?s, 'LICENSE')
+    license = IO.binread('LICENSE')
+  end
+
   template = 
     if test(?e, 'gemspec.erb')
-      This.template_for{ IO.read('gemspec.erb') }
+      Template{ IO.read('gemspec.erb') }
     else
-      This.template_for {
+      Template {
         <<-__
           ## <%= lib %>.gemspec
           #
@@ -160,20 +154,20 @@ task :gemspec do
       }
     end
 
-  FileUtils.mkdir_p(This.pkgdir)
+  Fu.mkdir_p(This.pkgdir)
   gemspec = "#{ lib }.gemspec"
   open(gemspec, "w"){|fd| fd.puts(template)}
   This.gemspec = gemspec
 end
 
 task :gem => [:clean, :gemspec] do
-  FileUtils.mkdir_p(This.pkgdir)
+  Fu.mkdir_p(This.pkgdir)
   before = Dir['*.gem']
   cmd = "gem build #{ This.gemspec }"
   `#{ cmd }`
   after = Dir['*.gem']
   gem = ((after - before).first || after.first) or abort('no gem!')
-  FileUtils.mv(gem, This.pkgdir)
+  Fu.mv(gem, This.pkgdir)
   This.gem = File.join(This.pkgdir, File.basename(gem))
 end
 
@@ -187,21 +181,21 @@ task :readme do
     samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
 
     cmd = "cat #{ sample }"
-    samples << This.util.indent(prompt + cmd, 2) << "\n\n"
-    samples << This.util.indent(`#{ cmd }`, 4) << "\n"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
+    samples << Util.indent(`#{ cmd }`, 4) << "\n"
 
     cmd = "ruby #{ sample }"
-    samples << This.util.indent(prompt + cmd, 2) << "\n\n"
+    samples << Util.indent(prompt + cmd, 2) << "\n\n"
 
     cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{ sample })'"
-    samples << This.util.indent(`#{ cmd } 2>&1`, 4) << "\n"
+    samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
   end
 
   template = 
-    if test(?e, 'readme.erb')
-      This.template_for{ IO.read('readme.erb') }
+    if test(?e, 'README.erb')
+      Template{ IO.read('README.erb') }
     else
-      This.template_for {
+      Template {
         <<-__
           NAME
             #{ lib }
@@ -222,7 +216,7 @@ end
 
 
 task :clean do
-  Dir[File.join(This.pkgdir, '**/**')].each{|entry| FileUtils.rm_rf(entry)}
+  Dir[File.join(This.pkgdir, '**/**')].each{|entry| Fu.rm_rf(entry)}
 end
 
 
@@ -237,11 +231,11 @@ task :release => [:clean, :gemspec, :gem] do
   system(cmd)
   abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 
-  #cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
-  #puts cmd
-  #puts
-  #system(cmd)
-  #abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+  cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.gem }"
+  puts cmd
+  puts
+  system(cmd)
+  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
 end
 
 
@@ -253,106 +247,151 @@ BEGIN {
 #
   $VERBOSE = nil
 
+  require 'ostruct'
   require 'erb'
   require 'fileutils'
   require 'rbconfig'
   require 'pp'
 
-# cache a bunch of stuff about this rakefile/environment
+# fu shortcut
 #
+  Fu = FileUtils
 
-  This =
-    Class.new(Hash) do
+# pkg dir
+#
+  Dir.chdir(File.dirname(__FILE__))
 
-      def method_missing(method, *args, &block)
-        if method.to_s =~ /=/
-          key = method.to_s.chomp('=')
-          value = block ? block : args.shift
+# config object
+#
+  class Cfg < ::Hash
+    def method_missing(method, *args, &block)
+      method = method.to_s
+      case method
+        when /=$/
+          key = method.chomp('=')
+          value = args.shift
           self[key] = value
+        when /\?$/
+          key = method.chomp('?')
+          self.key?(key)
+        when /\!$/
+          key = method.chomp('!')
+          self[key] = !!self[key]
         else
-          key = method.to_s
-          if block
-            value = block
-            self[key] = value
-          else
-            value = self[key]
-
-            if value.respond_to?(:call)
-              self[key] = value.call()
+          key = method
+          if args.empty? && block.nil?
+            if has_key?(key)
+              self[key]
             else
-              value
+              nil
+              #raise IndexError, key
             end
+          else
+            value =
+              case
+                when args.size > 0
+                  args.shift
+                when block
+                  block.call
+              end
+            self[key] = value
           end
-        end
-      end
-
-      def inspect
-        expand!
-        PP.pp(self, '')
       end
+    end
 
-      def expand!
-        keys.each do |key|
-          value = self[key]
-          if value.respond_to?(:call)
-            self[key] = value.call()
-          end
-        end
-      end
+    def eval(string)
+      instance_eval(string)
+    end
+  end
 
-    end.new()
+# cache a bunch of stuff about this rakefile/environment
+#
+  This = Cfg.new
 
   This.file = File.expand_path(__FILE__)
   This.dir = File.dirname(This.file)
   This.pkgdir = File.join(This.dir, 'pkg')
 
-# defaults 
+# load config iff present
 #
-  This.lib do
-    File.basename(Dir.pwd)
-  end
+  This.eval(IO.binread('config.rb')) if test(?s, 'config.rb')
 
-  def This.setup!
-    begin
-      require "./lib/#{ This.lib }"
-    rescue LoadError
-      abort("could not load #{ This.lib }")
+# grok lib
+#
+  unless This.lib?
+    lib = ENV['LIB']
+    unless lib
+      lib = File.basename(Dir.pwd)
     end
+    This.lib = lib
   end
 
-  This.name do
-    This.name = This.lib.capitalize
+# load lib
+#
+  $LOAD_PATH.unshift('./lib')
+  Kernel.require(This.lib)
+
+# grok the lib's object
+#
+  unless This.object?
+    unless This.name?
+      This.name = File.basename(This.lib).split('_').each{|s| s.capitalize }.join('')
+    end
+    This.object = eval(This.name)
+  else
+    if This.object.is_a?(String)
+      This.object = eval(This.object)
+      unless This.name?
+        This.name = This.object.name
+      end
+    end
   end
 
-  This.object do
-    begin
-      This.object = eval(This.name)
-    rescue Object
-      abort("could not determine object from #{ This.name }")
+# grok version
+#
+  unless This.version?
+    if This.object.respond_to?(:version)
+      This.version = This.object.send(:version)
     end
   end
+  abort 'no version' unless This.version?
 
-  This.version do
-    This.object.send(:version)
+# see if dependencies are exported by the module
+#
+  if This.object.respond_to?(:dependencies)
+    This.dependencies = This.object.dependencies
+  else
+    This.dependencies = []
   end
 
-  This.dependencies do
-    if This.object.respond_to?(:dependencies)
-      This.object.dependencies
+# set some reasonable defaults
+#
+  {
+
+    :synopsis          => "#{ This.name } kicks the ass",
+    :rubyforge_project => 'codeforpeople',
+    :author            => "Ara T. Howard",
+    :email             => "ara.t.howard@gmail.com",
+    :homepage          => "https://github.com/ahoward/#{ This.lib }"
+
+  }.each do |key, val|
+    unless This.send("#{ key }?")
+      This.send("#{ key }=", val)
     end
   end
 
-  This.ruby do
-    c = Config::CONFIG
-    bindir = c["bindir"] || c['BINDIR']
-    ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
-    ruby_ext = c['EXEEXT'] || ''
-    File.join(bindir, (ruby_install_name + ruby_ext))
-  end
+# discover full path to this ruby executable
+#
+  c = Config::CONFIG
+  bindir = c["bindir"] || c['BINDIR']
+  ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
+  ruby_ext = c['EXEEXT'] || ''
+  ruby = File.join(bindir, (ruby_install_name + ruby_ext))
+  This.ruby = ruby
 
 # some utils
 #
-  This.util = Module.new do
+  module Util
     def indent(s, n = 2)
       s = unindent(s)
       ws = ' ' * n
@@ -362,33 +401,27 @@ BEGIN {
     def unindent(s)
       indent = nil
       s.each_line do |line|
-        next if line =~ %r/^\s*$/
-        indent = line[%r/^\s*/] and break
-      end
-      indent ? s.gsub(%r/^#{ indent }/, "") : s
+      next if line =~ %r/^\s*$/
+      indent = line[%r/^\s*/] and break
     end
-
+    indent ? s.gsub(%r/^#{ indent }/, "") : s
+  end
     extend self
   end
 
 # template support
 #
-  This.template = Class.new do
+  class Template
     def initialize(&block)
       @block = block
       @template = block.call.to_s
     end
-
     def expand(b=nil)
-      ERB.new(This.util.unindent(@template)).result((b||@block).binding)
+      ERB.new(Util.unindent(@template)).result((b||@block).binding)
     end
-
     alias_method 'to_s', 'expand'
   end
-
-  def This.template_for(*args, &block)
-    This.template.new(*args, &block)
-  end
+  def Template(*args, &block) Template.new(*args, &block) end
 
 # colored console output support
 #
@@ -404,6 +437,7 @@ BEGIN {
     :blink      => "\e[5m",
     :reverse    => "\e[7m",
     :concealed  => "\e[8m",
+
     :black      => "\e[30m",
     :red        => "\e[31m",
     :green      => "\e[32m",
@@ -412,6 +446,7 @@ BEGIN {
     :magenta    => "\e[35m",
     :cyan       => "\e[36m",
     :white      => "\e[37m",
+
     :on_black   => "\e[40m",
     :on_red     => "\e[41m",
     :on_green   => "\e[42m",
@@ -421,8 +456,7 @@ BEGIN {
     :on_cyan    => "\e[46m",
     :on_white   => "\e[47m"
   }
-
-  def This.say(something, *args)
+  def say(phrase, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}
     options[:color] = args.shift.to_s.to_sym unless args.empty?
     keys = options.keys
@@ -431,7 +465,7 @@ BEGIN {
     color = options[:color]
     bold = options.has_key?(:bold)
 
-    parts = [something]
+    parts = [phrase]
     parts.unshift(This.ansi[color]) if color
     parts.unshift(This.ansi[:bold]) if bold
     parts.push(This.ansi[:clear]) if parts.size > 1

data/config.rb

@@ -0,0 +1,5 @@
+
+object "Mongoid::GridFs"
+
+synopsis "a mongoid 3/moped compatible implementation of the grid_fs specification"
+

data/gemfiles/mongoid-3.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails"
+gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-3.1.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails"
+gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
+
+gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", github: "rails/rails", branch: "4-0-stable"
+gem "mongoid", github: "mongoid/mongoid", branch: "master"
+
+gemspec path: "../"

data/lib/mongoid-grid_fs.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     class GridFS
-      const_set :Version, '1.9.2'
+      const_set :Version, '2.0.0'
 
       class << GridFS
         def version
@@ -12,7 +12,7 @@
         def dependencies
           {
             'mongoid'         => [ 'mongoid'         , '>= 3.0', '< 5.0' ] ,
-            'mime/types'      => [ 'mime-types'      , '>= 1.19', '< 3.0'] ,
+            'mime/types'      => [ 'mime-types'      , '>= 1.0', '< 3.0'] ,
           }
         end
 
@@ -173,20 +173,29 @@
               attributes[:uploadDate] = attributes.delete(:upload_date)
             end
 
+            if attributes.has_key?(:meta_data)
+              attributes[:metadata] = attributes.delete(:meta_data)
+            end
+
+            if attributes.has_key?(:aliases)
+              attributes[:aliases] = Array(attributes.delete(:aliases)).flatten.compact.map{|a| "#{ a }"}
+            end
+
             md5 = Digest::MD5.new
             length = 0
             chunkSize = file.chunkSize
             n = 0
 
             GridFS.reading(readable) do |io|
-
-              filename =
-                attributes[:filename] ||=
+              unless attributes.has_key?(:filename)
+                attributes[:filename] =
                   [file.id.to_s, GridFS.extract_basename(io)].join('/').squeeze('/')
+              end
 
-              content_type =
-                attributes[:contentType] ||=
-                  GridFS.extract_content_type(filename) || file.contentType
+              unless attributes.has_key?(:contentType)
+                attributes[:contentType] =
+                  GridFS.extract_content_type(attributes[:filename]) || file.contentType
+              end
 
               GridFS.chunking(io, chunkSize) do |buf|
                 md5 << buf
@@ -198,7 +207,6 @@
                 chunk.save!
                 chunks.push(chunk)
               end
-
             end
 
             attributes[:length] ||= length
@@ -246,12 +254,14 @@
           end
 
           def [](filename)
-            file_model.where(:filename => filename.to_s).first
+            file_model.
+              where(:filename => filename.to_s).
+                order_by(:uploadDate => :desc).
+                  limit(1).
+                    first
           end
 
           def []=(filename, readable)
-            file = self[filename]
-            file.destroy if file
             put(readable, :filename => filename.to_s)
           end
 
@@ -312,29 +322,51 @@
           self.defaults.chunkSize = 4 * (mb = 2**20)
           self.defaults.contentType = 'application/octet-stream'
 
-          field(:filename, :type => String)
-          field(:contentType, :type => String, :default => defaults.contentType)
-
           field(:length, :type => Integer, :default => 0)
           field(:chunkSize, :type => Integer, :default => defaults.chunkSize)
           field(:uploadDate, :type => Time, :default => Time.now.utc)
           field(:md5, :type => String, :default => Digest::MD5.hexdigest(''))
 
-          %w( filename contentType length chunkSize uploadDate md5 ).each do |f|
+          field(:filename, :type => String)
+          field(:contentType, :type => String, :default => defaults.contentType)
+          field(:aliases, :type => Array)
+          field(:metadata) rescue nil
+
+          required = %w( length chunkSize uploadDate md5 )
+          
+          required.each do |f|
             validates_presence_of(f)
           end
-          validates_uniqueness_of(:filename)
 
-          has_many(:chunks, :class_name => chunk_model_name, :inverse_of => :files, :dependent => :destroy, :order => [:n, :asc])
+          index({:filename => 1})
+          index({:aliases => 1})
+          index({:uploadDate => 1})
+          index({:md5 => 1})
 
-          index({:filename => 1}, :unique => true)
+          has_many(:chunks, :class_name => chunk_model_name, :inverse_of => :files, :dependent => :destroy, :order => [:n, :asc])
 
           def path
             filename
           end
 
           def basename
-            ::File.basename(filename)
+            ::File.basename(filename) if filename
+          end
+
+          def attachment_filename(*paths)
+            return basename if basename
+
+            if paths.empty?
+              paths.push('attachment')
+              paths.push(id.to_s)
+              paths.push(updateDate.iso8601)
+            end
+
+            path = paths.join('--')
+            base = ::File.basename(path).split('.', 2).first
+            ext = GridFS.extract_extension(contentType)
+
+            "#{ base }.#{ ext }"
           end
 
           def prefix
@@ -570,6 +602,14 @@
         end
       end
 
+      def GridFS.extract_extension(content_type)
+        list = MIME::Types[content_type.to_s]
+        type = list.first
+        if type
+          type.extensions.first
+        end
+      end
+
       def GridFS.cleanname(pathname)
         basename = ::File.basename(pathname.to_s)
         CGI.unescape(basename).gsub(%r/[^0-9a-zA-Z_@)(~.-]/, '_').gsub(%r/_+/,'_')
@@ -592,7 +632,7 @@
         options.to_options!
 
         if options[:inline] == false or options[:attachment] == true
-          headers['Content-Disposition'] = "attachment; filename=#{ grid_fs_file.filename }"
+          headers['Content-Disposition'] = "attachment; filename=#{ grid_fs_file.attachment_filename }"
         end
 
         self.content_type = grid_fs_file.content_type

data/mongoid-grid_fs.gemspec

@@ -3,16 +3,22 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-grid_fs"
-  spec.version = "1.9.2"
+  spec.version = "2.0.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.description = "description: mongoid-grid_fs kicks the ass"
   spec.license = "Ruby"
 
   spec.files =
-["LICENSE",
+["Gemfile",
+ "LICENSE",
  "README.md",
  "Rakefile",
+ "config.rb",
+ "gemfiles",
+ "gemfiles/mongoid-3.0.gemfile",
+ "gemfiles/mongoid-3.1.gemfile",
+ "gemfiles/mongoid-4.0.gemfile",
  "lib",
  "lib/app",
  "lib/app/models",
@@ -24,6 +30,8 @@ Gem::Specification::new do |spec|
  "lib/app/models/mongoid/grid_fs/fs/file.rb",
  "lib/mongoid-grid_fs.rb",
  "mongoid-grid_fs.gemspec",
+ "script",
+ "script/shell",
  "test",
  "test/helper.rb",
  "test/mongoid-grid_fs_test.rb",
@@ -38,7 +46,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["mongoid", ">= 3.0", "< 5.0"])
   
-    spec.add_dependency(*["mime-types", ">= 1.19", "< 3.0"])
+    spec.add_dependency(*["mime-types", ">= 1.0", "< 3.0"])
   
 
   spec.extensions.push(*[])

data/script/shell

@@ -0,0 +1,51 @@
+#! /usr/bin/env ruby
+
+#
+  gem 'rails', '>= 3', '< 4'
+  require 'rails'
+  require 'active_model'
+
+#
+  require 'pry'
+
+#
+  require_relative '../lib/mongoid-grid_fs.rb'
+
+#
+  Mongoid.configure do |config|
+    config.connect_to('mongoid-grid_fs_test')
+  end
+
+#
+  require 'irb'
+
+  $FUCKING_HACK = IRB.method(:load_modules)
+
+  def IRB.load_modules
+    $FUCKING_HACK.call()
+
+    prompt = 'mongoid_grid_fs'
+
+    IRB.conf[:PROMPT][:RO] = {
+      :PROMPT_I=>"#{ prompt }:%03n:%i> ",
+      :PROMPT_N=>"#{ prompt }:%03n:%i> ",
+      :PROMPT_S=>"#{ prompt }:%03n:%i%l ",
+      :PROMPT_C=>"#{ prompt }:%03n:%i* ",
+      :RETURN=>"=> %s\n"
+    }
+
+    IRB.conf[:PROMPT_MODE] = :RO
+    IRB.conf[:AUTO_INDENT] = true
+  end
+
+#
+  module ::Kernel
+    def grid_fs
+      Mongoid::GridFS
+    end
+  end
+
+#
+  ARGV.clear
+
+  ::IRB.start

data/test/helper.rb

@@ -11,8 +11,6 @@ class SIO < StringIO
   end
 end
 
-# this triggers mongoid to load rails...
-module Rails; end
 
 require_relative 'testing'
 require_relative '../lib/mongoid-grid_fs.rb'

data/test/mongoid-grid_fs_test.rb

@@ -93,14 +93,16 @@ Testing Mongoid::GridFs do
 
       before = GridFs::File.count
 
-      assert{ GridFs[path] = SIO.new(path, 'foobar') }
-      assert{ GridFs[path].data == 'foobar' }
+      data = "#{ Time.now.to_f }-#{ rand }"
+
+      assert{ GridFs[path] = SIO.new(path, data) }
+      assert{ GridFs[path].data == data }
 
       after = GridFs::File.count
 
       created = after - before
 
-      assert{ created.zero? }
+      assert{ created == 1 }
     end
 
 ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-grid_fs
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.0'
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -46,24 +46,30 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.0'
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
-description: a mongoid 3/moped compatible implementation of the grid_fs specification
+description: ! 'description: mongoid-grid_fs kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- config.rb
+- gemfiles/mongoid-3.0.gemfile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - lib/app/models/mongoid/grid_fs.rb
 - lib/app/models/mongoid/grid_fs/fs/chunk.rb
 - lib/app/models/mongoid/grid_fs/fs/file.rb
 - lib/mongoid-grid_fs.rb
 - mongoid-grid_fs.gemspec
+- script/shell
 - test/helper.rb
 - test/mongoid-grid_fs_test.rb
 - test/testing.rb