RubyGems - ramaze - Versions diffs - 2008.06 → 2008.11 - Mend

ramaze 2008.06 → 2008.11

Files changed (184) hide show

data/README.markdown +6 -6
data/Rakefile +33 -3
data/bin/ramaze +18 -0
data/doc/CHANGELOG +960 -0
data/doc/LEGAL +5 -1
data/doc/meta/announcement.txt +20 -36
data/doc/tutorial/todolist.html +421 -313
data/doc/tutorial/todolist.mkd +33 -16
data/examples/app/blog/spec/blog.rb +3 -3
data/examples/app/rapaste/controller/paste.rb +8 -1
data/examples/app/rapaste/model/paste.rb +3 -0
data/examples/app/rapaste/spec/rapaste.rb +3 -1
data/examples/app/rapaste/start.rb +3 -2
data/examples/app/sourceview/public/sourceview.js +2 -2
data/examples/app/todolist/spec/todolist.rb +6 -6
data/examples/app/todolist/template/index.xhtml +1 -1
data/examples/app/whywiki/spec/whywiki.rb +2 -2
data/examples/app/wikore/spec/wikore.rb +2 -2
data/examples/app/wikore/src/model.rb +4 -3
data/examples/app/wiktacular/spec/wiktacular.rb +7 -7
data/examples/basic/simple.rb +2 -2
data/examples/helpers/paginate.rb +71 -0
data/examples/misc/simple_auth.rb +20 -8
data/lib/proto/controller/init.rb +10 -0
data/lib/proto/controller/main.rb +1 -3
data/lib/proto/model/init.rb +4 -0
data/lib/proto/public/dispatch.fcgi +1 -1
data/lib/proto/spec/main.rb +2 -1
data/lib/proto/start.rb +3 -3
data/lib/proto/start.ru +1 -1
data/lib/proto/view/error.xhtml +4 -4
data/lib/ramaze.rb +8 -3
data/lib/ramaze/action.rb +6 -6
data/lib/ramaze/adapter.rb +1 -6
data/lib/ramaze/adapter/base.rb +30 -27
data/lib/ramaze/adapter/cgi.rb +1 -0
data/lib/ramaze/cache.rb +1 -3
data/lib/ramaze/cache/memcached.rb +3 -5
data/lib/ramaze/contrib/auto_params.rb +2 -2
data/lib/ramaze/contrib/auto_params/get_args.rb +2 -1
data/lib/ramaze/contrib/gems.rb +17 -18
data/lib/ramaze/contrib/gzip_filter.rb +22 -9
data/lib/ramaze/contrib/maruku_uv.rb +59 -0
data/lib/ramaze/contrib/profiling.rb +1 -1
data/lib/ramaze/contrib/rest.rb +16 -13
data/lib/ramaze/contrib/sequel/create_join.rb +25 -0
data/lib/ramaze/contrib/sequel/form_field.rb +129 -0
data/lib/ramaze/contrib/sequel/image.rb +198 -0
data/lib/ramaze/contrib/sequel/relation.rb +82 -0
data/lib/ramaze/controller.rb +33 -34
data/lib/ramaze/controller/resolve.rb +29 -9
data/lib/ramaze/current.rb +60 -20
data/lib/ramaze/current/request.rb +8 -7
data/lib/ramaze/current/response.rb +15 -3
data/lib/ramaze/current/session/flash.rb +8 -0
data/lib/ramaze/dispatcher.rb +17 -9
data/lib/ramaze/dispatcher/action.rb +4 -5
data/lib/ramaze/dispatcher/directory.rb +1 -1
data/lib/ramaze/dispatcher/error.rb +4 -4
data/lib/ramaze/dispatcher/file.rb +4 -4
data/lib/ramaze/gestalt.rb +15 -20
data/lib/ramaze/helper/cgi.rb +7 -15
data/lib/ramaze/helper/formatting.rb +41 -1
data/lib/ramaze/helper/httpdigest.rb +20 -7
data/lib/ramaze/helper/link.rb +4 -6
data/lib/ramaze/helper/paginate.rb +233 -0
data/lib/ramaze/helper/redirect.rb +1 -1
data/lib/ramaze/helper/rest.rb +1 -1
data/lib/ramaze/helper/thread.rb +17 -0
data/lib/ramaze/helper/ultraviolet.rb +44 -0
data/lib/ramaze/helper/user.rb +4 -9
data/lib/ramaze/log.rb +2 -2
data/lib/ramaze/log/analogger.rb +21 -23
data/lib/ramaze/log/growl.rb +21 -23
data/lib/ramaze/log/hub.rb +1 -1
data/lib/ramaze/log/informer.rb +97 -99
data/lib/ramaze/log/knotify.rb +14 -16
data/lib/ramaze/log/logger.rb +11 -13
data/lib/ramaze/log/logging.rb +61 -63
data/lib/ramaze/log/rotatinginformer.rb +168 -0
data/lib/ramaze/log/syslog.rb +41 -31
data/lib/ramaze/log/xosd.rb +70 -72
data/lib/ramaze/option.rb +9 -6
data/lib/ramaze/option/holder.rb +5 -27
data/lib/ramaze/reloader.rb +186 -0
data/lib/ramaze/setup.rb +1 -1
data/lib/ramaze/snippets.rb +13 -0
data/lib/ramaze/snippets/array/put_within.rb +31 -24
data/lib/ramaze/snippets/binding/locals.rb +23 -11
data/lib/ramaze/snippets/dictionary.rb +2 -2
data/lib/ramaze/snippets/fiber.rb +63 -0
data/lib/ramaze/snippets/kernel/constant.rb +36 -21
data/lib/ramaze/snippets/kernel/pretty_inspect.rb +12 -6
data/lib/ramaze/snippets/numeric/filesize_format.rb +24 -17
data/lib/ramaze/snippets/numeric/time.rb +63 -0
data/lib/ramaze/snippets/object/__dir__.rb +29 -0
data/lib/ramaze/snippets/object/acquire.rb +40 -0
data/lib/ramaze/snippets/object/instance_variable_defined.rb +16 -5
data/lib/ramaze/snippets/object/pretty.rb +14 -4
data/lib/ramaze/snippets/object/scope.rb +14 -7
data/lib/ramaze/snippets/ordered_set.rb +25 -14
data/lib/ramaze/snippets/proc/locals.rb +17 -9
data/lib/ramaze/snippets/ramaze/deprecated.rb +13 -0
data/lib/ramaze/snippets/ramaze/fiber.rb +24 -0
data/lib/ramaze/snippets/ramaze/state.rb +86 -0
data/lib/ramaze/snippets/ramaze/struct.rb +45 -0
data/lib/ramaze/snippets/string/camel_case.rb +13 -8
data/lib/ramaze/snippets/string/color.rb +24 -20
data/lib/ramaze/snippets/string/each.rb +14 -3
data/lib/ramaze/snippets/string/end_with.rb +20 -0
data/lib/ramaze/snippets/string/esc.rb +26 -21
data/lib/ramaze/snippets/string/ord.rb +12 -6
data/lib/ramaze/snippets/string/snake_case.rb +13 -7
data/lib/ramaze/snippets/string/start_with.rb +16 -5
data/lib/ramaze/snippets/string/unindent.rb +23 -15
data/lib/ramaze/snippets/thread/into.rb +3 -3
data/lib/ramaze/spec/helper/bacon.rb +5 -5
data/lib/ramaze/spec/helper/mock_http.rb +1 -1
data/lib/ramaze/spec/helper/pretty_output.rb +2 -2
data/lib/ramaze/spec/helper/snippets.rb +8 -0
data/lib/ramaze/template.rb +4 -1
data/lib/ramaze/template/ezamar/textpow.syntax +34 -0
data/lib/ramaze/template/maruku.rb +34 -0
data/lib/ramaze/template/tagz.rb +2 -2
data/lib/ramaze/template/xslt.rb +2 -2
data/lib/ramaze/tool/create.rb +27 -53
data/lib/ramaze/tool/localize.rb +8 -4
data/lib/ramaze/tool/mime.rb +11 -1
data/lib/ramaze/tool/project_creator.rb +110 -0
data/lib/ramaze/trinity.rb +4 -1
data/lib/ramaze/version.rb +1 -1
data/lib/vendor/bacon.rb +323 -0
data/rake_tasks/gem.rake +10 -1
data/rake_tasks/maintenance.rake +40 -2
data/rake_tasks/metric.rake +24 -0
data/rake_tasks/release.rake +17 -4
data/rake_tasks/spec.rake +1 -2
data/ramaze.gemspec +549 -495
data/spec/contrib/auto_params.rb +3 -3
data/spec/contrib/profiling.rb +2 -2
data/spec/examples/simple_auth.rb +2 -2
data/spec/examples/templates/template_haml.rb +0 -2
data/spec/ramaze/action/file_cache.rb +22 -0
data/spec/ramaze/adapter.rb +2 -2
data/spec/ramaze/controller/actionless_templates.rb +1 -1
data/spec/ramaze/controller/subclass.rb +15 -0
data/spec/ramaze/controller/template_resolving.rb +1 -1
data/spec/ramaze/controller/view/bar.xhtml +1 -0
data/spec/ramaze/controller/view/base/another.xhtml +1 -0
data/spec/ramaze/current/session.rb +1 -1
data/spec/ramaze/dispatcher/file.rb +2 -2
data/spec/ramaze/helper/aspect.rb +26 -17
data/spec/ramaze/helper/formatting.rb +13 -0
data/spec/ramaze/log/informer.rb +10 -10
data/spec/ramaze/log/syslog.rb +67 -4
data/spec/ramaze/rewrite.rb +1 -1
data/spec/ramaze/route.rb +1 -1
data/spec/ramaze/struct.rb +47 -0
data/spec/ramaze/template/markaby.rb +1 -1
data/spec/ramaze/template/tagz.rb +1 -1
data/spec/snippets/binding/locals.rb +9 -0
data/spec/snippets/numeric/time.rb +12 -0
data/spec/snippets/{kernel → object}/__dir__.rb +0 -0
data/spec/snippets/{kernel → object}/acquire.rb +0 -0
metadata +90 -81
data/cache.yaml +0 -7
data/examples/app/rammit/spec/rammit.rb +0 -31
data/examples/app/rammit/src/controller/main.rb +0 -3
data/examples/app/rammit/src/controller/page.rb +0 -16
data/examples/app/rammit/src/model.rb +0 -33
data/examples/app/rammit/start.rb +0 -8
data/examples/app/rammit/template/index.xhtml +0 -14
data/examples/app/rammit/template/page/view.xhtml +0 -4
data/lib/ramaze/snippets/kernel/__dir__.rb +0 -23
data/lib/ramaze/snippets/kernel/acquire.rb +0 -34
data/lib/ramaze/snippets/object/thread_accessor.rb +0 -5
data/lib/ramaze/snippets/ramaze/thread_accessor.rb +0 -58
data/lib/ramaze/snippets/struct/fill.rb +0 -23
data/lib/ramaze/snippets/struct/values_at.rb +0 -39
data/lib/ramaze/snippets/symbol/to_proc.rb +0 -24
data/lib/ramaze/sourcereload.rb +0 -176
data/spec/snippets/struct/fill.rb +0 -26
data/spec/snippets/struct/values_at.rb +0 -52
data/spec/snippets/symbol/to_proc.rb +0 -13

@@ -35,11 +35,11 @@ class SimpleController < Ramaze::Controller
   def join_all *strings
     strings.join
   end
   def sum first, second
     first.to_i + second.to_i
   end
   def post_or_get
     request.request_method
   end

data/examples/helpers/paginate.rb ADDED

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'ramaze'
+USERS = DATA.read.split("\n")
+class MainController < Ramaze::Controller
+  helper :paginate
+  trait :paginate => {
+    :limit => 6,
+    :var => 'user_page',
+  }
+  def index
+    @pager = paginate(USERS)
+%q~
+<html>
+  <head><title>Users</title></head>
+  <body>
+    #{@pager.navigation if @pager.needed?}
+    <pre>
+      <?r @pager.each do |user| ?>
+        #{user}
+      <?r end ?>
+    </pre>
+    #{@pager.navigation if @pager.needed?}
+  </body>
+</html>
+~
+  end
+end
+Ramaze.start
+__END__
+Michael Fellinger       1868 [ 77.13% ]
+Aman Gupta               211 [  8.71% ]
+Jonathan Buch             89 [  3.67% ]
+Gabriele Renzi            49 [  2.02% ]
+Ara T. Howard             44 [  1.82% ]
+Clive Crous               37 [  1.53% ]
+Keita Yamaguchi           27 [  1.11% ]
+Ryan Grove                17 [  0.70% ]
+Pistos                    16 [  0.66% ]
+Wang, Jinjing             11 [  0.45% ]
+Colin Shea                 9 [  0.37% ]
+Sam Carr                   6 [  0.25% ]
+Stephan Maka               5 [  0.21% ]
+samcarr                    4 [  0.17% ]
+raggi                      3 [  0.12% ]
+Clinton R. Nixon           3 [  0.12% ]
+Chris Duncan               3 [  0.12% ]
+Richard Outten             2 [  0.08% ]
+Andy Smith                 2 [  0.08% ]
+skaar                      1 [  0.04% ]
+Yasushi Abe                1 [  0.04% ]
+Thomas Leitner             1 [  0.04% ]
+Rob Lievaart               1 [  0.04% ]
+Riku Raisaenen             1 [  0.04% ]
+Matt Rubens                1 [  0.04% ]
+Martin Hilbig              1 [  0.04% ]
+Leo Borisenko              1 [  0.04% ]
+Lars Olsson                1 [  0.04% ]
+Jeremy Evans               1 [  0.04% ]
+Jean-Francois Chevrette    1 [  0.04% ]
+James Tucker               1 [  0.04% ]
+Fabian Buch                1 [  0.04% ]
+Christian Neukirchen       1 [  0.04% ]
+Carlo Zottmann             1 [  0.04% ]
+Andrew Farmer              1 [  0.04% ]

data/examples/misc/simple_auth.rb CHANGED

@@ -2,22 +2,34 @@ require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller
-  LOGINS = {
-   :username => 'password',
-   :admin => 'secret'
-  }.map{|k,v| ["#{k}:#{v}"].pack('m').strip} unless defined? LOGINS
+  trait :logins => {
+   'jill' => 'password1',
+   'jack' => 'password2',
+  }.map{|k,v| ["#{k}:#{v}"].pack('m').strip }
   helper :aspect
   before_all do
-    response['WWW-Authenticate'] = %(Basic realm="Login Required")
-    respond 'Unauthorized', 401 unless auth = request.env['HTTP_AUTHORIZATION'] and
-                                       LOGINS.include? auth.split.last
+    check_auth
   end
   def index
     'Secret Info'
   end
+  private
+  def check_auth
+    response['WWW-Authenticate'] = 'Basic realm="Login Required"'
+    if auth = request.env['HTTP_AUTHORIZATION']
+      if class_trait[:logins].include?(auth.split.last)
+        return true
+      end
+    end
+    respond 'Unauthorized', 401
+  end
 end
-Ramaze.start :adapter => :mongrel
+Ramaze.start :adapter => :mongrel

data/lib/proto/controller/init.rb ADDED

@@ -0,0 +1,10 @@
+# Define a subclass of Ramaze::Controller holding your defaults for all
+# controllers
+class Controller < Ramaze::Controller
+  layout '/page'
+  helper :xhtml
+  engine :Ezamar
+end
+acquire __DIR__/"*.rb"

data/lib/proto/controller/main.rb CHANGED

@@ -5,9 +5,7 @@
 #  map '/otherurl'
 # this will force the controller to be mounted on: /otherurl
-class MainController < Ramaze::Controller
-  layout '/page'
+class MainController < Controller
   # the index action is called automatically when no other action is specified
   def index
     @title = "Welcome to Ramaze!"

data/lib/proto/model/init.rb ADDED

@@ -0,0 +1,4 @@
+# Here goes your database connection and options
+# Require all models in '/model/*.rb'
+acquire __DIR__/"*.rb"

data/lib/proto/public/dispatch.fcgi CHANGED

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'ramaze'
 # FCGI doesn't like you writing to stdout
-Ramaze::Log.loggers = [ Ramaze::Informer.new( File.join(__DIR__, '..', 'ramaze.fcgi.log') ) ]
+Ramaze::Log.loggers = [ Ramaze::Logger::Informer.new( File.join(__DIR__, '..', 'ramaze.fcgi.log') ) ]
 Ramaze::Global.adapter = :fcgi
 $0 = File.join(__DIR__, '..', 'start.rb')

data/lib/proto/spec/main.rb CHANGED

@@ -1,7 +1,7 @@
 require 'ramaze'
 require 'ramaze/spec/helper'
-require __DIR__/'..'/'start'
+require __DIR__/'../start'
 describe MainController do
   behaves_like 'http', 'xpath'
@@ -11,6 +11,7 @@ describe MainController do
   it 'should show start page' do
     got = get('/')
     got.status.should == 200
+    puts got.body
     got.at('//title').text.strip.should ==
       MainController.new.index
   end

data/lib/proto/start.rb CHANGED

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'ramaze'
-# require all controllers and models
-acquire __DIR__/:controller/'*'
-acquire __DIR__/:model/'*'
+# Initialize controllers and models
+require 'controller/init'
+require 'model/init'
 Ramaze.start :adapter => :webrick, :port => 7000

data/lib/proto/start.ru CHANGED

@@ -12,5 +12,5 @@
 require 'start'
 Ramaze.trait[:essentials].delete Ramaze::Adapter
-Ramaze.start :force => true
+Ramaze.start!
 run Ramaze::Adapter::Base

data/lib/proto/view/error.xhtml CHANGED

@@ -40,16 +40,16 @@ Click on any of them to view the surrounding source code.</p>
 </table>
 <?r
-  { 'Session'   => Thread.current[:session],
-    'Request'   => Thread.current[:request],
-    'Response'  => Thread.current[:response],
+  { 'Session'   => Ramaze::STATE[:session],
+    'Request'   => Ramaze::STATE[:request],
+    'Response'  => Ramaze::STATE[:response],
     'Global'    => Global,
   }.each do |title, content|
     hash = [title, content].object_id.abs
   ?>
   <div class="additional">
     <h3 id="#{hash}">#{title}</h3>
-    <pre style="display:none" id="is_#{hash}">#{CGI.escapeHTML(content.pretty_inspect)}</pre>
+    <pre style="display:none" id="is_#{hash}">#{Rack::Utils.escape_html(content.pretty_inspect)}</pre>
   </div>
 <?r end ?>

data/lib/ramaze.rb CHANGED

@@ -33,16 +33,22 @@ module Ramaze
   BASEDIR = File.dirname(File.expand_path(__FILE__))
   $LOAD_PATH.unshift BASEDIR
   $LOAD_PATH.uniq!
+  # Shortcut to the HTTP_STATUS_CODES of Rack::Utils
+  # inverted for easier access
+  STATUS_CODE = Rack::Utils::HTTP_STATUS_CODES.invert
 end
 Thread.abort_on_exception = true
 # Bootstrap
 require 'ramaze/version'
-require 'ramaze/sourcereload'
+require 'ramaze/reloader'
 require 'ramaze/snippets'
 require 'ramaze/log'
 require 'ramaze/trinity'
+require 'ramaze/dispatcher'
 require 'ramaze/current'
 require 'ramaze/adapter'
 require 'ramaze/option'
@@ -53,7 +59,6 @@ require 'ramaze/tool'
 require 'ramaze/controller'
 # Complete
-require 'ramaze/dispatcher'
 require 'ramaze/template/ezamar'
 require 'ramaze/contrib'
 require 'ramaze/route'
@@ -63,7 +68,7 @@ module Ramaze
   # Each of these classes will be called ::startup upon Ramaze.startup
   trait :essentials => [
-    Global, Cache, Contrib, Controller, Session, SourceReload, Adapter
+    Global, Cache, Contrib, Controller, Session, Adapter
   ]
   trait :started => false

data/lib/ramaze/action.rb CHANGED

@@ -10,7 +10,7 @@ module Ramaze
     # The Action holds information that is essential to render the action for a
     # request.
-    class Action < Struct.new('Action', *members)
+    class Action < Ramaze::Struct.new('Action', *members)
     end
   end
@@ -41,7 +41,7 @@ module Ramaze
       # Return the stacked actions for the current request
       def stack
-        Thread.current[:action_stack] ||= []
+        STATE[:action_stack] ||= []
       end
     end
@@ -59,10 +59,10 @@ module Ramaze
       self[:method] = (meth.empty? ? nil : meth)
     end
-    # runs all parameters assigned through flatten and CGI::unescape
+    # runs all parameters assigned through flatten and unescape
     def params=(*par)
-      self[:params] = par.flatten.compact.map{|pa| CGI.unescape(pa.to_s)}
+      self[:params] = par.flatten.compact.map{|pa| Rack::Utils.unescape(pa.to_s) }
     end
     # Use this as key for caches.
@@ -116,7 +116,7 @@ module Ramaze
     # combined path to current action, from path and params
     def extended_path
-      Array[path, *params].join('/')
+      (path == "index" && !params.empty? ? params : Array[path, *params]).join('/')
     end
     def full_path
@@ -145,7 +145,7 @@ module Ramaze
     end
   end
-  # Shortcut to create new instances of Action via Action::fill
+  # Shortcut to create new instances of Action
   def self.Action(hash = {})
     Action.create(hash)

data/lib/ramaze/adapter.rb CHANGED

@@ -11,11 +11,6 @@ Socket.do_not_reverse_lookup = true
 module Ramaze
-  # Shortcut to the HTTP_STATUS_CODES of Rack::Utils
-  # inverted for easier access
-  STATUS_CODE = Rack::Utils::HTTP_STATUS_CODES.invert
   # This module holds all classes and methods related to the adapters like
   # webrick or mongrel.
   # It's responsible for starting and stopping them.
@@ -57,7 +52,7 @@ module Ramaze
           if Global.test_connections
             test_connection(host, port)
-            Log.info("Ramaze is ready to run on: #{host}:#{port}")
+            Log.info("Ramaze is ready to run on: #{host}:#{port} using #{Global.adapter}")
           end
           adapter.start(host, port)

data/lib/ramaze/adapter/base.rb CHANGED

@@ -5,16 +5,34 @@ module Ramaze
   module Adapter
     # (Rack) middleware injected around Adapter::Base::call
-    MIDDLEWARE = OrderedSet.new(
-      Ramaze::Current,
+    MIDDLEWARE = OrderedSet[
+      Rack::ShowExceptions,
       Rack::ShowStatus,
-      Rack::ShowExceptions
-    )
+      # Rack::Deflater,
+      Ramaze::Reloader,
+      Ramaze::Current,
+      Ramaze::Dispatcher
+    ] unless defined? MIDDLEWARE
+    def self.middleware(mws = MIDDLEWARE)
+      if @middleware and trait[:previous] == mws
+        @middleware
+      else
+        trait :previous => mws.dup
+        inner_app = mws.last
+        cascade = mws[0...-1].reverse
+        @middleware = cascade.inject(inner_app){|app, mw| mw.new(app) }
+      end
+    end
+    @middleware = nil
+    @middleware = middleware
     # Helper to assign a new block to before_call
     # Usage:
     #   Ramaze::Adapter.before do |env|
-    #     if env['PATH_INFO'] =~ /suerpfast/
+    #     if env['PATH_INFO'] =~ /superfast/
     #       [200, {'Content-Type' => 'text/plain'}, ['super fast!']]
     #     end
     #   end
@@ -28,12 +46,13 @@ module Ramaze
     class Base
       class << self
         attr_reader :thread
-        # For the specified host and for all given ports call run_server and
-        # add the returned thread to the Global.adapters ThreadGroup.
-        # Afterwards adds a trap for the value of Global.shutdown_trap which
-        # calls Ramaze.shutdown when triggered (usually by SIGINT).
+        # Call ::startup with the given host and port.
+        # Sets Global.server to itself.
+        # Adds a trap that is triggered by the value of Global.shutdown_trap,
+        # which is SIGINT by default.
         def start(host = nil, port = nil)
           @thread = startup(host, port)
@@ -45,11 +64,6 @@ module Ramaze
           }
         end
-        def start_server(host, port)
-          Ramaze::deprecated("Adapter::Base::start_server", "Adapter::Base::startup")
-          startup(host, port)
-        end
         # Does nothing by default
         def shutdown
@@ -103,22 +117,11 @@ module Ramaze
         # Then goes on and calls Dispatcher::handle with request and response.
         def respond(env)
-          if Global.server.thread == Thread.current
-            Thread.new{ middleware_respond(env) }.value
-          else
-            middleware_respond(env)
+          Ramaze::STATE.wrap do
+            Adapter::middleware.call(env)
           end
         end
-        def middleware_respond(env)
-          Thread.current.priority = 1
-          if Global.middleware
-            MIDDLEWARE.inject{|app, middleware| middleware.new(app) }.call(env)
-          else
-            Current.call(env)
-          end
-        end
       end
     end
   end

data/lib/ramaze/adapter/cgi.rb CHANGED

@@ -12,6 +12,7 @@ module Ramaze
       # to make it compatible with other adapters but have no influence and
       # can be omitted
       def self.startup(host = nil, port = nil)
+        Global.server=self
         Thread.new{ Rack::Handler::CGI.run(self) }
       end
     end

data/lib/ramaze/cache.rb CHANGED

@@ -48,9 +48,7 @@ module Ramaze
       def add_on(key, cache_class)
         CACHES[key] = new(cache_class)
         CACHES[key].instance_variable_set("@cache_name", key)
-        self.class.class_eval do
-          define_method(key){ CACHES[key] }
-        end
+        eval("def self.%s; CACHES[%p]; end" % [key, key])
       end
     end