RubyGems - ramaze - Versions diffs - 0.1.4 → 0.2.0 - Mend

ramaze 0.1.4 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (192) hide show

data/Rakefile +26 -6
data/bin/ramaze +8 -1
data/doc/AUTHORS +13 -11
data/doc/CHANGELOG +472 -13
data/doc/LEGAL +22 -0
data/doc/README +1 -4
data/doc/TODO +7 -2
data/doc/changes.txt +472 -13
data/doc/changes.xml +472 -13
data/doc/meta/announcement.txt +21 -23
data/doc/readme_chunks/appendix.txt +0 -3
data/doc/readme_chunks/features.txt +1 -1
data/examples/auth/auth.rb +49 -0
data/examples/auth/template/layout.haml +20 -0
data/examples/auth/template/login.haml +16 -0
data/examples/blog/spec/blog.rb +1 -0
data/examples/caching.rb +5 -6
data/examples/css.rb +37 -0
data/examples/layout.rb +3 -17
data/examples/simple_auth.rb +23 -0
data/examples/sourceview/public/images/file.gif +0 -0
data/examples/sourceview/public/images/folder.gif +0 -0
data/examples/sourceview/public/images/tv-collapsable-last.gif +0 -0
data/examples/sourceview/public/images/tv-collapsable.gif +0 -0
data/examples/sourceview/public/images/tv-expandable-last.gif +0 -0
data/examples/sourceview/public/images/tv-expandable.gif +0 -0
data/examples/sourceview/public/images/tv-item-last.gif +0 -0
data/examples/sourceview/public/images/tv-item.gif +0 -0
data/examples/sourceview/public/jquery.js +11 -0
data/examples/sourceview/public/jquery.treeview.css +47 -0
data/examples/sourceview/public/jquery.treeview.js +223 -0
data/examples/sourceview/public/sourceview.js +16 -0
data/examples/sourceview/sourceview.rb +74 -0
data/examples/sourceview/template/index.haml +43 -0
data/examples/templates/template/external.nag +28 -0
data/examples/templates/template/external.xsl +57 -0
data/examples/templates/template_amrita2.rb +2 -4
data/examples/templates/template_erubis.rb +1 -1
data/examples/templates/template_haml.rb +1 -1
data/examples/templates/template_liquid.rb +2 -4
data/examples/templates/template_markaby.rb +2 -4
data/examples/templates/template_nagoro.rb +53 -0
data/examples/templates/template_remarkably.rb +2 -4
data/examples/templates/template_xslt.rb +52 -0
data/examples/whywiki/spec/whywiki.rb +63 -0
data/examples/whywiki/start.rb +11 -13
data/examples/whywiki/template/edit.xhtml +3 -3
data/examples/whywiki/template/show.xhtml +5 -8
data/examples/wikore/spec/wikore.rb +115 -0
data/examples/wikore/src/controller.rb +81 -0
data/examples/wikore/src/model.rb +51 -0
data/examples/wikore/start.rb +6 -0
data/examples/wikore/template/index.xhtml +8 -0
data/examples/wiktacular/spec/wiktacular.rb +1 -0
data/examples/wiktacular/src/controller.rb +1 -1
data/lib/ramaze.rb +6 -3
data/lib/ramaze/action.rb +2 -13
data/lib/ramaze/action/render.rb +36 -18
data/lib/ramaze/adapter.rb +1 -1
data/lib/ramaze/adapter/cgi.rb +0 -3
data/lib/ramaze/adapter/evented_mongrel.rb +7 -0
data/lib/ramaze/adapter/mongrel.rb +4 -13
data/lib/ramaze/adapter/swiftiplied_mongrel.rb +7 -0
data/lib/ramaze/cache.rb +12 -7
data/lib/ramaze/contrib.rb +22 -0
data/lib/ramaze/contrib/auto_params.rb +128 -0
data/lib/ramaze/contrib/auto_params/get_args.rb +56 -0
data/lib/ramaze/contrib/gzip_filter.rb +57 -0
data/lib/ramaze/contrib/route.rb +40 -0
data/lib/ramaze/contrib/sequel/fill.rb +12 -0
data/lib/ramaze/controller.rb +17 -6
data/lib/ramaze/controller/resolve.rb +51 -14
data/lib/ramaze/dispatcher.rb +15 -13
data/lib/ramaze/dispatcher/action.rb +4 -3
data/lib/ramaze/dispatcher/directory.rb +3 -3
data/lib/ramaze/dispatcher/error.rb +1 -1
data/lib/ramaze/dispatcher/file.rb +17 -6
data/lib/ramaze/error.rb +3 -0
data/lib/ramaze/gestalt.rb +28 -8
data/lib/ramaze/global.rb +26 -6
data/lib/ramaze/global/globalstruct.rb +31 -6
data/lib/ramaze/helper.rb +2 -1
data/lib/ramaze/helper/aspect.rb +2 -2
data/lib/ramaze/helper/auth.rb +6 -9
data/lib/ramaze/helper/cache.rb +89 -9
data/lib/ramaze/helper/cgi.rb +2 -2
data/lib/ramaze/helper/formatting.rb +44 -0
data/lib/ramaze/helper/link.rb +7 -5
data/lib/ramaze/helper/partial.rb +6 -4
data/lib/ramaze/helper/redirect.rb +24 -9
data/lib/ramaze/helper/stack.rb +6 -1
data/lib/ramaze/inform/growl.rb +1 -1
data/lib/ramaze/inform/informer.rb +2 -1
data/lib/ramaze/inform/informing.rb +6 -0
data/lib/ramaze/inform/syslog.rb +1 -0
data/lib/ramaze/snippets/array/put_within.rb +24 -0
data/lib/ramaze/snippets/dictionary.rb +499 -0
data/lib/ramaze/snippets/numeric/filesize_format.rb +19 -0
data/lib/ramaze/snippets/ordered_set.rb +31 -0
data/lib/ramaze/snippets/string/DIVIDE.rb +1 -1
data/lib/ramaze/snippets/string/snake_case.rb +1 -1
data/lib/ramaze/snippets/struct/values_at.rb +5 -1
data/lib/ramaze/snippets/thread/into.rb +25 -0
data/lib/ramaze/sourcereload.rb +39 -19
data/lib/ramaze/spec/helper.rb +4 -1
data/lib/ramaze/spec/helper/{context.rb → browser.rb} +3 -0
data/lib/ramaze/spec/helper/layout.rb +3 -0
data/lib/ramaze/spec/helper/minimal.rb +3 -0
data/lib/ramaze/spec/helper/mock_http.rb +8 -5
data/lib/ramaze/spec/helper/requester.rb +4 -1
data/lib/ramaze/spec/helper/wrap.rb +15 -7
data/lib/ramaze/template.rb +5 -1
data/lib/ramaze/template/ezamar/engine.rb +2 -3
data/lib/ramaze/template/ezamar/morpher.rb +26 -45
data/lib/ramaze/template/nagoro.rb +53 -0
data/lib/ramaze/template/none.rb +14 -0
data/lib/ramaze/template/xslt.rb +96 -0
data/lib/ramaze/tool.rb +0 -1
data/lib/ramaze/tool/localize.rb +7 -2
data/lib/ramaze/trinity/request.rb +1 -0
data/lib/ramaze/trinity/session.rb +3 -3
data/lib/ramaze/version.rb +2 -2
data/rake_tasks/conf.rake +1 -2
data/rake_tasks/{maintaince.rake → maintenance.rake} +25 -17
data/spec/contrib/auto_params.rb +97 -0
data/spec/contrib/route.rb +60 -0
data/spec/contrib/sequel/fill.rb +46 -0
data/spec/examples/caching.rb +1 -2
data/spec/examples/css.rb +12 -0
data/spec/examples/element.rb +0 -1
data/spec/examples/hello.rb +0 -1
data/spec/examples/simple.rb +0 -1
data/spec/helper.rb +3 -2
data/spec/ramaze/action/cache.rb +24 -7
data/spec/ramaze/action/layout.rb +19 -11
data/spec/ramaze/action/template/sub/sub_wrapper.xhtml +1 -0
data/spec/ramaze/controller.rb +11 -0
data/spec/ramaze/controller/template_resolving.rb +28 -27
data/spec/ramaze/dispatcher.rb +32 -0
data/spec/ramaze/dispatcher/directory.rb +2 -1
data/spec/ramaze/element.rb +1 -1
data/spec/ramaze/gestalt.rb +28 -0
data/spec/ramaze/helper/aspect.rb +14 -3
data/spec/ramaze/helper/cache.rb +78 -13
data/spec/ramaze/helper/formatting.rb +20 -0
data/spec/ramaze/helper/link.rb +2 -0
data/spec/ramaze/helper/partial.rb +12 -1
data/spec/ramaze/helper/redirect.rb +44 -8
data/spec/ramaze/helper/stack.rb +3 -3
data/spec/ramaze/helper/template/loop.xhtml +3 -0
data/spec/ramaze/helper/template/num.xhtml +1 -0
data/spec/ramaze/helper/template/recursive.xhtml +8 -0
data/spec/ramaze/morpher.rb +25 -6
data/spec/ramaze/params.rb +6 -2
data/spec/ramaze/request.rb +5 -2
data/spec/ramaze/session.rb +19 -0
data/spec/ramaze/template.rb +2 -2
data/spec/ramaze/template/amrita2.rb +2 -2
data/spec/ramaze/template/erubis.rb +2 -2
data/spec/ramaze/template/ezamar.rb +6 -3
data/spec/ramaze/template/haml.rb +3 -3
data/spec/ramaze/template/liquid.rb +1 -1
data/spec/ramaze/template/markaby.rb +1 -1
data/spec/ramaze/template/nagoro.rb +65 -0
data/spec/ramaze/template/nagoro/another/long/action.nag +1 -0
data/spec/ramaze/template/nagoro/combined.nag +1 -0
data/spec/ramaze/template/nagoro/file_only.nag +1 -0
data/spec/ramaze/template/nagoro/index.nag +1 -0
data/spec/ramaze/template/nagoro/nested.nag +1 -0
data/spec/ramaze/template/nagoro/some__long__action.nag +1 -0
data/spec/ramaze/template/nagoro/sum.nag +1 -0
data/spec/ramaze/template/remarkably.rb +1 -1
data/spec/ramaze/template/sass.rb +1 -1
data/spec/ramaze/template/xslt.rb +93 -0
data/spec/ramaze/template/xslt/concat_words.xsl +16 -0
data/spec/ramaze/template/xslt/index.xsl +14 -0
data/spec/ramaze/template/xslt/products.xsl +32 -0
data/spec/ramaze/template/xslt/ruby_version.xsl +14 -0
data/spec/snippets/array/put_within.rb +32 -0
data/spec/snippets/numeric/filesize_format.rb +12 -0
data/spec/snippets/ordered_set.rb +56 -0
data/spec/snippets/ramaze/caller_lines.rb +6 -3
data/spec/snippets/string/snake_case.rb +3 -0
metadata +118 -22
data/doc/README.html +0 -737
data/examples/fcgi.rb +0 -13
data/lib/ramaze/snippets/numeric/human_readable_filesize_format.rb +0 -33
data/lib/ramaze/tool/tidy.rb +0 -104
data/spec/ramaze/controller/template/edit.xhtml +0 -1
data/spec/ramaze/controller/template/edit/content.xhtml +0 -1
data/spec/ramaze/tidy.rb +0 -12
data/spec/snippets/numeric/human_readable_filesize_format.rb +0 -11

data/examples/whywiki/start.rb CHANGED

@@ -6,29 +6,31 @@
 require 'ramaze'
 require 'bluecloth'
-include Ramaze
+Db = Ramaze::YAMLStoreCache.new('wiki.yaml') unless defined?(Db)
-Db = YAMLStoreCache.new('wiki.yaml')
+class WikiController < Ramaze::Controller
+  map :/
+  engine :Nagoro
-class WikiController < Controller
   def index
-    redirect(R(:show, 'Home'))
+    redirect R(:show, 'Home')
   end
   def show page = 'Home'
-    @page = CGI.unescape(page)
+    @page = url_decode(page)
     @text = Db[page].to_s
+    @edit_link = "/edit/#{page}"
     @text.gsub!(/\[\[(.*?)\]\]/) do |m|
       exists = Db[$1] ? 'exists' : 'nonexists'
-      link( R(self, :show, CGI.escape($1)), :title => $1, :class => exists)
+      A($1, :href => Rs(:show, url_encode($1)), :class => exists)
     end
     @text = BlueCloth.new(@text).to_html
   end
   def edit page = 'Home'
-    @page = CGI.unescape(page)
+    @page = url_decode(page)
     @text = Db[page]
   end
@@ -40,12 +42,8 @@ class WikiController < Controller
     Db[page] = text
-    redirect R(self, :show, CGI.escape(page))
+    redirect Rs(:show, url_encode(page))
   end
 end
-Global.adapter = :mongrel
-#Global.tidy = true
-Global.mapping = {'/' => WikiController}
-Ramaze.start
+Ramaze.start :adapter => :mongrel

data/examples/whywiki/template/edit.xhtml CHANGED

@@ -2,11 +2,11 @@
   <head>
     <title>MicroWiki Edit #{@page}</title>
   </head>
-    #{ A("&lt; Home", :href => R(self)) }
   <body>
     <h1>Edit #{@page}</h1>
-    <form method="POST" action="#{R(self, :save)}">
-      <input type="hidden" name="page" value="#{CGI.escape(@page)}" />
+    #{ A("&lt; Home", :href => Rs()) }
+    <form method="POST" action="#{Rs(:save)}">
+      <input type="hidden" name="page" value="#{url_encode(@page)}" />
       <textarea name="text" style="width: 90%; height: 20em;">#{@text}</textarea>
       <input type="submit" />
     </form>

data/examples/whywiki/template/show.xhtml CHANGED

@@ -6,16 +6,13 @@
       a.nonexists{ color: #f00; }
     </style>
   </head>
-    #{ A("&lt; Home", :href => R(self)) unless @page == "Home" }
   <body>
+    <a href="/show/Home" unless="@page == 'Home'">&lt; Home</a>
     <h1>#{@page}</h1>
-    <?r if @text.empty? ?>
-      #{ A("Create #{@page}?",:href => R(self, :edit, CGI.escape(@page))) }
-    <?r else ?>
-    <div>
-      #{ A("Edit #{@page}?", :href => R(self, :edit, CGI.escape(@page))) }
-      #{@text}
+    <a href="#@edit_link" if="@text.empty?">Create #@page</a>
+    <div unless="@text.empty?">
+      <a href="#@edit_link">Edit #@page</a>
+      #@text
     </div>
-    <?r end ?>
   </body>
 </html>

data/examples/wikore/spec/wikore.rb ADDED

@@ -0,0 +1,115 @@
+require 'ramaze'
+require 'ramaze/spec/helper'
+# if these libraries are missing there is no sense in running the tests,
+# cause they won't work at all.
+testcase_requires 'hpricot'
+$:.unshift __DIR__/'../'
+require 'start'
+describe 'Wikore' do
+  def should_redirect to = '/'
+    response = yield
+    response.status.should == 303
+    response.body.should =~ /<a href="#{to}">/
+  end
+  def page_should_exist(name, *matches)
+    page = get("/#{name}")
+    page.status.should == 200
+    matches.each do |match|
+      page.body.should =~ match
+    end
+  end
+  before :all do
+    ramaze :template_root => (__DIR__/'../template')
+  end
+  it 'should have no Main page' do
+    page = get('/Main')
+    page.status.should == 200
+    page.body.should =~ /No Page known as 'Main'/
+  end
+  it 'should create a Main page' do
+    should_redirect '/Main' do
+      post('/page/create', 'title' => 'Main', 'text' => 'Newly created Main page')
+    end
+    matches = [
+      /Newly created Main page/,
+      /Version: 1/
+    ]
+    page_should_exist('Main', *matches)
+  end
+  it 'should update Main page' do
+    should_redirect '/Main' do
+      post('/page/save', 'title' => 'Main', 'text' => 'Newly updated Main page')
+    end
+    matches = [
+      /Newly updated Main page/,
+      /Version: 2/
+    ]
+    page_should_exist('Main', *matches)
+  end
+  it 'should maintain a backup' do
+    matches = [
+      /Newly created Main page/,
+      /Version: 1/
+    ]
+    page_should_exist('Main/1', *matches)
+  end
+  it 'should revert' do
+    get('/page/revert/Main')
+    matches = [
+      /Newly created Main page/,
+      /Version: 1/
+    ]
+    page_should_exist('Main', *matches)
+  end
+  it 'should incrememt version of Main page' do
+    (2..4).each do |n|
+      post('/page/save', 'title' => 'Main', 'text' => 'updated Main page')
+      matches = [ /updated Main page/, /Version: #{n}/ ]
+      page_should_exist('Main', *matches)
+    end
+  end
+  it 'should rename Main page to Other and back' do
+    should_redirect '/Other' do
+      get('/page/rename/Main/Other')
+    end
+    should_redirect '/Main' do
+      get('/page/rename/Other/Main')
+    end
+  end
+  it 'should delete Main page' do
+    get('/page/delete/Main')
+    page_should_exist('Main', /No Page known as 'Main'/)
+  end
+  it 'should fail if create/save is not POSTed to' do
+    should_redirect '/' do
+      get('/page/save', 'title' => 'Main', 'text' => 'Newly updated Main page')
+    end
+    should_redirect '/' do
+      get('/page/create', 'title' => 'Main', 'text' => 'Newly updated Main page')
+    end
+  end
+  after :all do
+    FileUtils.rm('wikore.db')
+  end
+end

data/examples/wikore/src/controller.rb ADDED

@@ -0,0 +1,81 @@
+class Ramaze::Controller
+  Page = Model::Page
+  OldPage = Model::OldPage
+end
+class MainController < Ramaze::Controller
+  def index(title = 'Main', version = nil)
+    query = {:title => title}
+    query[:version] = version.to_i if version
+    model = version ? OldPage : Page
+    if page = model[query]
+      @text, @version = page.text, page.version
+    else
+      @text = "No Page known as '#{title}'"
+      @version = false
+    end
+  end
+end
+class PageController < Ramaze::Controller
+  map '/page'
+  helper :aspect
+  def create
+    change "Created Page '%s'" do |title, text|
+      Page.create(:title => title, :text => text, :version => 1)
+      redirect R(MainController, title)
+    end
+  end
+  def save
+    change "Updated Page '%s'" do |title, text|
+      page = Page[:title => title]
+      page.backup
+      page.text = text
+      page.version += 1
+      page.save
+      redirect R(MainController, title)
+    end
+  end
+  def delete(title)
+    page = Page[:title => title]
+    page.backup
+    page.delete
+  end
+  def rename(title, to)
+    change("Renamed #{title} to '%s'", to) do |title, text|
+      page = Page[:title => title]
+      page.backup
+      page.title = to
+      page.version += 1
+      page.save
+    end
+  end
+  def revert(title)
+    page = Page[:title => title]
+    p page
+    page.revert
+    redirect R(MainController, title)
+  end
+  before :create, :save do
+    redirect_referer unless request.post?
+  end
+  private
+  def change(message, redirect_to = '/')
+    if title = request['title'] and text = request['text']
+      yield(title, text)
+      message % title
+    end
+    redirect(R(MainController, redirect_to))
+  end
+end

data/examples/wikore/src/model.rb ADDED

@@ -0,0 +1,51 @@
+require 'sequel'
+require 'sequel/sqlite'
+case $wikore_db
+when :memory
+  DB = Sequel('sqlite:/')
+else
+  DB = Sequel('sqlite:///wikore.db')
+end
+module Model
+  PAGE_SCHEMA = lambda{
+  }
+  class Page < Sequel::Model(:page)
+    set_schema do
+      primary_key :id
+      text    :title, :unique => true, :null => false
+      boolean :active, :default => true
+      text    :text
+      integer :version
+    end
+    def backup
+      hash = @values.dup
+      hash.delete :id
+      OldPage.create(hash)
+    end
+    def revert
+      backup = OldPage[:title => title].values.dup
+      backup.delete :id
+      delete
+      self.class.create(backup)
+    end
+  end
+  class OldPage < Sequel::Model(:old_page)
+    set_schema do
+      primary_key :id
+      text    :title, :unique => false, :null => false
+      boolean :active, :default => true
+      text    :text
+      integer :version
+    end
+  end
+  [Page, OldPage].each do |klass|
+    klass.create_table unless klass.table_exists?
+  end
+end

data/examples/wikore/start.rb ADDED

@@ -0,0 +1,6 @@
+require 'ramaze'
+$wikore = {}
+require 'src/model'
+require 'src/controller'

data/examples/wikore/template/index.xhtml ADDED

@@ -0,0 +1,8 @@
+<div id="text">
+  #@text
+</div>
+<?r if @version ?>
+  <div id="version">
+    Version: #@version
+  </div>
+<?r end ?>

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

@@ -1,3 +1,4 @@
+require 'ramaze'
 require 'ramaze/spec/helper'
 # if these libraries are missing there is no sense in running the tests,

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

@@ -51,5 +51,5 @@ class MainController < Ramaze::Controller
       }.join("\n")
   end
-  layout :html_layout
+  layout '/html_layout'
 end

data/lib/ramaze.rb CHANGED

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
+require 'fileutils'
 begin
   require 'rubygems'
 rescue LoadError
@@ -10,6 +12,7 @@ end
 module Ramaze
   BASEDIR = File.dirname(File.expand_path(__FILE__))
   SEEED = $0.dup
+  APPDIR = File.dirname(File.expand_path($0))
   $:.unshift BASEDIR
 end
@@ -46,12 +49,12 @@ module Ramaze
     # each class in trait[:essentials] by calling ::startup on them.
     def startup options = {}
-      Inform.info("Starting up Ramaze (Version #{VERSION})")
-      starter = caller[0].split(':').first
+      starter = options.fetch(:runner, caller[0].split(':').first)
       if $0 == starter or options.delete(:force)
+        Inform.info("Starting up Ramaze (Version #{VERSION})")
         SEEED.replace(starter)
+        APPDIR.replace(File.dirname(File.expand_path(starter)))
         trait[:essentials].each do |obj|
           obj.startup(options)

data/lib/ramaze/action.rb CHANGED

@@ -105,20 +105,9 @@ module Ramaze
       File.basename((self[:method] || self[:template]).to_s).split('.').first
     end
-    # TODO: find good names for this method.
-    def basepath
-      @basepath ||= "#{controller.mapping}/#{name}".gsub(/^\/+/, '/')
-    end
-    # TODO: find good names for this method.
-    def fullpath
-      "#{path}/#{params.join('/')}".gsub(/^\/+/, '/')
-    end
-    # TODO: find good names for this method.
+    # combined path to current action, from path and params
     def extended_path
-      @extended_path ||= File.join(path, *params)
+      @extended_path ||= Array[path, *params].join('/')
     end
     # Hook for AspectHelper

data/lib/ramaze/action/render.rb CHANGED

@@ -12,7 +12,7 @@ module Ramaze
     #  #> 'bar'
     def render
-      Inform.debug("The Action: #{self}")
+      Inform.dev("The Action: #{self}")
       Thread.current[:action] = self
       if should_cache?
@@ -22,6 +22,8 @@ module Ramaze
       end
     end
+    private
     # Return the cached output of the action if it exists, otherwise do a
     # normal Action#uncached_render and store the output in the Cache.actions.
     # Action#cached_render is only called if Action#should_cache? returns
@@ -38,27 +40,36 @@ module Ramaze
     def cached_render_file
       rendered = uncached_render
-      global_epath = Global.public_root/extended_path
+      global_epath = Global.public_root/self.controller.mapping/extended_path
       FileUtils.mkdir_p(File.dirname(global_epath))
-      File.open( global_epath, 'w+'){|fp| fp.print(rendered) }
-      meta_epath = Global.file_cache_meta_dir/extended_path
-      FileUtils.mkdir_p(File.dirname(meta_epath))
-      File.open( meta_epath, 'w+'){|fp| fp.print(Time.now.to_i) }
+      File.open(global_epath, 'w+') {|fp| fp.print(rendered) }
       rendered
     end
     def cached_render_memory
       action_cache = Cache.actions
+      full_path = self.controller.mapping/extended_path
+      # backwards compat with trait :actions_cached => []
+      cache_opts = actions_cached.is_a?(Hash) ? actions_cached[path.to_sym] : {}
+      if cache_opts[:key]
+        action_cache[full_path] ||= {}
+        cache = action_cache[full_path][ cache_opts[:key].call ] ||= {}
+      else
+        cache = action_cache[full_path] ||= {}
+      end
-      if out = action_cache[relaxed_hash]
+      if cache.size > 0 and (cache_opts[:ttl].nil? or cache[:time] + cache_opts[:ttl] > Time.now)
         Inform.debug("Using Cached version")
-        return out
+        Response.current['Content-Type'] = cache[:type]
+      else
+        Inform.debug("Compiling Action")
+        cache.replace({ :time => Time.now, :content => uncached_render, :type => Response.current['Content-Type'] })
       end
-      Inform.debug("Compiling Action")
-      action_cache[relaxed_hash] = uncached_render
+      cache[:content]
     end
     # The 'normal' rendering process. Passes the Action instance to
@@ -66,16 +77,19 @@ module Ramaze
     # Layout will be found and rendered in this step after self was rendered.
     def uncached_render
-      bp = before_process
-      content = engine.transform(self)
-      ap = after_process
+      content = [before_process,
+                 engine.transform(self),
+                 after_process].join
-      if tlayout = layout
+      if path and tlayout = layout
         instance.instance_variable_set("@content", content)
         content = tlayout.render
+        # restore Action.current after render above
         Thread.current[:action] = self
       end
-      [bp, content, ap].join
+      content
     end
     # Determine whether or not we have a layout to process and sets it up
@@ -99,20 +113,24 @@ module Ramaze
         layout_action.binding = binding
         layout_action.controller = controller
         layout_action.instance = instance
+        layout_action.path = nil
         layout_action
       end
     end
+    def actions_cached
+      controller.trait[:actions_cached]
+    end
     # return true if the action is flagged for caching. Called by
     # Action#render.
     def should_cache?
       ctrait = controller.trait
-      actions_cached = ctrait[:actions_cached]
       [ Global.cache_all,
         ctrait[:cache_all],
-        actions_cached.map{|k| k.to_s}.include?(method),
+        actions_cached.map{|k,v| k.to_s}.include?(method),
       ].any?
     end
   end