RubyGems - ramaze - Versions diffs - 0.1.0 → 0.1.1 - Mend

ramaze 0.1.0 → 0.1.1

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 (195) hide show

data/Rakefile +4 -12
data/bin/ramaze +95 -171
data/doc/CHANGELOG +387 -4
data/doc/README +81 -13
data/doc/meta/announcement.txt +51 -8
data/doc/meta/configuration.txt +17 -34
data/doc/meta/internals.txt +34 -4
data/doc/migrate/1110_to_1111.txt +131 -0
data/doc/readme_chunks/features.txt +81 -12
data/doc/readme_chunks/installing.txt +0 -1
data/doc/tutorial/todolist.html +293 -65
data/doc/tutorial/{todolist.txt → todolist.mkd} +251 -51
data/examples/blog/main.rb +1 -1
data/examples/blog/src/model.rb +0 -1
data/examples/hello.rb +2 -5
data/examples/templates/template/external.haml +5 -5
data/examples/templates/template/external.liquid +1 -1
data/examples/templates/template/external.mab +8 -8
data/examples/templates/template/external.rem +30 -0
data/examples/templates/template/external.rhtml +6 -7
data/examples/templates/template/external.zmr +13 -9
data/examples/templates/template_amrita2.rb +8 -8
data/examples/templates/template_erubis.rb +11 -11
data/examples/templates/template_ezamar.rb +9 -11
data/examples/templates/template_haml.rb +13 -13
data/examples/templates/template_liquid.rb +10 -10
data/examples/templates/template_markaby.rb +13 -10
data/examples/templates/template_remarkably.rb +59 -0
data/examples/todolist/main.rb +1 -7
data/examples/todolist/src/controller/main.rb +26 -13
data/examples/todolist/src/element/page.rb +5 -0
data/examples/whywiki/main.rb +1 -1
data/lib/proto/main.rb +0 -8
data/lib/proto/public/css/ramaze_error.css +12 -4
data/lib/proto/public/error.zmr +6 -25
data/lib/ramaze.rb +35 -245
data/lib/ramaze/action.rb +21 -0
data/lib/ramaze/adapter.rb +94 -29
data/lib/ramaze/adapter/base.rb +57 -0
data/lib/ramaze/adapter/mongrel.rb +12 -19
data/lib/ramaze/adapter/webrick.rb +21 -20
data/lib/ramaze/cache.rb +47 -3
data/lib/ramaze/cache/memcached.rb +22 -0
data/lib/ramaze/cache/yaml_store.rb +19 -0
data/lib/ramaze/controller.rb +47 -271
data/lib/ramaze/controller/error.rb +43 -0
data/lib/ramaze/controller/render.rb +90 -0
data/lib/ramaze/controller/resolve.rb +147 -0
data/lib/ramaze/dispatcher.rb +41 -9
data/lib/ramaze/dispatcher/file.rb +1 -1
data/lib/ramaze/global.rb +73 -158
data/lib/ramaze/global/dsl.rb +29 -0
data/lib/ramaze/global/globalstruct.rb +90 -0
data/lib/ramaze/helper.rb +1 -1
data/lib/ramaze/helper/aspect.rb +39 -179
data/lib/ramaze/helper/cache.rb +8 -9
data/lib/ramaze/helper/cgi.rb +23 -0
data/lib/ramaze/helper/file.rb +3 -0
data/lib/ramaze/helper/inform.rb +3 -0
data/lib/ramaze/helper/link.rb +56 -63
data/lib/ramaze/helper/nitroform.rb +4 -0
data/lib/ramaze/helper/redirect.rb +1 -1
data/lib/ramaze/inform.rb +6 -2
data/lib/ramaze/inform/analogger.rb +5 -1
data/lib/ramaze/inform/hub.rb +1 -1
data/lib/ramaze/inform/informing.rb +7 -0
data/lib/ramaze/snippets/kernel/aquire.rb +2 -0
data/lib/ramaze/snippets/kernel/constant.rb +2 -0
data/lib/ramaze/snippets/kernel/pretty_inspect.rb +2 -0
data/lib/ramaze/snippets/object/traits.rb +4 -0
data/lib/ramaze/snippets/openstruct/temp.rb +3 -0
data/lib/ramaze/snippets/string/DIVIDE.rb +2 -0
data/lib/ramaze/snippets/string/camel_case.rb +2 -0
data/lib/ramaze/snippets/string/color.rb +2 -0
data/lib/ramaze/snippets/string/each.rb +2 -0
data/lib/ramaze/snippets/string/snake_case.rb +3 -0
data/lib/ramaze/snippets/struct/fill.rb +8 -2
data/lib/ramaze/snippets/struct/values_at.rb +16 -0
data/lib/ramaze/snippets/symbol/to_proc.rb +3 -0
data/lib/ramaze/sourcereload.rb +89 -0
data/lib/ramaze/template.rb +21 -12
data/lib/ramaze/template/amrita2.rb +6 -6
data/lib/ramaze/template/erubis.rb +4 -9
data/lib/ramaze/template/ezamar.rb +13 -57
data/lib/ramaze/template/ezamar/element.rb +10 -12
data/lib/ramaze/template/ezamar/engine.rb +40 -101
data/lib/ramaze/template/ezamar/morpher.rb +3 -3
data/lib/ramaze/template/haml.rb +3 -6
data/lib/ramaze/template/liquid.rb +4 -9
data/lib/ramaze/template/markaby.rb +16 -22
data/lib/ramaze/template/remarkably.rb +28 -0
data/lib/ramaze/tool/mime.rb +2 -0
data/lib/ramaze/tool/record.rb +6 -0
data/lib/ramaze/trinity/request.rb +44 -54
data/lib/ramaze/trinity/response.rb +1 -1
data/lib/ramaze/trinity/session.rb +15 -37
data/lib/ramaze/version.rb +1 -1
data/rake_tasks/gem.rake +2 -2
data/rake_tasks/maintaince.rake +42 -1
data/rake_tasks/spec.rake +45 -0
data/spec/examples/caching.rb +1 -1
data/spec/examples/simple.rb +1 -1
data/spec/examples/templates/template_amrita2.rb +1 -0
data/spec/examples/templates/template_erubis.rb +2 -1
data/spec/examples/templates/template_ezamar.rb +1 -1
data/spec/examples/templates/template_haml.rb +2 -1
data/spec/examples/templates/template_liquid.rb +2 -1
data/spec/examples/templates/template_markaby.rb +2 -1
data/spec/examples/templates/template_remarkably.rb +22 -0
data/spec/examples/todolist.rb +125 -0
data/spec/helper.rb +2 -23
data/spec/helper/minimal.rb +20 -0
data/spec/helper/mock_http.rb +24 -30
data/spec/helper/simple_http.rb +2 -2
data/spec/helper/wrap.rb +6 -9
data/spec/ramaze/adapter.rb +1 -1
data/spec/ramaze/adapter/record.rb +31 -0
data/spec/ramaze/cache.rb +41 -54
data/spec/ramaze/controller.rb +121 -137
data/spec/ramaze/controller/template/list.xhtml +1 -0
data/spec/ramaze/controller/template/other/greet/other.xhtml +1 -0
data/spec/ramaze/controller/template_resolving.rb +27 -3
data/spec/ramaze/element.rb +11 -7
data/spec/ramaze/error.rb +1 -1
data/spec/ramaze/gestalt.rb +2 -0
data/spec/ramaze/helper/aspect.rb +30 -21
data/spec/ramaze/helper/auth.rb +1 -1
data/spec/ramaze/helper/cache.rb +2 -1
data/spec/ramaze/helper/form.rb +14 -11
data/spec/ramaze/helper/link.rb +18 -41
data/spec/ramaze/localize.rb +29 -2
data/spec/ramaze/morpher.rb +23 -12
data/spec/ramaze/params.rb +46 -24
data/spec/ramaze/request.rb +6 -2
data/spec/ramaze/store/yaml.rb +5 -0
data/spec/ramaze/template.rb +22 -27
data/spec/ramaze/template/amrita2.rb +1 -2
data/spec/ramaze/template/erubis.rb +1 -1
data/spec/ramaze/template/ezamar.rb +1 -2
data/spec/ramaze/template/haml.rb +2 -2
data/spec/ramaze/template/haml/with_vars.haml +1 -1
data/spec/ramaze/template/liquid.rb +1 -1
data/spec/ramaze/template/markaby.rb +1 -1
data/spec/ramaze/template/remarkably.rb +56 -0
data/spec/ramaze/template/remarkably/external.rem +8 -0
data/spec/ramaze/template/remarkably/sum.rem +1 -0
metadata +38 -63
data/doc/README.html +0 -637
data/doc/allison/LICENSE +0 -184
data/doc/allison/README +0 -37
data/doc/allison/allison.css +0 -299
data/doc/allison/allison.gif +0 -0
data/doc/allison/allison.js +0 -307
data/doc/allison/allison.rb +0 -287
data/doc/allison/cache/BODY +0 -588
data/doc/allison/cache/CLASS_INDEX +0 -4
data/doc/allison/cache/CLASS_PAGE +0 -1
data/doc/allison/cache/FILE_INDEX +0 -4
data/doc/allison/cache/FILE_PAGE +0 -1
data/doc/allison/cache/FONTS +0 -1
data/doc/allison/cache/FR_INDEX_BODY +0 -1
data/doc/allison/cache/IMGPATH +0 -1
data/doc/allison/cache/INDEX +0 -1
data/doc/allison/cache/JAVASCRIPT +0 -307
data/doc/allison/cache/METHOD_INDEX +0 -4
data/doc/allison/cache/METHOD_LIST +0 -1
data/doc/allison/cache/SRC_PAGE +0 -1
data/doc/allison/cache/STYLE +0 -321
data/doc/allison/cache/URL +0 -1
data/doc/changes.txt +0 -3375
data/doc/changes.xml +0 -3378
data/examples/todolist/conf/benchmark.yaml +0 -35
data/examples/todolist/conf/debug.yaml +0 -34
data/examples/todolist/conf/live.yaml +0 -33
data/examples/todolist/conf/silent.yaml +0 -31
data/examples/todolist/conf/stage.yaml +0 -33
data/examples/todolist/public/css/coderay.css +0 -105
data/examples/todolist/public/css/ramaze_error.css +0 -42
data/lib/proto/conf/benchmark.yaml +0 -21
data/lib/proto/conf/debug.yaml +0 -21
data/lib/proto/conf/live.yaml +0 -21
data/lib/proto/conf/silent.yaml +0 -21
data/lib/proto/conf/stage.yaml +0 -21
data/lib/proto/public/css/coderay.css +0 -105
data/lib/ramaze/http_status.rb +0 -66
data/lib/ramaze/snippets/hash/keys_to_sym.rb +0 -19
data/lib/ramaze/snippets/kernel/method.rb +0 -26
data/lib/ramaze/snippets/method/name.rb +0 -22
data/lib/ramaze/snippets/ramaze/autoreload.rb +0 -135
data/lib/ramaze/snippets/rdoc/usage_no_exit.rb +0 -65
data/spec/all.rb +0 -32
data/spec/ramaze/conf/locale_de.yaml +0 -6
data/spec/ramaze/conf/locale_en.yaml +0 -6
data/spec/ramaze/dependencies.rb +0 -16
data/spec/ramaze/global.rb +0 -44

data/examples/blog/main.rb CHANGED

@@ -14,4 +14,4 @@ Og.setup :evolve_schema => :full
 Entry.create "Blog created", "Exciting news today, this blog was created!" if
   Entry.count == 0
-start
+Ramaze.start

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

@@ -3,7 +3,6 @@ class Entry
   property :updated, Time
   property :title, String
   property :content, String
-  property :craig, String
   def initialize title, content
     @created=Time.now
     @updated=Time.now

data/examples/hello.rb CHANGED

@@ -3,18 +3,15 @@
 require 'ramaze'
-# This is named MainController to automagically map it to '/'
-#   Global.mapping['/'] = MainController
-# would do the same thing.
 # you can access it now with http://localhost:7000/
 # This should output
 # Hello, World!
 # in your browser
 class MainController < Ramaze::Controller
-  map '/'
   def index
     "Hello, World!"
   end
 end
+Ramaze.start

data/examples/templates/template/external.haml CHANGED

@@ -1,17 +1,17 @@
 %html
   %head
-    %title Template::Haml internal
+    %title= "Template::Haml #@place"
   %body
     %h1= @title
-    = Rs(:/, :title => 'Home')
+    = A('Home', :href => :/)
     %p
       Here you can pass some stuff if you like, parameters are just passed like this:
       %br/
-      = link( R(self, @action, :one), :title => "#@action/one")
+      = A("#@place/one")
       %br/
-      = link( R(self, @action, :one, :two, :three), :title => "#@action/one/two/three")
+      = A("#@place/one/two/three")
       %br/
-      = link( R(self, @action, :one, :foo => :bar), :title => "#@action/one?foo=bar")
+      = A("#@place/one?foo=bar")
     %div
       The arguments you have passed to this action are:
       - if @args.empty?

data/examples/templates/template/external.liquid CHANGED

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Template::Liquid internal</title>
+    <title>Template::Liquid external</title>
   </head>
   <body>
   <h1>{{header}}</h1>

data/examples/templates/template/external.mab CHANGED

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

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

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

data/examples/templates/template/external.rhtml CHANGED

@@ -1,15 +1,15 @@
 <html>
   <head>
-    <title>Template::Erubis external</title>
+    <title>Template::Erubis internal</title>
   </head>
   <body>
-  <h1>The <%= @action %> Template for Erubis</h1>
-    <%= link :/, :title => 'Home' %>
+  <h1>The internal Template for Erubis</h1>
+    <%= A('Home', :href => :/) %>
     <p>
       Here you can pass some stuff if you like, parameters are just passed like this:<br />
-      <%= link self, @action, :one, :title => "#@action/one" %><br />
-      <%= link self, @action, :one, :two, :three, :title => "#@action/one/two/three" %><br />
-      <%= link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar" %><br />
+      <%= A("/#@place/one") %><br />
+      <%= A("#@place/two/three") %><br />
+      <%= A("#@place/one?foo=bar") %><br />
     </p>
     <div>
       The arguments you have passed to this action are:
@@ -26,4 +26,3 @@
     </div>
   </body>
 </html>

data/examples/templates/template/external.zmr CHANGED

@@ -1,20 +1,24 @@
 <html>
   <head>
-    <title>Template::Ezamar external</title>
+    <title>Template::Ezamar internal</title>
   </head>
   <body>
-  <h1>The #{@action} Template for Ezamar</h1>
-    #{link :/, :title => 'Home'}
+  <h1>The internal Template for Ezamar</h1>
+    #{A 'Home', :href => :/}
     <p>
       Here you can pass some stuff if you like, parameters are just passed like this:<br />
-      #{link self, @action, :one, :title => "#@action/one"}<br />
-      #{link self, @action, :one, :two, :three, :title => "#@action/one/two/three"}<br />
-      #{link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar"}<br />
+      #{A("internal/one")}<br />
+      #{A("internal/one/two/three")}<br />
+      #{A("internal/one?foo=bar")}<br />
     </p>
     <div>
-      *args
-      <?r @args.each do |arg| ?>
-        <span>#{arg}</span>
+      The arguments you have passed to this action are:
+      <?r if @args.empty? ?>
+        none
+      <?r else ?>
+        <?r @args.each do |arg| ?>
+          <span>#{arg}</span>
+        <?r end ?>
       <?r end ?>
     </div>
     <div>

data/examples/templates/template_amrita2.rb CHANGED

@@ -6,34 +6,34 @@ require 'ramaze'
 include Ramaze
 # TODO:
-# implement the amrita2 example, man, this engine is awkward :P
+#   - implement the amrita2 example, man, this engine is awkward :P
 class MainController < Controller
-  trait :template_root => File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
   trait :engine => Template::Amrita2
   def index
-    %{ #{Rs()} | #{Rs(:internal)} | #{Rs(:external)} }
+    %{ #{A(Rs())} | #{Rs(:internal)} | #{Rs(:external)} }
   end
   def title
-    "The #@action Template for Amrita2"
+    "The external Template for Amrita2"
   end
   def link_home
-    link :/, :title => 'Home'
+    A('Home', :href => '/')
   end
   def link_one
-      link self, @action, :one, :title => "#@action/one"
+    A('/external/one', :href => Rs(:external, :one))
   end
   def link_two
-      link self, @action, :one, :two, :three, :title => "#@action/one/two/three"
+    A("/external/one/two/three", :href => Rs(:external, :one, :two, :three))
   end
   def link_three
-      link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar"
+    A("/external?foo=bar", :href => Rs(:external, :one, :foo => :bar))
   end
   def inspect_parameters

data/examples/templates/template_erubis.rb CHANGED

@@ -3,31 +3,30 @@
 require 'ramaze'
-include Ramaze
-class MainController < Controller
-  trait :template_root => File.expand_path((File.dirname(__FILE__)/'template'))
-  trait :engine => Template::Erubis
+class MainController < Ramaze::Controller
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  trait :engine => Ramaze::Template::Erubis
   def index
-    %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
+    %{ #{A('Home', :href => :/)} | #{A(:internal)} | #{A(:external)} }
   end
   def internal *args
     @args = args
+    @place = :internal
     %q{
 <html>
   <head>
     <title>Template::Erubis internal</title>
   </head>
   <body>
-  <h1>The <%= @action %> Template for Erubis</h1>
-    <%= link :/, :title => 'Home' %>
+  <h1>The internal Template for Erubis</h1>
+    <%= A('Home', :href => :/) %>
     <p>
       Here you can pass some stuff if you like, parameters are just passed like this:<br />
-      <%= link self, @action, :one, :title => "#@action/one" %><br />
-      <%= link self, @action, :one, :two, :three, :title => "#@action/one/two/three" %><br />
-      <%= link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar" %><br />
+      <%= A("/#@place/one") %><br />
+      <%= A("#@place/two/three") %><br />
+      <%= A("#@place/one?foo=bar") %><br />
     </p>
     <div>
       The arguments you have passed to this action are:
@@ -49,5 +48,6 @@ class MainController < Controller
   def external *args
     @args = args
+    @place = :external
   end
 end

data/examples/templates/template_ezamar.rb CHANGED

@@ -3,13 +3,11 @@
 require 'ramaze'
-include Ramaze
-class MainController < Controller
-  trait :template_root => File.expand_path((File.dirname(__FILE__)/'template'))
+class MainController < Ramaze::Controller
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
   def index
-    %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
   end
   def internal *args
@@ -20,13 +18,13 @@ class MainController < Controller
     <title>Template::Ezamar internal</title>
   </head>
   <body>
-  <h1>The #{@action} Template for Ezamar</h1>
-    #{link :/, :title => 'Home'}
+  <h1>The internal Template for Ezamar</h1>
+    #{A 'Home', :href => :/}
     <p>
       Here you can pass some stuff if you like, parameters are just passed like this:<br />
-      #{link self, @action, :one, :title => "#@action/one"}<br />
-      #{link self, @action, :one, :two, :three, :title => "#@action/one/two/three"}<br />
-      #{link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar"}<br />
+      #{A("internal/one")}<br />
+      #{A("internal/one/two/three")}<br />
+      #{A("internal/one?foo=bar")}<br />
     </p>
     <div>
       The arguments you have passed to this action are:
@@ -51,4 +49,4 @@ class MainController < Controller
   end
 end
-run
+Ramaze.start

data/examples/templates/template_haml.rb CHANGED

@@ -3,35 +3,34 @@
 require 'ramaze'
-include Ramaze
-class MainController < Controller
-  trait :template_root => File.expand_path((File.dirname(__FILE__)/'template'))
-  trait :engine => Template::Haml
+class MainController < Ramaze::Controller
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  trait :engine => Ramaze::Template::Haml
   def index
-    %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
   end
   def internal *args
     @args = args
-    @title = "The #@action Template for Haml"
+    @place = :internal
+    @title = "The #@place Template for Haml"
     %q{
 %html
   %head
-    %title Template::Haml internal
+    %title= "Template::Haml #@place"
   %body
     %h1= @title
-    = Rs(:/, :title => 'Home')
+    = A('Home', :href => :/)
     %p
       Here you can pass some stuff if you like, parameters are just passed like this:
       %br/
-      = link( R(self, @action, :one), :title => "#@action/one")
+      = A("#@place/one")
       %br/
-      = link( R(self, @action, :one, :two, :three), :title => "#@action/one/two/three")
+      = A("#@place/one/two/three")
       %br/
-      = link( R(self, @action, :one, :foo => :bar), :title => "#@action/one?foo=bar")
+      = A("#@place/one?foo=bar")
     %div
       The arguments you have passed to this action are:
       - if @args.empty?
@@ -44,8 +43,9 @@ class MainController < Controller
   end
   def external *args
-    @title = "The #{@action} Template for Haml"
     @args = args
+    @place = :external
+    @title = "The #@place Template for Haml"
   end
 end

data/examples/templates/template_liquid.rb CHANGED

@@ -6,20 +6,20 @@ require 'ramaze'
 include Ramaze
 class MainController < Controller
-  trait :template_root => File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
   trait :engine => Template::Liquid
   def index
-    %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
   end
-  def liquid_hash(*args)
+  def liquid_hash(place, *args)
     {
-      'header'     => "The #{@action} Template for Liquid",
-      'link_home'  => link( :/, :title => 'Home'),
-      'link_one'   => link(self, @action, :one, :title => "#@action/one"),
-      'link_two'   => link(self, @action, :one, :two, :three, :title => "#@action/one/two/three"),
-      'link_three' => link(self, @action, :one, :foo => :bar, :title => "#@action?foo=Bar"),
+      'header'     => "The #{place} Template for Liquid",
+      'link_home'  => A('Home', :href => :/),
+      'link_one'   => A("#{place}/one"),
+      'link_two'   => A("#{place}/one/two/three"),
+      'link_three' => A("#{place}?foo=Bar"),
       'args'       => args,
       'args_empty' => args.empty?,
       'params'     => request.params.inspect
@@ -28,7 +28,7 @@ class MainController < Controller
   def internal *args
-    @hash = liquid_hash(*args)
+    @hash = liquid_hash(:internal, *args)
     %q{
 <html>
   <head>
@@ -62,6 +62,6 @@ class MainController < Controller
   end
   def external *args
-    @hash = liquid_hash(*args)
+    @hash = liquid_hash(:external, *args)
   end
 end

data/examples/templates/template_markaby.rb CHANGED

@@ -6,38 +6,40 @@ require 'ramaze'
 include Ramaze
 class MainController < Controller
-  trait :template_root => File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root File.expand_path((File.dirname(__FILE__)/'template'))
   trait :engine => Template::Markaby
   helper :markaby
   def index
-    %{ #{Rlink self.class} | #{Rlink self.class, :internal} | #{Rlink self.class, :external} }
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
   end
   def internal *args
-    mab :action => @action, :args => args, :request => request, :this => self do
+    options = {:place => :internal, :action => 'internal',
+      :args => args, :request => request, :this => self}
+    mab options do
       html do
         head do
-          title "Template::Markaby internal"
+          title "Template::Markaby #@place"
         end
         body do
-          h1 "The #{@action} Template for Markaby"
-          a("Home", :href => R(:/))
+          h1 "The #@place Template for Markaby"
+          a("Home", :href => R(@this))
           p do
             text "Here you can pass some stuff if you like, parameters are just passed like this:"
             br
-            a("external/one", :href => R(@this, @action, :one))
+            a("#@place/one", :href => R(@this, @place, :one))
             br
-            a("external/one/two/three", :href => R(@this, @action, :one, :two, :three))
+            a("#@place/one/two/three", :href => R(@this, @place, :one, :two, :three))
             br
-            a("external/one?foo=bar", :href => R(@this, @action, :one, :foo => :bar))
+            a("#@place/one?foo=bar", :href => R(@this, @place, :one, :foo => :bar))
             br
           end
           div do
             text "The arguments you have passed to this action are:"
             if @args.empty?
-              "none"
+              text "none"
             else
               args.each do |arg|
                 span arg
@@ -53,6 +55,7 @@ class MainController < Controller
   def external *args
     @args = args
     @request = request
+    @place = :external
   end
 end