mongoid_grid 0.0.8 → 0.0.10

data/README.txt

@@ -1,61 +1,39 @@
-Mongoid::Grid / Rack::Grid
+Mongoid::Grid
 
-  Mongoid::Grid is a plugin for mongoid that uses GridFS.  Heavily inspired
-  by grip (http://github.com/jnunemaker/grip)
-
-  Rack::Grid is used to serve a GridFS file from rack.  Mostly copied
-  from http://github.com/skinandbones/rack-gridfs
-  
-  Download the source at
-  http://github.com/dusty/mongoid_grid
+  mongoid_grid is a GridFS plugin for Mongoid::Document
 
+  ***NOTE: The rack helper is no longer included in this project.  If you
+  need it, please switch to rack_grid: https://github.com/dusty/rack_grid
 
 Installation
 
-  Put the libraries in your project however you want. 
-  
-  # gem install mongoid_grid
-  
-  Or, make your own gem.
-  
-  # git clone http://github.com/dusty/mongoid_grid
-  # cd mongoid_grid
+  # git clone https://github.com/dusty/mongoid_grid.git
   # gem build mongoid_grid.gemspec
-  
-  Then require the libraries you want to use.
-
-  require 'mongoid/grid'
-  require 'rack/grid'
-
+  # gem install mongoid_grid-0.0.x.gem
 
 Usage
 
+  require 'mongoid_grid'
   class Monkey
     include Mongoid::Document
     include Mongoid::Grid
     field :name
     attachment :image
   end
-  
+
   m = Monkey.create(:name => 'name')
-  
+
   # To add an attachment
   m.image = File.open('/tmp/me.jpg')
   m.save
-  
+
   # To remove an attachment
   m.image = nil
   m.save
-  
+
   # To get the attachment
   m.image.read
-  
-  # To use Rack::Grid with Sinatra
-  
-  configure do
-    use Rack::Grid, :database => 'my_db'
-  end
-  
-  <img src="<%= m.image_url %>" alt="<%= m.image_name %>" />
-  
-  
+
+Inspired By
+  - http://github.com/jnunemaker/grip
+

data/lib/{mongoid/grid.rb → mongoid_grid.rb}

@@ -1,5 +1,4 @@
 require 'mime/types'
-require 'mongoid'
 module Mongoid
   module Grid
 
@@ -19,7 +18,7 @@ module Mongoid
         # Callbacks to handle the attachment saving and deleting
         after_save     :create_attachments
         after_save     :delete_attachments
-        after_destroy  :destroy_attachments
+        after_destroy  :destroy_attachments, :delete_attachments
 
         ##
         # Fields for the attachment.
@@ -114,13 +113,18 @@ module Mongoid
       # Attachments we need to add after save.
       def create_attachment(name,file)
         if file.respond_to?(:read)
-          filename = file.respond_to?(:original_filename) ?
-                     file.original_filename : File.basename(file.path)
+          filename = if file.respond_to?(:original_filename) && file.original_filename
+                      file.original_filename
+                     elsif file.respond_to?(:tempfile)
+                       File.basename(file.tempfile.path)
+                     else
+                       File.basename(file.path)
+                     end
           type = MIME::Types.type_for(filename).first
           mime = type ? type.content_type : "application/octet-stream"
           send("#{name}_id=",   BSON::ObjectId.new)
           send("#{name}_name=", filename)
-          send("#{name}_size=", File.size(file))
+          send("#{name}_size=", File.size(file.respond_to?(:tempfile) ? file.tempfile : file))
           send("#{name}_type=", mime)
           create_attachment_queue[name] = file
         end
@@ -156,10 +160,12 @@ module Mongoid
       # Attachments we need to remove after save
       def delete_attachment(name,id)
         delete_attachment_queue[name] = id if id.is_a?(BSON::ObjectId)
-        send("#{name}_id=", nil)
-        send("#{name}_name=", nil)
-        send("#{name}_size=", nil)
-        send("#{name}_type=", nil)
+        unless destroyed?
+          send("#{name}_id=", nil)
+          send("#{name}_name=", nil)
+          send("#{name}_size=", nil)
+          send("#{name}_type=", nil)
+        end
       end
 
       ##

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_grid
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors: 
 - Dusty Doris
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -05:00
+date: 2011-05-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,29 +21,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
-  type: :runtime
-  version_requirements: *id002
-description: Plugin for Mongoid to use GridFS and a Rack helper
+description: Plugin for Mongoid::Document to attach files via GridFS
 email: github@dusty.name
 executables: []
 
@@ -57,12 +34,10 @@ extra_rdoc_files:
 - README.txt
 files: 
 - README.txt
-- lib/mongoid/grid.rb
-- lib/rack/grid.rb
+- lib/mongoid_grid.rb
 - test/test_mongoid_grid.rb
-- test/test_rack_grid.rb
 has_rdoc: true
-homepage: http://github.com/dusty/mongoid_grid
+homepage: http://github.com/dusty/mongo_grid
 licenses: []
 
 post_install_message: 
@@ -75,23 +50,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: none
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Plugin for Mongoid to use GridFS and a Rack helper
+summary: Plugin for Mongoid::Document to attach files via GridFS
 test_files: []
 

data/lib/rack/grid.rb

@@ -1,115 +0,0 @@
-require 'timeout'
-require 'mongo'
-
-module Rack
-  class Grid
-    class ConnectionError < StandardError ; end
-
-    attr_reader :host, :port, :database, :prefix, :username, :password
-
-    def initialize(app, options = {})
-      opts = {}
-      options.each { |k,v|  opts[k.to_s] = v }
-      options = {
-        'host'    => 'localhost',
-        'prefix'  => 'grid',
-        'port'    => Mongo::Connection::DEFAULT_PORT
-      }.merge(opts)
-
-      @app        = app
-      @host       = options['host']
-      @port       = options['port']
-      @database   = options['database']
-      @prefix     = options['prefix']
-      @username   = options['username']
-      @password   = options['password']
-      @db         = options['db']
-
-      @cache_control = options['cache_control']
-    end
-
-    def db
-      @db = @db.call()  if Proc === @db
-      connect!  unless @db
-      @db
-    end
-
-    ##
-    # Strip the _id out of the path.  This allows the user to send something
-    # like /grid/4ba69fde8c8f369a6e000003/filename.jpg to find the file
-    # with an id of 4ba69fde8c8f369a6e000003.
-    def call(env)
-      @env = env
-      request = Rack::Request.new(@env)
-      if request.path_info =~ /^\/#{prefix}\/(\w+).*$/
-        grid_request($1)
-      else
-        @app.call(env)
-      end
-    end
-
-    ##
-    # Get file from GridFS or return a 404
-    def grid_request(id)
-      file = Mongo::Grid.new(db).get(BSON::ObjectId.from_string(id))
-
-      etag, last_modified = file.instance_variable_get(:@md5), Time.at( file.upload_date.to_i )
-      headers = {
-        'ETag' => "\"#{etag}\"",
-        'Last-Modified' => last_modified.httpdate,
-        'Cache-Control' => cache_control_header,
-      }
-      if not_modified?( etag, last_modified )
-        [304, headers, 'Not Modified']
-      else
-        [200, headers.update('Content-Type' => file.content_type), [file.read]]
-      end
-    rescue Mongo::GridError, BSON::InvalidObjectId
-      [404, {'Content-Type' => 'text/plain'}, ['File not found.']]
-    end
-
-    private
-    def connect!
-      Timeout::timeout(5) do
-        @db = Mongo::Connection.new(host,port).db(database)
-        db.authenticate(username, password) if (username || password)
-      end
-    rescue StandardError => e
-      raise ConnectionError, "Timeout connecting to GridFS (#{e.to_s})"
-    end
-
-    DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate"
-    def cache_control_header
-      if @cache_control.blank?
-        DEFAULT_CACHE_CONTROL
-
-      elsif @cache_control[:no_cache]
-        'no-cache'
-
-      else
-        extras  = @cache_control[:extras]
-        max_age = @cache_control[:max_age]
-
-        options = []
-        options << "max-age=#{max_age.to_i}"  if max_age
-        options << (@cache_control[:public] ? 'public' : 'private')
-        options << 'must-revalidate'  if @cache_control[:must_revalidate]
-        options.concat(extras) if extras
-
-        options.join(', ')
-      end
-    end
-
-    def not_modified?( etag, last_modified )
-      if_none_match = @env['HTTP_IF_NONE_MATCH']
-      if if_modified_since = @env['HTTP_IF_MODIFIED_SINCE']
-        if_modified_since = Time.rfc2822( if_modified_since ) rescue nil
-      end
-
-      not_modified = if_none_match.present? || if_modified_since.present?
-      not_modified &&= (if_none_match == "\"#{etag}\"")       if if_none_match && etag
-      not_modified &&= (if_modified_since >= last_modified)   if if_modified_since && last_modified
-      not_modified
-    end
-  end
-end