ramaze 0.3.5 → 0.3.9

data/Rakefile

@@ -1,4 +1,8 @@
-require 'rubygems'
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
 require 'rake'
 require 'rake/clean'
 require 'rake/packagetask'
@@ -137,25 +141,6 @@ task :todo do
   end
 end
 
-desc "show how many patches we made so far"
-task :patchsize do
-  patches = `darcs changes --reverse`.split("\n")
-  size = patches.reject{|l| l =~ /^\s/ or l.empty?}.size
-  puts "currently we have #{size} patches"
-  puts "shall i now play some Death-Metal for you?" if size == 666
-  days = (Time.now - Time.parse(patches[0])) / (3600*24)
-  puts "#{days.round} days since init, avg #{"%4.2f" % (size/days)} patches per day"
-end
-
-desc "show who made how many patches"
-task :patchstat do
-  total = authors.inject(0.0){|s,(n,a)| s + a[:patches]}
-  authors.sort_by{|k,v| -v[:patches]}.each do |name, author|
-    patches = author[:patches]
-    puts("%s %4d [%6.2f%% ]" % [name, patches, patches/total * 100])
-  end
-end
-
 desc "opens a simple readline that makes making requests easier"
 task 'request' do
   ARGV.clear

data/bin/ramaze

@@ -15,10 +15,6 @@ end
 
 RAMAZE_VERSION = "Ramaze Version #{Ramaze::VERSION}"
 
-require 'optparse'
-require 'ostruct'
-require 'abbrev'
-
 options = {:origin => :console, :create => false, :force => true}
 cli_options = Ramaze::CLI_OPTIONS
 cli_abbrevs = cli_options.map{|o| o.name.to_s}.abbrev

data/doc/AUTHORS

@@ -1,19 +1,24 @@
 Following persons (in alphabetical order) have contributed to Ramaze:
 
    Aman Gupta            -  aman@ramaze.net
+   Ara T. Howard         -  ahoward
    Carlo Zottmann        -  carlo@zottmann.org
    Chris Duncan          -  celldee@gmail.com
    Christian Neukirchen  -  chneukirchen@gmail.com
    Clive Crous           -  clive@crous.co.za
    Fabian Buch           -  fabian.buch@fabian-buch.de
    Gabriele Renzi        -  rff.rff@gmail.com
+   Jeremy Evans          -  code@jeremyevans.net
+   Joe Holt              -  joe07734@gmail.com
    Jonathan Buch         -  john@oxyliquit.de
    Keita Yamaguchi       -  keita.yamaguchi@gmail.com
    Lars Olsson           -  lasso@lassoweb.se
+   Leo Borisenko         -  leo.borisenko@gmail.com
    Martin Hilbig         -  blueonyx@dev-area.net
    Michael Fellinger     -  m.fellinger@gmail.com
    Pistos                -  jesuswasramazing.10.pistos@geoshell.com
    Richard Outten        -  outtenr@gmail.com
+   Ryan Grove            -  ryan@wonko.com
    Stephan Maka          -  stephan@spaceboyz.net
    skaar                 -  skaar@waste.org
    zenix                 -  comp.lang.zenix+ramaze@gmail.com

data/doc/meta/announcement.txt

@@ -48,7 +48,8 @@ Special (alphabetic) thanks go to:
 Selected summary of the 62 patches from 0.3.0 to 0.3.5:
 
   Core
-    - Ramaze::Contrib::Route made available by default as Ramaze::Route (backwards compatibility retained)
+    - Ramaze::Contrib::Route made available by default as Ramaze::Route
+      (backwards compatibility retained)
     - Support added for ETag and If-Modified-Since in Dispatcher::File
     - Adapter for LiteSpeed webserver added
     - Added ability to set default session cookie options using Session::COOKIE

data/doc/tutorial/todolist.html

@@ -70,7 +70,7 @@ RubyForge.</p>
 <p>Additionally, we now have added tests for the resulting application that you
 can find in spec/examples/todolist.rb</p>
 
-<p>Date of last update: Thu Jun 14 13:25:45 JST 2007</p>
+<p>Date of last update: Thu Jan 31 04:37:16 JST 2008</p>
 
 <p>Thanks in advance.
 The author of the tutorial, Michael 'manveru' Fellinger</p>
@@ -95,17 +95,16 @@ to-do list.</p>
 So we are going to base this on the tools available, you can just do the same
 with your ORM or database-library of choice.</p>
 
-<p>So first, edit the <code>src/model.rb</code> to fit better into our application:</p>
+<p>So first, create a <code>model/todolist.rb</code> for our application:</p>
 
-<pre><code>TodoList = Store::Default.new('todolist.yaml')
+<pre><code>require 'ramaze/store/default'
+TodoList = Ramaze::Store::Default.new('todolist.yaml')
 </code></pre>
 
 <p>Let's add some items as well to have a base to start from.</p>
 
-<pre><code>{
-  'Laundry'     =&gt; {:done =&gt; false},
+<pre><code>{ 'Laundry'     =&gt; {:done =&gt; false},
   'Wash dishes' =&gt; {:done =&gt; false},
-
 }.each do |title, value|
   TodoList[title] = value
 end
@@ -115,7 +114,7 @@ end
 
 <p>Now let's get our hands dirty and just edit the templates for our to-do list.</p>
 
-<p>Start with editing <code>template/index.xhtml</code>, it is using the default templating
+<p>Start with editing <code>view/index.xhtml</code>, it is using the default templating
 of Ramaze, called Ezamar.</p>
 
 <p>The index.xhtml currently contains a default welcome page, remove the contents.</p>
@@ -134,7 +133,7 @@ simple.</p>
         TodoList.each do |title, value|
           status = value[:done] ? 'done' : 'not done'
         ?&gt;
-        &lt;li&gt;#{title}: #{status}&lt;/li&gt;
+        &lt;li&gt;#{c title}: #{status}&lt;/li&gt;
       &lt;?r end ?&gt;
     &lt;/ul&gt;
   &lt;/body&gt;
@@ -189,7 +188,7 @@ application and secondly provides excellent ways of changing the complete
 Structure of the Model or View independent from each other.</p>
 
 <p>OK, enough of the theory, you will see the benefits in an instant. Go on and
-edit the file <code>src/controller/main.rb</code>.</p>
+edit the file <code>controller/main.rb</code>.</p>
 
 <p>The contents of it are like following:</p>
 
@@ -234,7 +233,7 @@ changed to do following:</p>
     &lt;?r else ?&gt;
       &lt;ul&gt;
         &lt;?r @tasks.each do |title, status| ?&gt;
-          &lt;li&gt;#{title}: #{status}&lt;/li&gt;
+          &lt;li&gt;#{c title}: #{status}&lt;/li&gt;
         &lt;?r end ?&gt;
       &lt;/ul&gt;
     &lt;?r end ?&gt;
@@ -260,13 +259,13 @@ Tasks it will say so.</p>
 <p>We set out to build the ultimate to-do list, but there are still some things
 missing. First off, we want to add new tasks, so let's get that done.</p>
 
-<p>Add a link on the <code>template/index.xhtml</code> like this:</p>
+<p>Add a link on the <code>view/index.xhtml</code> like this:</p>
 
 <pre><code>&lt;h1&gt;TodoList&lt;/h1&gt;
 &lt;a href="/new"&gt;New Task&lt;/a&gt;
 </code></pre>
 
-<p>Open a new file <code>template/new.xhtml</code> with a form to add a new task.</p>
+<p>Open a new file <code>view/new.xhtml</code> with a form to add a new task.</p>
 
 <pre><code>&lt;html&gt;
   &lt;head&gt;
@@ -321,11 +320,11 @@ and redirect back to the mapping of the current Controller ('/' in this case).</
 <p>Since the nature of tasks is to be done eventually
 we will need some way to mark it as done or open tasks again.</p>
 
-<p>Jump into <code>template/index.xhtml</code> and do the following:</p>
+<p>Jump into <code>view/index.xhtml</code> and do the following:</p>
 
 <pre><code>&lt;?r @tasks.each do |title, status, toggle| ?&gt;
   &lt;li&gt;
-    #{title}: #{status} - [ #{toggle} ]
+    #{c title}: #{status} - [ #{toggle} ]
   &lt;/li&gt;
 &lt;?r end ?&gt;
 </code></pre>
@@ -429,11 +428,11 @@ Controller:</p>
 end
 </code></pre>
 
-<p>Now jumping to <code>template/index.xhtml</code> again, change it so it shows the link:</p>
+<p>Now jumping to <code>view/index.xhtml</code> again, change it so it shows the link:</p>
 
 <pre><code>&lt;?r @tasks.each do |title, status, toggle, delete| ?&gt;
   &lt;li&gt;
-    #{title}: #{status} [ #{toggle} | #{delete} ]
+    #{c title}: #{status} [ #{toggle} | #{delete} ]
   &lt;/li&gt;
 &lt;?r end ?&gt;
 </code></pre>
@@ -524,7 +523,7 @@ end
 
 <p>And let's change our templates as well.</p>
 
-<p>First the <code>template/index.xhtml</code></p>
+<p>First the <code>view/index.xhtml</code></p>
 
 <pre><code>&lt;Page title="TodoList"&gt;
   &lt;a href="/new"&gt;New Task&lt;/a&gt;
@@ -534,7 +533,7 @@ end
     &lt;ul&gt;
       &lt;?r @tasks.each do |title, status, toggle, delete| ?&gt;
         &lt;li&gt;
-          #{title}: #{status} [ #{toggle} | #{delete} ]
+          #{c title}: #{status} [ #{toggle} | #{delete} ]
         &lt;/li&gt;
       &lt;?r end ?&gt;
     &lt;/ul&gt;
@@ -542,7 +541,7 @@ end
 &lt;/Page&gt;
 </code></pre>
 
-<p>and the <code>template/new.xhtml</code></p>
+<p>and the <code>view/new.xhtml</code></p>
 
 <pre><code>&lt;Page title="New Task"&gt;
   &lt;a href="/"&gt;Back to TodoList&lt;/a&gt;
@@ -566,7 +565,7 @@ to get it line up properly and look actually structured.</p>
 <pre><code>&lt;ul&gt;
   &lt;?r @tasks.each do |title, status, toggle, delete| ?&gt;
     &lt;li&gt;
-      #{title}: #{status} [ #{toggle} | #{delete} ]
+      #{c title}: #{status} [ #{toggle} | #{delete} ]
     &lt;/li&gt;
   &lt;?r end ?&gt;
 &lt;/ul&gt;
@@ -577,7 +576,7 @@ to get it line up properly and look actually structured.</p>
 <pre><code>&lt;table&gt;
   &lt;?r @tasks.each do |title, status, toggle, delete| ?&gt;
     &lt;tr&gt;
-      &lt;td class="title"&gt;  #{title}  &lt;/td&gt;
+      &lt;td class="title"&gt;  #{c title}  &lt;/td&gt;
       &lt;td class="status"&gt; #{status} &lt;/td&gt;
       &lt;td class="toggle"&gt; #{toggle} &lt;/td&gt;
       &lt;td class="delete"&gt; #{delete} &lt;/td&gt;

data/doc/tutorial/todolist.mkd

@@ -25,7 +25,7 @@ RubyForge.
 Additionally, we now have added tests for the resulting application that you
 can find in spec/examples/todolist.rb
 
-Date of last update: Thu Jun 14 13:25:45 JST 2007
+Date of last update: Thu Jan 31 04:37:16 JST 2008
 
 Thanks in advance.
 The author of the tutorial, Michael 'manveru' Fellinger
@@ -52,7 +52,8 @@ with your ORM or database-library of choice.
 
 So first, create a `model/todolist.rb` for our application:
 
-    TodoList = Store::Default.new('todolist.yaml')
+	require 'ramaze/store/default'
+    TodoList = Ramaze::Store::Default.new('todolist.yaml')
 
 Let's add some items as well to have a base to start from.
 
@@ -86,7 +87,7 @@ simple.
             TodoList.each do |title, value|
               status = value[:done] ? 'done' : 'not done'
             ?>
-            <li>#{title}: #{status}</li>
+            <li>#{c title}: #{status}</li>
           <?r end ?>
         </ul>
       </body>
@@ -183,7 +184,7 @@ changed to do following:
         <?r else ?>
           <ul>
             <?r @tasks.each do |title, status| ?>
-              <li>#{title}: #{status}</li>
+              <li>#{c title}: #{status}</li>
             <?r end ?>
           </ul>
         <?r end ?>
@@ -270,7 +271,7 @@ Jump into `view/index.xhtml` and do the following:
 
     <?r @tasks.each do |title, status, toggle| ?>
       <li>
-        #{title}: #{status} - [ #{toggle} ]
+        #{c title}: #{status} - [ #{toggle} ]
       </li>
     <?r end ?>
 
@@ -371,7 +372,7 @@ Now jumping to `view/index.xhtml` again, change it so it shows the link:
 
     <?r @tasks.each do |title, status, toggle, delete| ?>
       <li>
-        #{title}: #{status} [ #{toggle} | #{delete} ]
+        #{c title}: #{status} [ #{toggle} | #{delete} ]
       </li>
     <?r end ?>
 
@@ -467,7 +468,7 @@ First the `view/index.xhtml`
         <ul>
           <?r @tasks.each do |title, status, toggle, delete| ?>
             <li>
-              #{title}: #{status} [ #{toggle} | #{delete} ]
+              #{c title}: #{status} [ #{toggle} | #{delete} ]
             </li>
           <?r end ?>
         </ul>
@@ -498,7 +499,7 @@ So, from what we have right now:
     <ul>
       <?r @tasks.each do |title, status, toggle, delete| ?>
         <li>
-          #{title}: #{status} [ #{toggle} | #{delete} ]
+          #{c title}: #{status} [ #{toggle} | #{delete} ]
         </li>
       <?r end ?>
     </ul>
@@ -508,7 +509,7 @@ To something like this:
     <table>
       <?r @tasks.each do |title, status, toggle, delete| ?>
         <tr>
-          <td class="title">  #{title}  </td>
+          <td class="title">  #{c title}  </td>
           <td class="status"> #{status} </td>
           <td class="toggle"> #{toggle} </td>
           <td class="delete"> #{delete} </td>

data/examples/blog/{src/controller.rb → controller/main.rb}

@@ -1,4 +1,6 @@
 class MainController < Ramaze::Controller
+  layout '/layout'
+
   def index
     @entries = Entry.order(:created.DESC).all
   end

data/examples/blog/spec/blog.rb

@@ -9,7 +9,7 @@ require 'start'
 describe 'Blog' do
   behaves_like 'http'
   ramaze :public_root   => base/:public,
-         :template_root => base/:template
+         :template_root => base/:view
 
   after do
     Entry.each{|e| e.delete unless e.id == 1 }
@@ -21,8 +21,8 @@ describe 'Blog' do
     page.body.should.not == nil
 
     doc = Hpricot(page.body)
-    doc.at('title').inner_html.should == 'bl_Og'
-    doc.at('h1').inner_html.should == 'bl_Og'
+    doc.at('title').inner_html.should == 'Blog'
+    doc.at('h1').inner_html.should == 'Blog'
 
     doc.search('div#entries').size.should == 1
 

data/examples/blog/start.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'ramaze'
 
-require 'src/model'
-require 'src/view'
-require 'src/controller'
+require 'model/entry'
+require 'controller/main'
 
 Ramaze.start

data/examples/blog/view/edit.xhtml

@@ -0,0 +1,17 @@
+<h2>Editing entry</h2>
+<div id="entries">
+  <div class="entry">
+    <form method="post" action="#{R self,:save}">
+      <input name="id" type="hidden" value="#{@entry.id}"/>
+      <div class="header">
+        <div class="title">
+          <input name="title" type="text" value="#{@entry.title}"/>
+        </div>
+      </div>
+      <div class="content">
+        <textarea name="content">#{@entry.content}</textarea>
+      </div>
+      <input type="submit" value="Update Entry"/>
+    </form>
+  </div>
+</div>

data/examples/blog/view/index.xhtml

@@ -0,0 +1,17 @@
+<div id="actions">#{A 'new entry', :href => Rs(:new)}</div>
+<div id="entries">
+  <?r @entries.each do |entry| ?>
+  <div class="entry">
+    <div class="header">
+      <div class="title">#{entry.title}</div>
+      <div class="created">Created: #{entry.created}</div>
+      <ul>
+        <li>#{A 'edit', :href => Rs(:edit, entry.id)}</li>
+        <li>#{A 'delete', :href => Rs(:delete, entry.id)}</li>
+      </ul>
+    </div>
+    <div class="content">#{entry.content}</div>
+    <div class="updated">Last updated: #{entry.updated}</div>
+  </div>
+  <?r end ?>
+</div>

data/examples/blog/view/layout.xhtml

@@ -0,0 +1,11 @@
+<html>
+  <head>
+    <title>Blog</title>
+    <link rel="stylesheet" href="/styles/blog.css" type="text/css"/>
+  </head>
+  <body>
+    <h1>Blog</h1>
+    #@content
+  </body>
+</html>
+

data/examples/blog/view/new.xhtml

@@ -0,0 +1,16 @@
+<h2>New entry</h2>
+<div id="entries">
+  <div class="entry">
+    <form method="post" action="#{R self,:create}">
+      <div class="header">
+        <div class="title">
+          <input name="title" type="text" value=""/>
+        </div>
+      </div>
+      <div class="content">
+        <textarea name="content"></textarea>
+      </div>
+      <input type="submit" value="Add Entry"/>
+    </form>
+  </div>
+</div>

data/examples/facebook.rb

@@ -76,30 +76,37 @@ end unless defined? Facebook::ID
 #   facebook.addurl '/url' # add url for app that redirects to /url after successful install
 
 class MainController < Ramaze::Controller
-  helper :formatting # for time_diff
+  helper :formatting
   helper :facebook
 
-  before_all {
+  before {
     # show some information about current user in logs
     # INFO   Facebook {:user=>15601088, :in_canvas=>true, :added=>true}
-    inform :info, "Facebook " + fb.params.reject{|k,v| k.to_s !~ /^(in|is|user|added)/}.inspect if fb[:user]
+    if fb[:user]
+      # use facebook session_key as session cookie
+      session.session_id = fb[:session_key] if fb[:session_key]
+
+      Ramaze::Log.info "Facebook " + fb.params.reject{|k,v| k.to_s !~ /^(in|is|user|added|locale|request)/}.inspect
+    else
+      # require_add: redirect to add url
+      # fb.redirect fb.addurl
+    end
 
     # suggest setting SESSION key if one is not set, and current user is an admin
     # INFO   Set a default session key: SESSION = 'b3638446fa02466210c49f42-15601088'
     if Facebook::SESSION.empty? and Facebook::ADMINS.include? fb[:user]
-      inform :info, "Set a default session key: SESSION = '#{fb[:session_key]}'"
+      Ramaze::Log.info "Set a default session key: SESSION = '#{fb[:session_key]}'"
     end
-    nil
   }
 
   def install
-    inform :info, "#{fb[:user]} installed app" if request['installed'] == '1'
+    Ramaze::Log.info "#{fb[:user]} installed app" if request['installed'] == '1'
     facebook.profile.setFBML :uid => fb[:user], :markup => "Isn't this a great surprise!?"
     facebook.redirect request['next'] || '/'
   end
 
   def uninstall
-    inform :info, "#{fb[:user]} uninstalled app"
+    Ramaze::Log.info "#{fb[:user]} uninstalled app"
   end
 
   def main
@@ -149,4 +156,4 @@ class MainController < Ramaze::Controller
   layout :layout
 end
 
-Ramaze.start :adapter => :mongrel
+Ramaze.start :adapter => :mongrel