From 4770ea6d7a6eaf00cc19bc4fb2afd59071e8cf66 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 11 Nov 2009 19:29:57 -0800
Subject: [PATCH] examples/rails_app-2.3.4: move middleware setup to config.ru

config.ru is more obvious and easier to use with non-Rails
applications.  This is true especially if you want to share
the Upr::Monitor object/connection with the upcoming
Upr::Streaming JSON application.
---
 examples/rails_app-2.3.4/config.ru             | 15 +++++++++++++--
 examples/rails_app-2.3.4/config/environment.rb | 10 +++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/examples/rails_app-2.3.4/config.ru b/examples/rails_app-2.3.4/config.ru
index d51b6b2..dcd7fb5 100644
--- a/examples/rails_app-2.3.4/config.ru
+++ b/examples/rails_app-2.3.4/config.ru
@@ -1,3 +1,14 @@
 require 'config/environment'
-use Rails::Rack::Static
-run ActionController::Dispatcher.new
+# upr defaults to using a Moneta::Memory backend which is good enough
+# for single-process/server applications
+$upr = Upr::Monitor.new
+
+map "/" do
+  use Rack::Chunked
+  use Rack::ContentLength
+  use Rack::Deflater
+
+  use Upr, :backend => $upr, :frequency => 1
+  use Rails::Rack::Static
+  run ActionController::Dispatcher.new
+end
diff --git a/examples/rails_app-2.3.4/config/environment.rb b/examples/rails_app-2.3.4/config/environment.rb
index c323778..f2670b8 100644
--- a/examples/rails_app-2.3.4/config/environment.rb
+++ b/examples/rails_app-2.3.4/config/environment.rb
@@ -25,8 +25,12 @@ Rails::Initializer.run do |config|
 
   # We MUST insert Upr before any parsers that read the body
   # since we need to wrap all calls to "rack.input"
-  config.middleware.insert_before('ActionController::ParamsParser',
-       'Upr',
+  # It is usually easier to just load it in RAILS_ROOT/config.ru
+  # (which is what we did, but here is a commented example of using
+  # upr inside the Rails middleware stack):
+  #
+  # config.middleware.insert_before('ActionController::ParamsParser',
+       # 'Upr',
        # The default is to use the Moneta::Memory store here.
        # This won't work right if you have multiple processes
        # serving your application, however.
@@ -48,5 +52,5 @@ Rails::Initializer.run do |config|
        # :drb => 'druby://127.0.0.1:2999',
        #
        # Update at most once every second (default is every 3 seconds)
-       :frequency => 1)
+       # :frequency => 1)
 end
-- 
2.11.4.GIT