ramaze 2008.06 → 2008.11

data/doc/tutorial/todolist.mkd

@@ -1,6 +1,6 @@
 Title: The official Ramaze todolist tutorial
-HTML use syntax: true
-
+html_use_syntax: true
+uv_style: iplastic
 
 # To-do List Tutorial
 
@@ -46,7 +46,8 @@ to-do list.
 
 So run:
 
-    $ ramaze --create todolist
+    ramaze --create todolist
+{:lang=shell-unix-generic}
 
 done.
 
@@ -59,7 +60,7 @@ with your ORM or database-library of choice.
 
 So first, create a `model/todolist.rb` for our application:
 
-	require 'ramaze/store/default'
+    require 'ramaze/store/default'
     TodoList = Ramaze::Store::Default.new('todolist.yaml')
 {:lang=ruby}
 
@@ -95,12 +96,12 @@ simple.
             TodoList.each do |title, value|
               status = value[:done] ? 'done' : 'not done'
             ?>
-            <li>#{c title}: #{status}</li>
+            <li>#{h title}: #{status}</li>
           <?r end ?>
         </ul>
       </body>
     </html>
-{:lang=nagoro}
+{:lang=html}
 
 I will assume that you are familiar with basic Ruby already, so we will
 concentrate on the things new here.
@@ -118,7 +119,7 @@ interesting part)
       <li>Laundry: not done</li>
       <li>Wash dishes: not done</li>
     </ul>
-{:lang=nagoro}
+{:lang=html}
 
 That wasn't too bad, huh?
 
@@ -196,13 +197,13 @@ changed to do following:
         <?r else ?>
           <ul>
             <?r @tasks.each do |title, status| ?>
-              <li>#{c title}: #{status}</li>
+              <li>#{h title}: #{status}</li>
             <?r end ?>
           </ul>
         <?r end ?>
       </body>
     </html>
-{:lang=ruby}
+{:lang=ezamar}
 
 The rest of the template can stay the same.
 
@@ -224,6 +225,7 @@ Add a link on the `view/index.xhtml` like this:
 
     <h1>TodoList</h1>
     <a href="/new">New Task</a>
+{:lang=ezamar}
 
 Open a new file `view/new.xhtml` with a form to add a new task.
 
@@ -240,6 +242,7 @@ Open a new file `view/new.xhtml` with a form to add a new task.
         </form>
       </body>
     </html>
+{:lang=ezamar}
 
 We will not need a method for this on our controller, in fact, actions can
 consist of either method and template or only one of them. The Controller
@@ -285,10 +288,10 @@ Jump into `view/index.xhtml` and do the following:
 
     <?r @tasks.each do |title, status, toggle| ?>
       <li>
-        #{c title}: #{status} - [ #{toggle} ]
+        #{h title}: #{status} - [ #{toggle} ]
       </li>
     <?r end
-{:lang=ruby}
+{:lang=ezamar}
 
 We added a new element here, `toggle`, the Controller should give us
 a link to change the status corresponding to the status of the task, so off
@@ -317,6 +320,7 @@ toggle the status, A and Rs are both methods that help you do that.
 The result will be something like:
 
     <a href="/open/Wash+dishes">Close Task</a>
+{:lang=ezamar}
 
 Rs actually is responsible to build the links href, for more information please
 take a look at the RDoc for LinkHelper.
@@ -364,7 +368,10 @@ will translate into:
     open('Wash dishes')
 {:lang=ruby}
 
-Which in turn will call `task_status('Wash dishes', false)`
+Which in turn will call 
+
+    task_status('Wash dishes', false)
+{:lang=ruby}
 
 That's it, go on and try it :)
 
@@ -393,9 +400,10 @@ Now jumping to `view/index.xhtml` again, change it so it shows the link:
 
     <?r @tasks.each do |title, status, toggle, delete| ?>
       <li>
-        #{c title}: #{status} [ #{toggle} | #{delete} ]
+        #{h title}: #{status} [ #{toggle} | #{delete} ]
       </li>
     <?r end ?>
+{:lang=ezamar}
 
 Voilà, you now have acquired the Certificate of Ramazeness.
 
@@ -406,6 +414,7 @@ explain some more advanced concepts of Ramaze and Ezamar.
 ## Eighth Step, Elements
 
     <Page></Page>
+{:lang=ezamar}
 
 This is called an Element, Ramaze will go and search for a class that matches
 the name Page and responds to `#render`. Then it will go and hand the content in
@@ -423,12 +432,14 @@ Let us have a look at our templates, they got some repetitive stuff, like:
         <h1>some title</h1>
       </body>
     </html>
+{:lang=ezamar}
 
 How about replacing that with something short and reusable:
 
     <Page title="TodoList">
       your other content
     </Page>
+{:lang=html}
 
 Would be nice of course, and when you start having more templates it makes an
 awful lot of sense being able to change the enclosing stuff in one place.
@@ -491,12 +502,13 @@ First the `view/index.xhtml`
         <ul>
           <?r @tasks.each do |title, status, toggle, delete| ?>
             <li>
-              #{c title}: #{status} [ #{toggle} | #{delete} ]
+              #{h title}: #{status} [ #{toggle} | #{delete} ]
             </li>
           <?r end ?>
         </ul>
       <?r end ?>
     </Page>
+{:lang=ezamar}
 
 and the `view/new.xhtml`
 
@@ -507,6 +519,7 @@ and the `view/new.xhtml`
         <input type="submit" />
       </form>
     </Page>
+{:lang=ezamar}
 
 Alright, now just go and look at the result in the browser, try changing
 the things inside the Element and look at how it behaves.
@@ -522,23 +535,25 @@ So, from what we have right now:
     <ul>
       <?r @tasks.each do |title, status, toggle, delete| ?>
         <li>
-          #{c title}: #{status} [ #{toggle} | #{delete} ]
+          #{h title}: #{status} [ #{toggle} | #{delete} ]
         </li>
       <?r end ?>
     </ul>
+{:lang=ezamar}
 
 To something like this:
 
     <table>
       <?r @tasks.each do |title, status, toggle, delete| ?>
         <tr>
-          <td class="title">  #{c title}  </td>
+          <td class="title">  #{h title}  </td>
           <td class="status"> #{status} </td>
           <td class="toggle"> #{toggle} </td>
           <td class="delete"> #{delete} </td>
         </tr>
       <?r end ?>
     </table>
+{:lang=ezamar}
 
 And, since we have proper classes to address some style sheets, jump into the
 Page element and add some style sheet:
@@ -554,6 +569,7 @@ Page element and add some style sheet:
         a         { color:       #3a3;              }
       </style>
     </head>
+{:lang=ezamar}
 
 That looks quite a bit nicer, right?  And yes, if you don't like tables (though
 this is an entirely legit use in my opinion) you can just do it like you want,
@@ -759,6 +775,7 @@ and add in the right place:
       <?r end ?>
       #{content}
     </body>
+{:lang=ezamar}
 
 The only thing special about it is the `\\#{flash[:error]}`, we have to escape
 the `#` so it won't evaluate this immediately but wait until it is really

data/examples/app/blog/spec/blog.rb

@@ -31,7 +31,7 @@ describe 'Blog' do
 
   def create_page(title,content)
     page = post('/create','title'=>title,'content'=>content)
-    page.status.should == 303
+    page.status.should == 302
     page.location.should == '/'
   end
 
@@ -48,7 +48,7 @@ describe 'Blog' do
     form.at('textarea').inner_html.should == ''
     form.at('input[@type=submit]')['value'].should == 'Add Entry'
   end
-  
+
   it 'should add new pages' do
     create_page('new page', 'cool! a new page')
     doc = check_page
@@ -78,7 +78,7 @@ describe 'Blog' do
     entries.size.should == 2
     delete_link = entries.last.at("a:contains('delete')")
     page = get(delete_link[:href])
-    page.status.should == 303
+    page.status.should == 302
     page.location.should == '/'
     (check_page/'div.entry').size.should == 1
   end

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

@@ -1,4 +1,5 @@
 Ramaze::Route[%r!^/(\d+)\.(?:te?xt|plain|rb|css|js)$!] = '/plain/%d'
+Ramaze::Route[%r!^/(\d+)\.(?:html)$!] = '/html/%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'
@@ -63,7 +64,13 @@ class PasteController < Ramaze::Controller
     response['Content-Type'] = 'text/plain'
     respond paste.text
   end
-    
+
+  def html(id)
+    paste = paste_for(id)
+    response['Content-Type'] = 'text/html'
+    respond paste.text
+  end
+
   def save_theme( theme_name )
     session[ :theme ] = theme_name
   end

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

@@ -27,6 +27,9 @@ class Paste < Sequel::Model(:paste)
 
   def uv(text, style = STYLE, lines = true)
     Uv.parse(text, "xhtml", syntax, lines, style)
+  rescue ArgumentError => ex
+    Ramaze::Log::error(ex)
+    "<pre>#{text}</pre>"
   end
 
   def syntax_name

data/examples/app/rapaste/spec/rapaste.rb

@@ -33,7 +33,7 @@ describe 'RaPaste' do
 
   it 'should create a new paste' do
     page = post('/save', 'syntax' => 'plain_text', 'text' => 'spec paste')
-    page.status.should == 303
+    page.status.should == 302
     page.original_headers['Location'].should == '/1'
   end
 
@@ -46,4 +46,6 @@ describe 'RaPaste' do
     page = get('/1')
     (Hpricot(page.body)/'div#paste_body').inner_text.should =~ /spec paste/
   end
+
+  FileUtils.rm_f(DB_FILE)
 end

data/examples/app/rapaste/start.rb

@@ -16,9 +16,10 @@ STYLE = 'iplastic'
 
 Ramaze::Log.debug "done."
 
-DB = Sequel.sqlite
+DB_FILE = "#{__DIR__}/rapaste.sqlite" # for specs
+DB = Sequel.connect("sqlite://#{DB_FILE}")
 
 require 'model/paste'
 require 'controller/paste'
 
-Ramaze.start
+Ramaze.start :adapter => :mongrel, :port => 9952

data/examples/app/sourceview/public/sourceview.js

@@ -22,7 +22,7 @@ function setup() {
 
     if (curfile) {
       $('#repourl').empty().append(
-        $('<a/>').attr('href', 'http://darcs.ramaze.net/ramaze'+curfile)
+        $('<a/>').attr('href', 'http://github.com/manveru/ramaze/tree/master'+curfile)
                  .text('download '+curfile.substr(1))
       );
       urchinTracker(curfile);
@@ -49,4 +49,4 @@ $(function(){
   } else {
     setup();
   }
-});
+});

data/examples/app/todolist/spec/todolist.rb

@@ -82,7 +82,7 @@ describe 'todolist' do
 
   it 'should POST new task and redirect to /' do
     result = post('/create', 'title' => 'spectask')
-    result.status.should == 303
+    result.status.should == 302
   end
 
   it 'should show have the new task' do
@@ -90,10 +90,10 @@ describe 'todolist' do
   end
 
   it 'should toggle the spectask' do
-    get('/close/spectask').status.should == 303
+    get('/close/spectask').status.should == 302
     spectask.should.not == nil
     spectask_status.should == 'done'
-    get('/open/spectask').status.should == 303
+    get('/open/spectask').status.should == 302
     spectask.should.not == nil
     spectask_status.should == 'not done'
   end
@@ -101,21 +101,21 @@ describe 'todolist' do
   it 'should raise on modifying a not existing task' do
     %w[open close].each do |action|
       response = get("/#{action}/nothere", :referrer => "/")
-      response.status.should == 303
+      response.status.should == 302
       response.original_headers['Location'].should == '/'
       error_on_page('/', response).should == "No such Task: `nothere'"
     end
   end
 
   it 'should delete the new task' do
-    get('/delete/spectask').status.should == 303
+    get('/delete/spectask').status.should == 302
     task_titles.should.not.include('spectask')
   end
 
   it 'should not create empty tasks but show a subtle error message' do
     response = post('/create', 'title' => '', :referrer => "/new")
 
-    response.status.should == 303
+    response.status.should == 302
     response.original_headers['Location'].should == '/new'
 
     error_on_page('/new', response).should == 'Please enter a title'

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

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

data/examples/app/whywiki/spec/whywiki.rb

@@ -26,7 +26,7 @@ describe 'WikiController' do
   it 'should start' do
     ramaze :public_root => base/:public,
            :view_root   => base/:template
-    get('/').status.should == 303
+    get('/').status.should == 302
   end
 
   it 'should have main page' do
@@ -46,7 +46,7 @@ describe 'WikiController' do
   end
 
   it 'should create pages' do
-    post('/save','text'=>'the text','page'=>'ThePage').status.should == 303
+    post('/save','text'=>'the text','page'=>'ThePage').status.should == 302
     page = Hpricot(get('/show/ThePage').body)
     body = page.at('body>div')
     body.should.not == nil

data/examples/app/wikore/spec/wikore.rb

@@ -13,7 +13,7 @@ describe 'Wikore' do
 
   def check_redirect(to = '/')
     response = yield
-    response.status.should == 303
+    response.status.should == 302
     response.body.should =~ /<a href="#{to}">/
   end
 
@@ -107,5 +107,5 @@ describe 'Wikore' do
     end
   end
 
-  FileUtils.rm('wikore.db')
+  FileUtils.rm_f(DB_FILE)
 end

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

@@ -5,7 +5,8 @@ begin
   when :memory
     DB = Sequel.sqlite
   else
-    DB = Sequel.sqlite 'wikore.db'
+    DB_FILE = __DIR__/'wikore.db'
+    DB = Sequel.connect("sqlite://#{DB_FILE}")
   end
 rescue NoMethodError
   raise LoadError, 'Install latest Sequel gem'
@@ -21,7 +22,7 @@ module Model
 
   class Page < Sequel::Model(:page)
     set_schema do
-      instance_eval &PAGE_SCHEMA
+      instance_eval(&PAGE_SCHEMA)
       text :title, :unique => true, :null => false
     end
 
@@ -41,7 +42,7 @@ module Model
 
   class OldPage < Sequel::Model(:old_page)
     set_schema do
-      instance_eval &PAGE_SCHEMA
+      instance_eval(&PAGE_SCHEMA)
       text :title, :unique => false, :null => false
     end
   end

data/examples/app/wiktacular/spec/wiktacular.rb

@@ -60,7 +60,7 @@ describe 'wiktacular' do
   it 'should not have foobar page' do
     doc = check_page('/foobar')
     doc.at('div#text').inner_html.strip.should == 'No Entry'
-  end 
+  end
 
   it 'should allow page editing' do
     doc = check_page('/edit/main')
@@ -72,26 +72,26 @@ describe 'wiktacular' do
   end
 
   def edit_page(name, text='new text')
-    page = post('/save','handle'=>name,'text'=>text) 
-    page.status.should == 303
+    page = post('/save','handle'=>name,'text'=>text)
+    page.status.should == 302
     page.location.should == '/index/'+name
   end
-  
+
   def delete_page(name)
     page = get('/delete/'+name)
-    page.status.should == 303
+    page.status.should == 302
     page.location.should == '/'
   end
 
   def revert_page(name)
     page = get('/revert/'+name)
-    page.status.should == 303
+    page.status.should == 302
     page.location.should == '/'+name
   end
 
   def unrevert_page(name)
     page = get('/revert/'+name)
-    page.status.should == 303
+    page.status.should == 302
     page.location.should == '/'+name
   end