ramaze 0.1.3 → 0.1.4

data/examples/templates/template_amrita2.rb

@@ -9,7 +9,7 @@ include Ramaze
 #   - implement the amrita2 example, man, this engine is awkward :P
 
 class MainController < Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/:template
   trait :engine => Template::Amrita2
 
   def index

data/examples/templates/template_erubis.rb

@@ -4,7 +4,7 @@
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/:template
   trait :engine => Ramaze::Template::Erubis
 
   def index

data/examples/templates/template_ezamar.rb

@@ -4,7 +4,7 @@
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/:template
 
   def index
     %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }

data/examples/templates/template_haml.rb

@@ -4,7 +4,7 @@
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/:template
   trait :engine => Ramaze::Template::Haml
 
   def index

data/examples/templates/template_liquid.rb

@@ -6,7 +6,7 @@ require 'ramaze'
 include Ramaze
 
 class MainController < Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/:template
   trait :engine => Template::Liquid
 
   def index

data/examples/templates/template_markaby.rb

@@ -6,7 +6,7 @@ require 'ramaze'
 include Ramaze
 
 class MainController < Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/'template'
   trait :engine => Template::Markaby
 
   helper :markaby

data/examples/templates/template_remarkably.rb

@@ -6,7 +6,7 @@ require 'ramaze'
 include Ramaze
 
 class MainController < Controller
-  template_root File.expand_path((File.dirname(__FILE__)/'template'))
+  template_root __DIR__/:template
   trait :engine => Template::Remarkably
 
   include Remarkably::Common

data/examples/todolist/README

@@ -0,0 +1 @@
+A simple ToDo list example that uses Ramaze::Store as the persistence layer.

data/{spec/examples → examples/todolist/spec}/todolist.rb

@@ -1,13 +1,13 @@
-require 'spec/helper'
+require 'ramaze/spec/helper'
 
 testcase_requires 'hpricot'
 
 $:.unshift 'examples/todolist'
-require 'main'
+require 'start'
 
 # fix the paths to template and public for the spec
 class MainController
-  template_root 'examples/todolist/template'
+  template_root __DIR__ / '../template'
 end
 
 describe 'todolist' do

data/examples/wiktacular/README

@@ -0,0 +1,2 @@
+A wiki with page versioning.
+The persistence layer is file-based and shows how to build non-RDBMS-based apps. 

data/examples/wiktacular/spec/wiktacular.rb

@@ -0,0 +1,146 @@
+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 'bluecloth'
+testcase_requires 'hpricot'
+
+$:.unshift 'examples/wiktacular'
+require 'start'
+
+# fix the paths to template and public for the spec
+# this is not needed usually, but this tests are also part of ramaze's suite
+class MainController
+  template_root __DIR__ / '../template'
+end
+
+describe 'wiktacular' do
+  NEWPAGE = "newpagename"
+
+  def check_page(name)
+    page = get('/'+name)
+    page.status.should == 200
+    page.body.should_not be_nil
+
+    doc = Hpricot(page.body)
+    doc.at('title').inner_html.should == 'Wiktacular'
+
+    menu = doc.search('div#menu>a')
+    menu[0].inner_html.should == 'Home'
+    menu[1].inner_html.should == 'New Entry'
+
+    navigation = doc.search('div#navigation>div>a')
+    %w[link main markdown testing].each do |link|
+      navigation.map{|n| n.inner_html }.sort.should include(link)
+    end
+
+    manipulate = doc.search('div#manipulate>a')
+    manipulate.map{|m| m.inner_html }.should ==
+      %w[Edit Delete Revert Unrevert]
+
+    doc
+  end
+
+  it 'should start' do
+    ramaze :public_root => 'examples/wiktacular/public', :port => 7001
+    get('/').status.should == 200
+  end
+
+  it 'should have main page' do
+    check_page('/main')
+  end
+
+  it 'should have link page' do
+    check_page('/link')
+  end
+
+  it 'should have markdown page' do
+    check_page('/markdown')
+  end
+
+  it 'should have testing page' do
+    check_page('/testing')
+  end
+
+
+  it 'should not have foobar page' do
+    doc = check_page('/foobar')
+    doc.at('div#text').inner_html.strip.should == 'No Entry'
+  end 
+
+  it 'should allow page editing' do
+    doc = check_page('/edit/main')
+    form = doc.at('div#content>form')
+    form.at('input[@type=text]')['value'].should == 'main'
+    form.at('textarea').inner_html.should match(/# Hello, World/)
+    form.at('a').inner_html.should == 'cancel'
+    form.at('a')['href'].should == '/main'
+  end
+
+  def edit_page(name, text='new text')
+    page = post('/save','handle'=>name,'text'=>text) 
+    page.status.should == 303
+    page.location.should == '/index/'+name
+  end
+  
+  def delete_page(name)
+    page = get('/delete/'+name)
+    page.status.should == 303
+    page.location.should == '/'
+  end
+
+  def revert_page(name)
+    page = get('/revert/'+name)
+    page.status.should == 303
+    page.location.should == '/'+name
+  end
+
+  def unrevert_page(name)
+    page = get('/revert/'+name)
+    page.status.should == 303
+    page.location.should == '/'+name
+  end
+
+  it 'editing should create page' do
+    edit_page(NEWPAGE, 'new text')
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>new text</p>'
+    delete_page(NEWPAGE)
+  end
+
+  it 'editing should modify page' do
+    edit_page(NEWPAGE, 'text text')
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>text text</p>'
+    edit_page(NEWPAGE,'some other text')
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>some other text</p>'
+    delete_page(NEWPAGE)
+  end
+
+  it "should be possible to revert changes" do
+    edit_page(NEWPAGE, 'first text')
+    edit_page(NEWPAGE, 'second text')
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>second text</p>'
+    revert_page(NEWPAGE)
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>first text</p>'
+  end
+
+  it "should be possible to unrevert changes" do
+    edit_page(NEWPAGE, 'first text')
+    edit_page(NEWPAGE, 'second text')
+    revert_page(NEWPAGE)
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>first text</p>'
+    unrevert_page(NEWPAGE)
+    doc = check_page(NEWPAGE)
+    doc.at('div#text').inner_html.strip.should == '<p>first text</p>'
+  end
+
+  after do
+    WikiEntry.new(NEWPAGE).delete
+  end
+
+end

data/examples/wiktacular/src/controller.rb

@@ -1,4 +1,6 @@
 class MainController < Ramaze::Controller
+  
+
   def index handle = "main"
     @handle = handle
     @entry = WikiEntry.new(handle)
@@ -41,4 +43,13 @@ class MainController < Ramaze::Controller
     entry.save(request['text'])
     redirect Rs(:index, handle)
   end
+
+  def html_layout
+    @nodes = WikiEntry.titles.map{|f|
+        name = File.basename(f)
+        %[<a href="/#{name}">#{name}</a>]
+      }.join("\n")
+  end
+
+  layout :html_layout
 end

data/examples/wiktacular/src/model.rb

@@ -2,10 +2,14 @@ require 'fileutils'
 require 'cgi'
 
 class WikiEntry
+  ENTRIES_DIR = __DIR__/'../mkd'
   class << self
     def [](name)
       new(name)
     end
+    def titles
+      Dir[ENTRIES_DIR/'*'].entries
+    end
   end
 
   attr_reader :history, :current, :name
@@ -58,7 +62,7 @@ class WikiEntry
   end
 
   def base
-    "mkd/#@name"
+    ENTRIES_DIR/@name
   end
 
   def content

data/examples/wiktacular/{main.rb → start.rb}

@@ -1,7 +1,6 @@
 require 'ramaze'
 require 'bluecloth'
 
-require 'src/page'
 require 'src/model'
 require 'src/controller'
 

data/examples/wiktacular/template/edit.xhtml

@@ -1,7 +1,6 @@
-<Page>
 <form method="POST" action="/save" id="edit_entry">
   <input type="text" name="handle" value="#@handle" />
   <textarea name="text">#@text</textarea>
   <input type="submit" />
+  or #{A('cancel', :href=>Rs(@handle))}
 </form>
-</Page>

data/examples/wiktacular/template/html_layout.xhtml

@@ -0,0 +1,27 @@
+<html>
+  <head>
+    <title>Wiktacular</title>
+    <link rel="stylesheet" type="text/css" media="screen" href="/screen.css" />
+  </head>
+  <body>
+    <div id="menu">
+      <a href="/main">Home</a>
+      <a href="/new">New Entry</a>
+    </div>
+  <div id="navigation">
+    <div id="nodes">
+      #@nodes
+    </div>
+  </div>
+    <div id="manipulate">
+      <a href="/edit/#@handle">Edit</a>
+      <a href="/delete/#@handle">Delete</a>
+      <a href="/revert/#@handle">Revert</a>
+      <a href="/unrevert/#@handle">Unrevert</a>
+    </div>
+    <div id="content">
+      #@content
+    </div>
+    <div id="copyright">Wiktacular is powered by <a href="http://ramaze.rubyforge.org/">Ramaze</a></div>
+  </body>
+</html>

data/examples/wiktacular/template/index.xhtml

@@ -1,11 +1,9 @@
-<Page>
-  <div id="text">
-    #@text
+<div id="text">
+  #@text
+</div>
+<?r if @history ?>
+  <div id="history">
+    History of this entry:<br />
+    #@history
   </div>
-  <?r if @history ?>
-    <div id="history">
-      History of this entry:<br />
-      #@history
-    </div>
-  <?r end ?>
-</Page>
+<?r end ?>

data/examples/wiktacular/template/new.xhtml

@@ -1,7 +1,6 @@
-<Page>
 <form method="POST" action="/save" id="new_entry">
   <input type="text" name="handle" />
   <textarea name="text"></textarea>
   <input type="submit" />
+  or #{A('cancel',:href=>'/')}
 </form>
-</Page>

data/lib/proto/template/index.xhtml

@@ -1,6 +1,6 @@
 <Page>
   <h1>#{@welcome}</h1>
-  <p>Ramaze is working correctly with this application, now you can start working</p
+  <p>Ramaze is working correctly with this application, now you can start working</p>
 
   <p>
     To start you can modify:

data/lib/ramaze/action/render.rb

@@ -28,6 +28,28 @@ module Ramaze
     # true.
 
     def cached_render
+      if Global.file_cache
+        cached_render_file
+      else
+        cached_render_memory
+      end
+    end
+
+    def cached_render_file
+      rendered = uncached_render
+
+      global_epath = Global.public_root/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) }
+
+      rendered
+    end
+
+    def cached_render_memory
       action_cache = Cache.actions
 
       if out = action_cache[relaxed_hash]
@@ -41,12 +63,44 @@ module Ramaze
 
     # The 'normal' rendering process. Passes the Action instance to
     # Action#engine.transform, which returns the output of the action.
+    # Layout will be found and rendered in this step after self was rendered.
 
     def uncached_render
-      [ before_process,
-        engine.transform(self),
-        after_process,
-      ].join
+      bp = before_process
+      content = engine.transform(self)
+      ap = after_process
+
+      if tlayout = layout
+        instance.instance_variable_set("@content", content)
+        content = tlayout.render
+        Thread.current[:action] = self
+      end
+      [bp, content, ap].join
+    end
+
+    # Determine whether or not we have a layout to process and sets it up
+    # correctly to be rendered in the same context as current action.
+    # Will return false if the layout is the same as current action to avoid
+    # infinite recursion and also if no layout on this controller was found.
+
+    def layout
+      return false unless layouts = controller.trait[:layout]
+
+      possible = [layouts[:all], layouts[path]].compact
+      denied = layouts[:deny].to_a
+
+      if layout = possible.first
+        layout_action = Ramaze::Controller.resolve(layout)
+
+        if denied.include?(path) or layout_action.path == path
+          return false
+        end
+
+        layout_action.binding = binding
+        layout_action.controller = controller
+        layout_action.instance = instance
+        layout_action
+      end
     end
 
     # return true if the action is flagged for caching. Called by