Pistos-ramaze 2009.02 → 2009.04.08

data/examples/app/sourceview/{sourceview.rb → start.rb}

@@ -4,19 +4,11 @@ require 'coderay'
 require 'ramaze'
 
 # where is the source
-RAMAZE_SRC = File.expand_path(Ramaze::BASEDIR/'../') unless defined? RAMAZE_SRC
-
-# delete cached filetree when source changes
-module Ramaze::SourceReloadHooks
-  module_function
-  def after_safe_load file
-    Ramaze::Cache.actions.clear
-  end
-end
-
 class MainController < Ramaze::Controller
+  SOURCE_PATH = File.expand_path(File.join(Ramaze::ROOT, '../'))
 
   include Remarkably::Common
+
   helper :cache, :aspect
   engine :None
 
@@ -28,47 +20,57 @@ class MainController < Ramaze::Controller
     file = args.join('/')
     return if file.empty? or file =~ /\.{2}/
 
-    file[0,0] = RAMAZE_SRC + '/'
-    CodeRay.scan_file(file).html(:line_numbers => :table) if FileTest.file? file
+    file[0,0] = SOURCE_PATH + '/'
+    CodeRay.scan_file(file).html(:line_numbers => :table) if File.file?(file)
   end
-  before(:source){ %(<link href='/coderay.css' rel='stylesheet' type='text/css' />) unless request.xhr? }
+
+  before(:source){
+    %(<link href='/coderay.css' rel='stylesheet' type='text/css' />) unless request.xhr?
+  }
 
   def filetree
-    ul :class => 'filetree treeview' do
-      Dir.chdir(RAMAZE_SRC) do
-        Dir['{benchmarks,doc,examples,lib,spec}'].collect do |d|
-          dir_listing d
-        end
+    ul(:class => 'filetree treeview'){
+      Dir.chdir(SOURCE_PATH) do
+        Dir['{benchmarks,doc,examples,lib,spec}'].map{|d| dir_listing(d) }
       end
-    end.to_s
+    }.to_s
   end
   cache :filetree
 
   private
 
-  def dir_listing dir
-    li do
-      span dir, :class => 'folder'
+  def dir_listing(dir)
+    li{
+      span(dir, :class => 'folder')
+
       Dir.chdir(dir) do
-        ul :style => 'display: none;' do
-          a '', :href => "##{File.expand_path('.').sub(RAMAZE_SRC,'')}"
+        ul(:style => 'display: none;'){
+          a('', :href => "##{File.expand_path('.').sub(SOURCE_PATH, '')}")
+
           Dir['*'].sort.each do |d|
-            if FileTest.directory? d
-              dir_listing d
+            if File.directory?(d)
+              dir_listing(d)
             else
-              file = File.expand_path(d).sub(RAMAZE_SRC,'')
-              li do
-                span :class => 'file' do
-                  a d, :href => "##{file}"
-                end
-              end
+              file = File.expand_path(d).sub(SOURCE_PATH, '')
+              li{
+                span(:class => 'file'){
+                  a(d, :href => "##{file}")
+                }
+              }
             end
           end
-        end if Dir['*'].any?
+        } if Dir['*'].any?
       end
-    end
+    }
   end
+end
 
+# delete cached filetree when source changes
+module Ramaze::SourceReloadHooks
+  module_function
+  def after_safe_load file
+    Ramaze::Cache.actions.clear
+  end
 end
 
 Ramaze.start :adapter      => :mongrel,

data/examples/app/todolist/controller/init.rb

@@ -0,0 +1,10 @@
+module TodoList
+  class Controller < Ramaze::Controller
+    layout :default
+    engine :Etanni
+    helper :form
+    trait :app => :todolist
+  end
+end
+
+require 'controller/task'

data/examples/app/todolist/controller/task.rb

@@ -0,0 +1,39 @@
+module TodoList
+  class Tasks < Controller
+    map '/'
+
+    def index
+      @tasks = Task.all
+      @title = request[:title]
+    end
+
+    def create
+      if request.post? and title = request[:title]
+        title.strip!
+
+        unless title.empty?
+          Task.create :title => title
+        end
+      end
+
+      redirect route('/', :title => title)
+    rescue Sequel::DatabaseError => ex
+      redirect route('/', :title => title)
+    end
+
+    def open(title)
+      Task[:title => title].open!
+      redirect r('/')
+    end
+
+    def close(title)
+      Task[:title => title].close!
+      redirect r('/')
+    end
+
+    def delete(title)
+      Task[:title => title].destroy
+      redirect r('/')
+    end
+  end
+end

data/examples/app/todolist/layout/default.xhtml

@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+  <head>
+    <title>TodoList</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <link rel="stylesheet" type="text/css" href="/css/screen.css" />
+  </head>
+  <body>
+    <h1>TodoList</h1>
+    <div class="content">
+      #{@content}
+    </div>
+  </body>
+</html>

data/examples/app/todolist/model/init.rb

@@ -0,0 +1,14 @@
+module TodoList
+  # yeah, we're lazy
+  Sequel::Model.plugin(:schema)
+
+  # Uncomment the line for the DB you want to use.
+
+  # Sqlite In memory, fastest, but cannot persist over restarts.
+  DB = Sequel.sqlite
+
+  # Sqlite on disk
+  # DB = Sequel.sqlite(__DIR__('../todolist.sqlite'))
+end
+
+require 'model/task'

data/examples/app/todolist/model/task.rb

@@ -0,0 +1,39 @@
+module TodoList
+  class Task < Sequel::Model
+    set_schema do
+      primary_key :id
+
+      varchar :title, :unique => true, :empty => false
+      boolean :done, :default => false
+    end
+
+    create_table unless table_exists?
+
+    def href(action)
+      Tasks.r(action, Ramaze::Helper::CGI.url_encode(title))
+    end
+
+    def toggle_link
+      action = done ? 'open' : 'close'
+      Tasks.a(action, href(action))
+    end
+
+    def delete_link
+      Tasks.a('delete', href('delete'))
+    end
+
+    def status
+      done ? 'done' : 'pending'
+    end
+
+    def close!
+      self.done = true
+      save
+    end
+
+    def open!
+      self.done = false
+      save
+    end
+  end
+end

data/examples/app/todolist/public/css/screen.css

@@ -0,0 +1,63 @@
+h1 {
+  text-align: center;
+  color: #33f;
+}
+
+th {
+  color: #33f;
+}
+
+fieldset {
+  border: 0;
+  width: 21em;
+  margin: auto;
+  padding: 1em;
+  margin-bottom: 2em;
+}
+
+fieldset legend {
+  color: #33f;
+}
+
+table {
+  width: 50em;
+  border: 2px solid #eef;
+  margin: auto;
+}
+
+table caption {
+  color: #33f;
+}
+
+tr.done {
+  background: #efe;
+}
+
+tr.pending {
+  background: #fee;
+}
+
+tr:hover {
+  background: #eef;
+}
+
+td {
+  width: 5em;
+}
+
+td.title {
+  font-weight: bold;
+  width: auto;
+}
+
+td a {
+  display: block;
+}
+
+td.toggle a {
+  color: #3a3;
+}
+
+td.delete a {
+  color: #f00;
+}

data/examples/app/todolist/start.rb

@@ -1,11 +1,11 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
-
 require 'rubygems'
 require 'ramaze'
 
-require 'src/controller/main'
-require 'src/element/page'
-require 'src/model'
+Ramaze.setup do
+  gem 'sequel'
+end
+
+require 'controller/init'
+require 'model/init'
 
 Ramaze.start

data/examples/app/todolist/view/index.xhtml

@@ -0,0 +1,29 @@
+<form method="post" action="#{r 'create'}">
+  <fieldset>
+    <legend>Add a task by entering a title.</legend>
+    <label for="form-title">Task title:</label>
+    <input id="form-title" name="title" type="text" value="#{@title}" />
+    <input type="submit" value="Create" />
+  </fieldset>
+</form>
+
+#{flashbox}
+
+<?r if @tasks.empty? ?>
+  No Tasks
+<?r else ?>
+  <table summary="tasks in the todolist">
+    <caption>
+      All pending and closed tasks, in order of creation.
+    </caption>
+    <tr><th>Title</th><th>Status</th><th>Toggle</th><th>Delete</th></tr>
+    <?r @tasks.each do |task| ?>
+      <tr class="#{task.status}">
+        <td class="title">  #{h task.title}  </td>
+        <td class="status"> #{task.status.capitalize} </td>
+        <td class="toggle"> #{task.toggle_link} </td>
+        <td class="delete"> #{task.delete_link} </td>
+      </tr>
+    <?r end ?>
+  </table>
+<?r end ?>

data/examples/basic/element.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'ramaze'
+require 'nagoro'
 
-class Page < Ezamar::Element
+class Page < Nagoro::Element
   def render
     %{
      <html>
@@ -17,7 +18,7 @@ class Page < Ezamar::Element
   end
 end
 
-class SideBar < Ezamar::Element
+class SideBar < Nagoro::Element
   def render
     %{
      <div class="sidebar">
@@ -29,6 +30,7 @@ end
 
 class MainController < Ramaze::Controller
   map '/'
+  engine :Nagoro
 
   def index
     %{
@@ -42,4 +44,4 @@ class MainController < Ramaze::Controller
   end
 end
 
-Ramaze.start
+Ramaze.start

data/examples/basic/gestalt.rb

@@ -1,5 +1,4 @@
 require 'ramaze'
-require 'ramaze/gestalt'
 
 class MainController < Ramaze::Controller
   helper :gestalt
@@ -24,4 +23,4 @@ class MainController < Ramaze::Controller
   end
 end
 
-Ramaze.start :adapter => :mongrel
+Ramaze.start

data/examples/basic/hello.rb

@@ -1,10 +1,9 @@
 require 'rubygems'
 require 'ramaze'
 
-# you can access it now with http://localhost:7000/
-# This should output
-# Hello, World!
-# in your browser
+# Start this example with `ruby hello.rb`.
+# After startup you will be able to access it at http://localhost:7000/
+# This should output "Hello, World!" in your browser.
 
 class MainController < Ramaze::Controller
   def index

data/examples/basic/layout.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  map '/'
   layout :page
+  provide :html => :nagoro
 
   def index
     @title = "Test"
@@ -11,7 +11,7 @@ class MainController < Ramaze::Controller
   end
 
   def page
-    %{
+    %q{
 <html>
   <head>
     <title>examples/layout</title>

data/examples/basic/linking.rb

@@ -5,25 +5,25 @@ class LinkingController < Ramaze::Controller
   map '/'
 
   def index
-    %{simple link <br/> <a href="#{Rs(:help)}">Help?</a>}
+    %{simple link <br/> <a href="#{r(:help)}">Help?</a>}
   end
-  
+
   def new
     "something new!"
   end
-  
+
   def help
-    %{you have help <br/> <a href="#{R(LinkToController, :another)}">A Different Controller</a>}
+    %{you have help <br/> <a href="#{LinkToController.r(:another)}">A Different Controller</a>}
   end
 
 end
 
 class LinkToController < Ramaze::Controller
   map '/link_to'
-  
+
   def another
-    %{<a href="#{R(LinkingController, :index)}">Back to Original Controller</a>}
+    %{<a href="#{LinkingController.r(:index)}">Back to Original Controller</a>}
   end
 end
 
-Ramaze.start :adapter => :mongrel
+Ramaze.start

data/examples/basic/partial.rb

@@ -2,15 +2,13 @@ require 'rubygems'
 require 'ramaze'
 
 # This is a small extension to the hello world example, showing how to use the
-# <render> tag of Ezamar.
+# <render> tag of Nagoro.
 #
 # Browse to /more and /even_more
 
-pipeline = Ramaze::Template::Ezamar::TRANSFORM_PIPELINE
-pipeline.put_after(::Ezamar::Element, ::Ezamar::RenderPartial)
-pipeline.uniq!
-
 class MainController < Ramaze::Controller
+  provide :html => :nagoro
+
   def index
     "Hello, World!"
   end

data/examples/basic/simple.rb

@@ -24,10 +24,6 @@ class SimpleController < Ramaze::Controller
     "simple"
   end
 
-  def simple
-    request.inspect
-  end
-
   def join(first, second)
     [first, second].join
   end
@@ -37,7 +33,7 @@ class SimpleController < Ramaze::Controller
   end
 
   def sum first, second
-    first.to_i + second.to_i
+    "#{first.to_i + second.to_i}"
   end
 
   def post_or_get

data/examples/helpers/cache.rb

@@ -2,10 +2,8 @@ require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  map :/
-
+  map '/'
   helper :cache
-  cache :index
 
   def index
 %[
@@ -22,10 +20,12 @@ class MainController < Ramaze::Controller
 ]
   end
 
+  cache_action :method => :index
+
   def invalidate
-    action_cache.delete '/index'
+    Ramaze::Cache.action.delete(:method => 'index')
     redirect :/
   end
 end
 
-Ramaze.start
+Ramaze.start

data/examples/helpers/httpdigest.rb

@@ -4,93 +4,93 @@ require 'ramaze'
 REALM = 'ramaze authentication required'
 
 class MainController < Ramaze::Controller
-
   helper :httpdigest
 
   def index
     %|
-    <p><a href="#{Rs(:eyes_only)}">eyes only</a></p>
-    <p><a href="#{R(SecretController,'/')}">secret area</a></p>
-    <p><a href="#{R(GuestController,'/')}">guest area</a> username is <em>guest</em> password is <em>access</em></p>
-     | 
+<p>#{a('eyes only', :eyes_only)}</p>
+<p>#{SecretController.a('secret area', '/')}</p>
+<p>#{GuestController.a('guest area', '/')} username is <em>guest</em> password is <em>access</em></p>
+     |
   end
 
   def eyes_only
-    httpdigest('eyes only',REALM) do |username|
+    httpdigest('eyes only', REALM) do |username|
       password = username.reverse
-      MD5.hexdigest([username,REALM,password].join(':'))
+      Digest::MD5.hexdigest([username, REALM, password].join(':'))
     end
     "Shhhh don't tell anyone"
   end
 
+  def logout
+    httpdigest_logout
+    redirect_referer
+  end
 end
 
 class LoginController < Ramaze::Controller
   map '/login'
-
   helper :httpdigest
 
   def index
      @username ||= session[:username]
-     @username ||= httpdigest('login area',REALM)
+     @username ||= httpdigest('login area', REALM)
     "Hi there #@username!"
   end
 
   def login
-    %|<form action="#{Rs(:post)}" method="post"><input type="text" name="username"/><input type="password" name="password"/><input type="submit"/></form>|
+    %|
+<form action="#{Rs(:post)}" method="post">
+  <input type="text" name="username" />
+  <input type="password" name="password" />
+  <input type="submit" />
+</form>
+    |
   end
 
   def post
-    username = request.params["username"]
-    password = request.params["password"]
-    if password == "entry"
-      session[:username] = username
-      destination = session[ :redirect_after_login ]
-      session.delete( :redirect_after_login )
-      redirect destination
-    end
-    redirect Rs(:login)
+    username, password = request[:username, :password]
+
+    redirect r(:login) unless password == "entry"
+
+    session[:username] = username
+    answer(r(:index))
   end
 
-  protected
+  private
 
   def httpdigest_failure
-    session[ :redirect_after_login ] = Rs(Ramaze::Action.current.method)
-    redirect Rs(:login)
+    call(r(:login))
   end
-
 end
 
 class SecretController < Ramaze::Controller
   map '/secret'
-  helper :aspect
   helper :httpdigest
 
   USERS = { 'admin' => 'secret', 'root' => 'password' }
 
   before_all do
-    @username = httpdigest('secret area',REALM)
+    @username = httpdigest('secret area', REALM)
   end
 
   def index
-    "Hello <em>#@username</em>, welcome to SECRET world"
+    "Hello <em>#@username</em>, welcome to SECRET world."
   end
 
   protected
 
-  def httpdigest_lookup_plaintext_password username
+  def httpdigest_lookup_plaintext_password(username)
     USERS[ username ]
   end
-
 end
 
 class GuestController < Ramaze::Controller
   map '/guest'
-  helper :aspect
   helper :httpdigest
 
   before_all do
-    @username = httpdigest('guest area',REALM)
+    @username = httpdigest('guest area', REALM)
   end
 
   def index
@@ -99,10 +99,9 @@ class GuestController < Ramaze::Controller
 
   protected
 
-  def httpdigest_lookup_password username
+  def httpdigest_lookup_password(username)
     return "b71f15b2f6dd4834224fbe02169ed94c" if username == "guest"
   end
-
 end
 
 Ramaze.start