RubyGems - ramaze - Versions diffs - 0.3.5 → 0.3.9 - Mend

ramaze 0.3.5 → 0.3.9

Files changed (204) hide show

data/Rakefile +5 -20
data/bin/ramaze +0 -4
data/doc/AUTHORS +5 -0
data/doc/meta/announcement.txt +2 -1
data/doc/tutorial/todolist.html +20 -21
data/doc/tutorial/todolist.mkd +10 -9
data/examples/blog/{src/controller.rb → controller/main.rb} +2 -0
data/examples/blog/{src/model.rb → model/entry.rb} +0 -0
data/examples/blog/spec/blog.rb +3 -3
data/examples/blog/start.rb +2 -3
data/examples/blog/view/edit.xhtml +17 -0
data/examples/blog/view/index.xhtml +17 -0
data/examples/blog/view/layout.xhtml +11 -0
data/examples/blog/view/new.xhtml +16 -0
data/examples/facebook.rb +15 -8
data/examples/identity.rb +1 -1
data/examples/memleak_detector.rb +1 -1
data/examples/rammit/src/model.rb +1 -1
data/examples/rapaste/controller/paste.rb +7 -7
data/examples/rapaste/model/paste.rb +1 -3
data/examples/rapaste/public/css/display.css +2 -1
data/examples/rapaste/start.rb +2 -3
data/examples/sourceview/sourceview.rb +1 -1
data/examples/templates/template/external.tenjin +28 -0
data/examples/templates/template_amrita2.rb +0 -3
data/examples/templates/template_tenjin.rb +57 -0
data/examples/todolist/spec/todolist.rb +13 -2
data/examples/todolist/src/controller/main.rb +1 -1
data/examples/todolist/template/index.xhtml +1 -1
data/examples/wiktacular/spec/wiktacular.rb +18 -0
data/examples/wiktacular/src/controller.rb +2 -2
data/examples/wiktacular/src/model.rb +8 -2
data/lib/proto/public/css/ramaze_error.css +4 -0
data/lib/proto/public/dispatch.fcgi +11 -0
data/lib/proto/spec/main.rb +1 -1
data/lib/proto/start.ru +8 -0
data/lib/proto/view/error.xhtml +2 -0
data/lib/ramaze.rb +28 -5
data/lib/ramaze/action.rb +9 -2
data/lib/ramaze/action/render.rb +40 -24
data/lib/ramaze/adapter.rb +10 -17
data/lib/ramaze/adapter/base.rb +8 -12
data/lib/ramaze/adapter/cgi.rb +14 -13
data/lib/ramaze/adapter/ebb.rb +34 -0
data/lib/ramaze/adapter/evented_mongrel.rb +1 -1
data/lib/ramaze/adapter/fcgi.rb +14 -14
data/lib/ramaze/adapter/lsws.rb +15 -11
data/lib/ramaze/adapter/mongrel.rb +2 -1
data/lib/ramaze/adapter/scgi.rb +24 -0
data/lib/ramaze/adapter/swiftiplied_mongrel.rb +1 -1
data/lib/ramaze/adapter/thin.rb +4 -5
data/lib/ramaze/adapter/webrick.rb +5 -5
data/lib/ramaze/cache.rb +1 -1
data/lib/ramaze/cache/memcached.rb +1 -1
data/lib/ramaze/contrib.rb +70 -10
data/lib/ramaze/contrib/auto_params.rb +1 -1
data/lib/ramaze/contrib/email.rb +15 -15
data/lib/ramaze/contrib/facebook.rb +2 -2
data/lib/ramaze/contrib/facebook/facebook.rb +7 -4
data/lib/ramaze/contrib/file_cache.rb +65 -0
data/lib/ramaze/contrib/gettext.rb +56 -55
data/lib/ramaze/contrib/profiling.rb +36 -0
data/lib/ramaze/contrib/sequel_cache.rb +92 -0
data/lib/ramaze/controller.rb +80 -47
data/lib/ramaze/controller/error.rb +10 -5
data/lib/ramaze/controller/resolve.rb +36 -48
data/lib/ramaze/current.rb +70 -0
data/lib/ramaze/{trinity → current}/request.rb +62 -15
data/lib/ramaze/current/response.rb +19 -0
data/lib/ramaze/{trinity → current}/session.rb +32 -110
data/lib/ramaze/current/session/flash.rb +67 -0
data/lib/ramaze/current/session/hash.rb +65 -0
data/lib/ramaze/dispatcher.rb +1 -28
data/lib/ramaze/dispatcher/action.rb +6 -3
data/lib/ramaze/dispatcher/directory.rb +1 -1
data/lib/ramaze/dispatcher/error.rb +26 -5
data/lib/ramaze/dispatcher/file.rb +13 -2
data/lib/ramaze/gestalt.rb +3 -1
data/lib/ramaze/global.rb +6 -3
data/lib/ramaze/global/globalstruct.rb +3 -1
data/lib/ramaze/helper.rb +66 -20
data/lib/ramaze/helper/aspect.rb +25 -17
data/lib/ramaze/helper/auth.rb +4 -3
data/lib/ramaze/helper/cache.rb +5 -4
data/lib/ramaze/helper/cgi.rb +11 -9
data/lib/ramaze/helper/flash.rb +28 -3
data/lib/ramaze/helper/formatting.rb +1 -3
data/lib/ramaze/helper/identity.rb +2 -3
data/lib/ramaze/helper/inform.rb +7 -6
data/lib/ramaze/helper/link.rb +15 -17
data/lib/ramaze/helper/markaby.rb +2 -4
data/lib/ramaze/helper/maruku.rb +1 -1
data/lib/ramaze/helper/nitroform.rb +4 -4
data/lib/ramaze/helper/pager.rb +4 -6
data/lib/ramaze/helper/partial.rb +24 -21
data/lib/ramaze/helper/redirect.rb +8 -5
data/lib/ramaze/helper/{file.rb → sendfile.rb} +1 -3
data/lib/ramaze/helper/sequel.rb +1 -3
data/lib/ramaze/helper/stack.rb +1 -3
data/lib/ramaze/helper/tagz.rb +19 -0
data/lib/ramaze/helper/user.rb +63 -0
data/lib/ramaze/inform.rb +2 -24
data/lib/ramaze/log.rb +28 -0
data/lib/ramaze/{inform → log}/analogger.rb +3 -3
data/lib/ramaze/{inform → log}/growl.rb +2 -2
data/lib/ramaze/{inform → log}/hub.rb +4 -6
data/lib/ramaze/{inform → log}/informer.rb +4 -4
data/lib/ramaze/{inform → log}/knotify.rb +2 -2
data/lib/ramaze/log/logger.rb +22 -0
data/lib/ramaze/{inform/informing.rb → log/logging.rb} +16 -16
data/lib/ramaze/{inform → log}/syslog.rb +0 -0
data/lib/ramaze/{inform → log}/xosd.rb +2 -2
data/lib/ramaze/route.rb +64 -36
data/lib/ramaze/snippets/array/put_within.rb +13 -0
data/lib/ramaze/snippets/binding/locals.rb +13 -0
data/lib/ramaze/snippets/kernel/__dir__.rb +10 -8
data/lib/ramaze/snippets/kernel/aquire.rb +1 -1
data/lib/ramaze/snippets/kernel/constant.rb +1 -1
data/lib/ramaze/snippets/object/pretty.rb +6 -0
data/lib/ramaze/snippets/object/scope.rb +11 -0
data/lib/ramaze/snippets/object/thread_accessor.rb +5 -0
data/lib/ramaze/snippets/ordered_set.rb +1 -1
data/lib/ramaze/snippets/proc/locals.rb +11 -0
data/lib/ramaze/snippets/ramaze/thread_accessor.rb +44 -0
data/lib/ramaze/snippets/string/esc.rb +29 -0
data/lib/ramaze/snippets/string/start_with.rb +7 -0
data/lib/ramaze/snippets/string/unindent.rb +6 -1
data/lib/ramaze/snippets/struct/values_at.rb +1 -5
data/lib/ramaze/sourcereload.rb +16 -14
data/lib/ramaze/spec.rb +1 -0
data/lib/ramaze/spec/helper.rb +11 -3
data/lib/ramaze/spec/helper/browser.rb +25 -1
data/lib/ramaze/spec/helper/pretty_output.rb +11 -11
data/lib/ramaze/template.rb +5 -4
data/lib/ramaze/template/amrita2.rb +2 -3
data/lib/ramaze/template/ezamar/element.rb +2 -3
data/lib/ramaze/template/ezamar/morpher.rb +1 -2
data/lib/ramaze/template/ezamar/render_partial.rb +1 -1
data/lib/ramaze/template/haml.rb +5 -2
data/lib/ramaze/template/markaby.rb +2 -0
data/lib/ramaze/template/tagz.rb +79 -0
data/lib/ramaze/template/tenjin.rb +34 -0
data/lib/ramaze/tool/create.rb +0 -3
data/lib/ramaze/tool/localize.rb +107 -105
data/lib/ramaze/tool/mime.rb +0 -2
data/lib/ramaze/trinity.rb +1 -26
data/lib/ramaze/version.rb +1 -1
data/lib/vendor/bacon.rb +47 -41
data/rake_tasks/conf.rake +18 -0
data/rake_tasks/darcs.rake +5 -0
data/rake_tasks/maintenance.rake +37 -24
data/rake_tasks/spec.rake +1 -1
data/spec/contrib/auto_params.rb +3 -1
data/spec/contrib/profiling.rb +26 -0
data/spec/examples/templates/template_redcloth.rb +1 -1
data/spec/examples/templates/template_tenjin.rb +28 -0
data/spec/helper.rb +0 -1
data/spec/ramaze/action/layout.rb +28 -0
data/spec/ramaze/controller/actionless_templates.rb +32 -0
data/spec/ramaze/controller/template/other_wrapper.xhtml +1 -0
data/spec/ramaze/controller/template_resolving.rb +37 -0
data/spec/ramaze/{trinity → current}/request.rb +12 -2
data/spec/ramaze/current/session.rb +97 -0
data/spec/ramaze/dispatcher/directory.rb +2 -1
data/spec/ramaze/dispatcher/file.rb +8 -3
data/spec/ramaze/dispatcher/public/file name.txt +1 -0
data/spec/ramaze/gestalt.rb +11 -0
data/spec/ramaze/helper/aspect.rb +28 -22
data/spec/ramaze/helper/cgi.rb +2 -2
data/spec/ramaze/helper/flash.rb +33 -15
data/spec/ramaze/helper/formatting.rb +2 -2
data/spec/ramaze/helper/link.rb +46 -18
data/spec/ramaze/helper/pager.rb +8 -5
data/spec/ramaze/helper/partial.rb +8 -1
data/spec/ramaze/helper/template/recursive_local_ivars.xhtml +7 -0
data/spec/ramaze/helper/user.rb +46 -0
data/spec/ramaze/{inform → log}/informer.rb +0 -0
data/spec/ramaze/{inform → log}/syslog.rb +1 -1
data/spec/ramaze/request.rb +14 -10
data/spec/ramaze/route.rb +23 -0
data/spec/ramaze/template.rb +48 -1
data/spec/ramaze/template/haml.rb +6 -16
data/spec/ramaze/template/haml/locals.haml +2 -1
data/spec/ramaze/template/tagz.rb +62 -0
data/spec/ramaze/template/tagz/external.tagz +8 -0
data/spec/ramaze/template/tagz/sum.tagz +1 -0
data/spec/ramaze/template/tenjin.rb +49 -0
data/spec/ramaze/template/tenjin/external.tenjin +1 -0
data/spec/snippets/string/unindent.rb +15 -0
metadata +509 -475
data/doc/README.html +0 -729
data/doc/changes.txt +0 -5757
data/doc/changes.xml +0 -5759
data/examples/blog/src/view.rb +0 -16
data/examples/blog/template/edit.xhtml +0 -19
data/examples/blog/template/index.xhtml +0 -19
data/examples/blog/template/new.xhtml +0 -18
data/examples/wiktacular/mkd/newpagename/current.mkd +0 -1
data/examples/wiktacular/mkd/newpagename/current.mkd.bak +0 -1
data/lib/ramaze/contrib/email.rb-darcs-backup0 +0 -81
data/lib/ramaze/template/bijou.rb +0 -39
data/lib/ramaze/trinity/response.rb +0 -32
data/spec/ramaze/template/bijou.rb +0 -25
data/spec/ramaze/trinity/session.rb +0 -29

@@ -14,5 +14,5 @@ class MainController < Ramaze::Controller
   end
 end
-Ramaze::Inform.loggers.each{|l| l.log_levels << :dev }
+Ramaze::Log.loggers.each{|l| l.log_levels << :dev }
 Ramaze.start :adapter => :mongrel

data/examples/memleak_detector.rb CHANGED

@@ -28,5 +28,5 @@ Thread.new do
   end
 end
-Ramaze::Inform.loggers.clear
+Ramaze::Log.loggers.clear
 Ramaze.start :adapter => :mongrel, :sourcereload => false

data/examples/rammit/src/model.rb CHANGED

@@ -14,7 +14,7 @@ class User < Sequel::Model(:user)
 end
 class Page < Sequel::Model(:page)
-  include Ramaze::LinkHelper
+  include Ramaze::Helper::Link
   set_schema do
     primary_key :id

data/examples/rapaste/controller/paste.rb CHANGED

@@ -1,9 +1,9 @@
-Ramaze::Contrib::Route[%r!^/(\d+)\.(?:te?xt|plain)$!] = '/plain/%d'
-Ramaze::Contrib::Route[%r!^/(?:te?xt|plain)/(\d+)$!] = '/plain/%d'
-Ramaze::Contrib::Route[%r!^/(\d+)\.(\w+)$!] = '/view/%d/%s'
-Ramaze::Contrib::Route[%r!^/(\d+)$!] = '/view/%d/html'
-Ramaze::Contrib::Route[%r!^/list/page/(\d+)$!] = '/list/%d'
-# Ramaze::Contrib::Route[%r!^/list/?(.*)!] = '/%s'
+Ramaze::Route[%r!^/(\d+)\.(?:te?xt|plain|rb|css|js)$!] = '/plain/%d'
+Ramaze::Route[%r!^/(?:te?xt|plain|rb|css|js)/(\d+)$!] = '/plain/%d'
+Ramaze::Route[%r!^/(\d+)\.(\w+)$!] = '/view/%d/%s'
+Ramaze::Route[%r!^/(\d+)$!] = '/view/%d/html'
+Ramaze::Route[%r!^/list/page/(\d+)$!] = '/list/%d'
+# Ramaze::Route[%r!^/list/?(.*)!] = '/%s'
 class PasteController < Ramaze::Controller
   map :/
@@ -15,7 +15,7 @@ class PasteController < Ramaze::Controller
   def list(start = 1)
     ordered = Paste.order(:created.DESC)
     @paginated = ordered.paginate(start.to_i, 10)
-    @pager = paginator(@paginated, '/list/page')
+    @pager = paginator(@paginated, '/list')
     @pastes = @paginated
     @style = style
   end

data/examples/rapaste/model/paste.rb CHANGED

@@ -20,10 +20,8 @@ class Paste < Sequel::Model(:paste)
     case format.downcase
     when /x?html/
       uv(text, style)
-    when /txt/, /plain/
-      text
     else
-      raise "No such format: #{format}"
+      text
     end
   end

data/examples/rapaste/public/css/display.css CHANGED

@@ -136,7 +136,8 @@ div#paste_head {
   background: #ccf;
   border: 1px solid #ccf;
   width: 14em;
-  right: 1em;
+  right: 0.2em;
+  top: 1.5em;
   position: absolute;
 }

data/examples/rapaste/start.rb CHANGED

@@ -5,7 +5,7 @@ require 'ramaze'
 require 'sequel'
 require 'uv'
-Ramaze::Inform.debug "Initializing UltraViolet..."
+Ramaze::Log.debug "Initializing UltraViolet..."
 Uv.copy_files "xhtml", __DIR__/"public"
 Uv.init_syntaxes
@@ -14,8 +14,7 @@ UV_PRIORITY_NAMES = %w[ ruby plain_text html css javascript yaml diff ]
 STYLE = 'iplastic'
-Ramaze::Inform.debug "done."
-Ramaze.contrib :route
+Ramaze::Log.debug "done."
 DB = Sequel.sqlite

data/examples/sourceview/sourceview.rb CHANGED

@@ -17,7 +17,7 @@ end
 class MainController < Ramaze::Controller
   include Remarkably::Common
-  helper :partial, :inform, :cache, :aspect
+  helper :cache, :aspect
   engine :None
   def index *args

data/examples/templates/template/external.tenjin ADDED

@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <title>Template::Tenjin #{@place}</title>
+  </head>
+  <body>
+  <h1>The #{@place} Template for Tenjin</h1>
+  <a href="#{Rs(:/)}">Home</a>
+  <p>
+  Here you can pass some stuff if you like, parameters are just passed like this:<br />
+  <a href="#{Rs(@place, :one)}">#{Rs(@place, :one)}</a><br />
+  <a href="#{Rs(@place, :two, :three)}">#{Rs(@place, :two, :three)}</a><br />
+  <a href="#{Rs(@place, :one, :foo => :bar)}">#{Rs(@place, :one, :foo => :bar)}</a>
+  </p>
+  <div>
+    The arguments you have passed to this action are:<br />
+    <?rb if @args.empty? ?>
+      none
+    <?rb else ?>
+      <?rb @args.each do |arg| ?>
+        <span>#{arg}</span>
+      <?rb end ?>
+    <?rb end ?>
+  </div>
+  <div>#{request.params.inspect}</div>
+  </body>
+</html>

data/examples/templates/template_amrita2.rb CHANGED

@@ -1,9 +1,6 @@
 require 'rubygems'
 require 'ramaze'
-# TODO:
-#   - implement the amrita2 example, man, this engine is awkward :P
 class MainController < Ramaze::Controller
   template_root __DIR__/:template
   engine :Amrita2

data/examples/templates/template_tenjin.rb ADDED

@@ -0,0 +1,57 @@
+require "rubygems"
+require "ramaze"
+class MainController < Ramaze::Controller
+  template_root __DIR__/:template
+  engine :Tenjin
+  def index
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
+  end
+  def internal(*args)
+    @context = {
+      :args => args,
+      :place => :internal
+    }
+    <<'__TENJIN__'
+<html>
+  <head>
+    <title>Template::Tenjin #{@place}</title>
+  </head>
+  <body>
+  <h1>The #{@place} Template for Tenjin</h1>
+  <a href="#{Rs(:/)}">Home</a>
+  <p>
+  Here you can pass some stuff if you like, parameters are just passed like this:<br />
+  <a href="#{Rs(@place, :one)}">#{Rs(@place, :one)}</a><br />
+  <a href="#{Rs(@place, :two, :three)}">#{Rs(@place, :two, :three)}</a><br />
+  <a href="#{Rs(@place, :one, :foo => :bar)}">#{Rs(@place, :one, :foo => :bar)}</a>
+  </p>
+  <div>
+    The arguments you have passed to this action are:<br />
+    <?rb if @args.empty? ?>
+      none
+    <?rb else ?>
+      <?rb @args.each do |arg| ?>
+        <span>#{arg}</span>
+      <?rb end ?>
+    <?rb end ?>
+  </div>
+  <div>#{request.params.inspect}</div>
+  </body>
+</html>
+__TENJIN__
+  end
+  def external(*args)
+    @context = {
+      :args => args,
+      :place => :external
+    }
+  end
+end
+Ramaze.start

data/examples/todolist/spec/todolist.rb CHANGED

@@ -23,15 +23,19 @@ describe 'todolist' do
     (h_get('/')/:tr)
   end
-  def spectask
+  def task(name)
     tasks.find do |task|
       (task/:td).find do |td|
         td['class'] == 'title' and
-        td.inner_html.strip == 'spectask'
+        td.inner_html.strip == name
       end
     end
   end
+  def spectask
+    task('spectask')
+  end
   def spectask_status
     spectask.search("td[@class='status']").inner_html.strip
   end
@@ -117,5 +121,12 @@ describe 'todolist' do
     error_on_page('/new', response).should == 'Please enter a title'
   end
+  it 'should escape harmful titles' do
+    response = post('/create', 'title' => '#{puts "gotcha"}')
+    task('#{puts "gotcha"}').should.be.nil
+    task('&#35;{puts &quot;gotcha&quot;}').should.not.be.nil
+  end
   FileUtils.rm('todolist.db') rescue nil
 end

data/examples/todolist/src/controller/main.rb CHANGED

@@ -50,7 +50,7 @@ class MainController < Ramaze::Controller
   end
   helper :aspect
-  after(:create, :open, :close, :delete){ redirect(Rs()) }
+  after(:create, :open, :close, :delete){ redirect(Rs()) unless redirected? }
   private

data/examples/todolist/template/index.xhtml CHANGED

@@ -6,7 +6,7 @@
     <table>
       <?r @tasks.each do |title, status, toggle, delete| ?>
         <tr>
-          <td class="title">  #{title}  </td>
+          <td class="title">  #{c title}  </td>
           <td class="status"> #{status} </td>
           <td class="toggle"> #{toggle} </td>
           <td class="delete"> #{delete} </td>

data/examples/wiktacular/spec/wiktacular.rb CHANGED

@@ -133,6 +133,24 @@ describe 'wiktacular' do
     doc.at('div#text').inner_html.strip.should == '<p>first text</p>'
   end
+  it "should convert [[#{NEWPAGE}]] to existing link" do
+    edit_page(NEWPAGE, "Link: [[#{NEWPAGE}]]")
+    doc = check_page(NEWPAGE)
+    a = doc.at('div#text>p>a')
+    a['class'].should == 'exists'
+    a['href'].should == NEWPAGE
+    a.inner_html.should == NEWPAGE
+  end
+  it "should convert [[chunky bacon]] to nonexisting link" do
+    edit_page(NEWPAGE, "Link: [[chunky bacon]]")
+    doc = check_page(NEWPAGE)
+    a = doc.at('div#text>p>a')
+    a['class'].should == 'nonexists'
+    a['href'].should == "chunky+bacon"
+    a.inner_html.should == "chunky bacon"
+  end
   after do
     WikiEntry.new(NEWPAGE).delete
   end

data/examples/wiktacular/src/controller.rb CHANGED

@@ -17,7 +17,7 @@ class MainController < Ramaze::Controller
   def edit handle
     @handle = handle
-    @entry = WikiEntry[handle]
+    @entry = WikiEntry.new(handle)
     @text = @entry.content
   end
@@ -39,7 +39,7 @@ class MainController < Ramaze::Controller
   def save
     redirect_referer unless request.post?
     handle = request['handle']
-    entry = WikiEntry[handle]
+    entry = WikiEntry.new(handle)
     entry.save(request['text'])
     redirect Rs(:index, handle)
   end

data/examples/wiktacular/src/model.rb CHANGED

@@ -5,7 +5,9 @@ class WikiEntry
   ENTRIES_DIR = __DIR__/'../mkd'
   class << self
     def [](name)
-      new(name)
+      if File.exist?(ENTRIES_DIR/File.basename(File.expand_path(name)))
+        new(name)
+      end
     end
     def titles
       Dir[ENTRIES_DIR/'*'].entries
@@ -79,7 +81,11 @@ class WikiEntry
 end
 class EntryView
+  include Ramaze::Helper::Methods
+  helper :cgi, :link
   class << self
     def render content
       mkd2html(content || "No Entry")
     end
@@ -88,7 +94,7 @@ class EntryView
       html = BlueCloth.new(text).to_html
       html.gsub!(/\[\[(.*?)\]\]/) do |m|
         exists = WikiEntry[$1] ? 'exists' : 'nonexists'
-      %{<a href="/#{CGI.escape($1)}" class="#{exists}">#{$1}</a>}
+        A(h($1), :href => $1, :class => exists)
       end
       html
     end

data/lib/proto/public/css/ramaze_error.css CHANGED

@@ -80,6 +80,10 @@ tr.source td.lineno, tr.line td.lineno {
   text-align: right;
 }
+tr.line td {
+  cursor: pointer;
+}
 tr.source td.code pre {
   margin: 0;
   font-family: monospace;

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

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+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::Global.adapter = :fcgi
+$0 = File.join(__DIR__, '..', 'start.rb')
+require $0

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

@@ -18,7 +18,7 @@ describe MainController do
   it 'should show /notemplate' do
     got = get('/notemplate')
     got.status.should == 200
-    got.at('//body').text.strip.should ==
+    got.at('//div').text.strip.should ==
       MainController.new.notemplate
   end
 end

data/lib/proto/start.ru ADDED

@@ -0,0 +1,8 @@
+# start.ru for ramaze apps
+# use thin>=0.6.3
+# thin start -r start.ru
+require 'start'
+Ramaze.trait[:essentials].delete Ramaze::Adapter
+Ramaze.start :force => true
+run Ramaze::Adapter::Base

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

@@ -4,6 +4,8 @@
 <p>The backtrace gives filenames and line numbers for all parts of the call stack.<br />
 Click on any of them to view the surrounding source code.</p>
+<h3>#@title</h3>
 <table class="main">
   <tr class="head">
     <td>File</td><td>Line</td><td>Method</td>

data/lib/ramaze.rb CHANGED

@@ -1,13 +1,34 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
+# StdLib
+require 'abbrev'
+require 'benchmark'
+require 'cgi'
+require 'digest/md5'
 require 'fileutils'
+require 'ipaddr'
+require 'optparse'
+require 'ostruct'
+require 'pathname'
+require 'pp'
+require 'set'
+require 'socket'
+require 'timeout'
+require 'tmpdir'
+require 'yaml'
 begin
   require 'rubygems'
 rescue LoadError
 end
+# Rack
+require 'rack'
+require 'rack/utils'
+require 'rack/request'
+require 'rack/response'
 # The main namespace for Ramaze
 module Ramaze
   SEEED = $0.dup
@@ -22,28 +43,30 @@ Thread.abort_on_exception = true
 # Bootstrap
 require 'ramaze/version'
 require 'ramaze/snippets'
-require 'ramaze/inform'
-require 'ramaze/route'
+require 'ramaze/log'
+require 'ramaze/trinity'
+require 'ramaze/current'
+require 'ramaze/adapter'
 require 'ramaze/global'
 require 'ramaze/cache'
 require 'ramaze/tool'
 # Startup
 require 'ramaze/controller'
-require 'ramaze/adapter'
 require 'ramaze/sourcereload'
 # Complete
 require 'ramaze/dispatcher'
 require 'ramaze/template/ezamar'
 require 'ramaze/contrib'
+require 'ramaze/route'
 module Ramaze
   # Each of these classes will be called ::startup upon Ramaze.startup
   trait :essentials => [
-    Global, Cache, Controller, Session, SourceReload, Adapter
+    Global, Cache, Contrib, Controller, Session, SourceReload, Adapter
   ]
   class << self
@@ -56,7 +79,7 @@ module Ramaze
       runner = options.delete(:runner) || runner_from_caller
       if $0 == runner or options.delete(:force)
-        Inform.info("Starting up Ramaze (Version #{VERSION})")
+        Log.info("Starting up Ramaze (Version #{VERSION})")
         SEEED.replace(runner)
         APPDIR.replace(File.dirname(File.expand_path(runner)))