rack-mogilefs 0.1.3 → 0.2.0

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.2.0 (2010-11-29)
+
+* Add X-Reproxy-Url support
+
 ## 0.1.3 (2010-09-10)
 
 * Depend on rack/mime instead of mime-types

data/README.md

@@ -2,7 +2,34 @@
 
 If you are using Nginx you'll probably want to serve MogileFS files with
 the [MogileFS Module](http://www.grid.net.ru/nginx/mogilefs.en.html), but if
-you need to serve them out of a Rack app, this should help.
+you need a quick way to serve them out of a Rack app, this should help.
+
+## Caveats ( serving files vs reproxying )
+
+Serving files through Ruby is slow. The preferred method is to set an
+X-Reproxy-Url header from your app and let the web server serve the file. For
+Nginx, you could have a config like this:
+
+    location /reproxy {
+        internal;
+        set $reproxy $upstream_http_x_reproxy_url;
+        proxy_pass $reproxy;
+        proxy_hide_header Content-Type;
+    }
+
+For Apache, there is [mod_reproxy](http://github.com/jamis/mod_reproxy)
+
+`Rack::MogileFS` will use this method if you pass a strategy option of `:reproxy`
+
+    use Rack::MogileFS, :strategy => :reproxy
+
+`Rack::MogileFS` will look up the internal urls for the file, and set two
+headers to reproxy the request:
+
+    X-Accel-Redirect: /reproxy
+    X-Reproxy-Url: http://internal.ip/path/to/mogile/file.fid
+
+You'll have to make sure your web server knows how to handle this request.
 
 ## Getting Started:
 

data/lib/rack/mogilefs/endpoint.rb

@@ -4,8 +4,9 @@ module Rack
 
       def initialize(options={})
         @options = {
-          :client => nil,
-          :mapper => nil,
+          :client   => nil,
+          :mapper   => nil,
+          :strategy => :serve,
           :default_content_type => "image/png"
         }.merge(options)
 
@@ -14,13 +15,13 @@ module Rack
 
       def call(env)
         path = key_for_path(env['PATH_INFO'].dup)
-        data = client.get_file_data(path)
-        size = Utils.bytesize(data).to_s
 
-        [ 200, {
-          "Content-Type"   => content_type(path),
-          "Content-Length" => size
-        }, [data] ]
+        if @options[:strategy] == :reproxy
+          reproxy(path)
+        else
+          serve_file(path)
+        end
+
       rescue ::MogileFS::Backend::UnknownKeyError => e
         [ 404, { "Content-Type" => "text/html" }, [e.message] ]
       rescue ::MogileFS::UnreachableBackendError => e
@@ -31,6 +32,26 @@ module Rack
 
       protected
 
+      def reproxy(path)
+        paths = client.get_paths(path)
+
+        [ 200, {
+          "Content-Type"     => content_type(path),
+          "X-Accel-Redirect" => "/reproxy",
+          "X-Reproxy-Url"    => paths.join(" ")
+        }, [] ]
+      end
+
+      def serve_file(path)
+        data = client.get_file_data(path)
+        size = Utils.bytesize(data).to_s
+
+        [ 200, {
+          "Content-Type"   => content_type(path),
+          "Content-Length" => size
+        }, [data] ]
+      end
+
       def key_for_path(path)
         @options[:mapper].respond_to?(:call) ? @options[:mapper].call(path) : path
       end
@@ -39,10 +60,6 @@ module Rack
         Mime.mime_type(::File.extname(path), @options[:default_content_type])
       end
 
-      def content_length(data)
-        Utils.bytesize(data)
-      end
-
       def client
         @options[:client]
       end

data/lib/rack/mogilefs.rb

@@ -12,10 +12,14 @@ module Rack
 
     def call(env)
       if env['PATH_INFO'] =~ @options[:path]
-        Endpoint.new(@options).call(env)
+        endpoint.call(env)
       else
         @app.call(env)
       end
     end
+
+    def endpoint
+      @endpoint ||= Endpoint.new(@options)
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mogilefs
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ben Marini