grifizoid 0.0.2 → 0.0.3

data/README.md

@@ -14,22 +14,16 @@ It's sending a file handler not the raw data, so this should be low-memory use e
 and `bundle install`
 
 ## Use with Rails 3
-    
+
     # application.rb
-    
-    # /images/file.jpg => images/file.jpg
-    config.middleware.use Grifizoid
-    
-    # /file.jpg => #{site.to_param}/images/file.jpg
-    config.middleware.use Grifizoid do |req|
+    config.middleware.use Rack::GridFS do |req|
       site      = Site.where(:host => req.host).first
     
       File.join(site.to_param, req.path_info)
     end
-    
   
-Now someone going to [http://mydomain.com/file.jpg](http://mydomain.com/file.jpg) will result in the middleware doing a query to find the site `mydomain.com` (with an ID like `4d80c69f4cfad13cd100000c`) and then looks for a GridFS file named `4d80c69f4cfad13cd100000c/file.jpg`, sending it through to the client if found or else passing the request through to your app
+Now someone going to http://mydomain.com/file.jpg will result in the middleware doing a query to find the site 'mydomain.com' (with an ID like `4d80c69f4cfad13cd100000c`) and then looks for a GridFS file named `4d80c69f4cfad13cd100000c/file.jpg`, sending it through to the client if found or else passing the request through to your app
 
-Some ideas/code taken from:  
-* [https://github.com/dusty/rack_grid](https://github.com/dusty/rack_grid)  
-* [https://github.com/skinandbones/rack-gridfs](https://github.com/skinandbones/rack-gridfs)
+Some ideas/code taken from:
+  https://github.com/dusty/rack_grid
+  https://github.com/skinandbones/rack-gridfs

data/lib/grifizoid.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 class Grifizoid
   def initialize(app, &path_blk)
     @app            = app
@@ -9,8 +7,9 @@ class Grifizoid
   # Get file from GridFileSystem or pass-thru
   def call(env)
     begin
-      mongo_file, file = retrieve_file(env)
-      etag, last_modified = mongo_file.instance_variable_get(:@md5), Time.at(mongo_file.upload_date.to_i)
+      gfs_path = extract_gfs_path(env)
+      file = Mongo::GridFileSystem.new(Mongoid.database).open(gfs_path, 'r')
+      etag, last_modified = file.instance_variable_get(:@md5), Time.at( file.upload_date.to_i )
       
       headers = {
         'ETag' => "\"#{etag}\"",
@@ -19,32 +18,14 @@ class Grifizoid
       if not_modified?(env, etag, last_modified )
         [304, headers, 'Not Modified']
       else
-        [200, headers.merge('Content-Type' => mongo_file.content_type, 'Content-Length' => mongo_file.file_length.to_s), file]
+        [200, headers.merge('Content-Type' => file.content_type, 'Content-Length' => file.file_length.to_s), file]
       end
     rescue Mongo::GridError, Mongo::GridFileNotFound
       @app.call(env)
     end
   end
   
-  def retrieve_file(env)
-    gfs_path = extract_gfs_path(env)
-    fs_path  = File.join(Rails.root, "tmp/grifizoid/#{gfs_path}")
-    
-    mongo_file = Mongo::GridFileSystem.new(Mongoid.database).open(gfs_path, 'r')
-    #updated_at = Time.at(mongo_file.upload_date.to_i)
-    
-    fs_file = File.open(fs_path, 'r') if File.exists?(fs_path)
-    fs_file ||= begin
-      FileUtils.mkdir_p File.dirname(fs_path)
-      File.open(fs_path, 'wb'){ |f| f << mongo_file.read }
-      File.open(fs_path, 'r')
-      #File.utime(updated_at, updated_at, fs_path)
-    end
-    
-    [mongo_file, fs_file]
-  end
-  
-  # use raw path or pass request to block to let user set a custom path
+  # use raw path or path request to block to let user set a custom path
   def extract_gfs_path(env)
     request   = Rack::Request.new(env)
     

metadata

@@ -2,7 +2,7 @@
 name: grifizoid
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Paul Meserve