ramaze 0.3.9.1 → 2023.01.06

data/examples/{wiktacular → app/wiktacular}/spec/wiktacular.rb

@@ -1,42 +1,41 @@
+require 'rubygems'
 require 'ramaze'
-require 'ramaze/spec/helper'
+require 'ramaze/spec/bacon'
 
-spec_require 'hpricot', 'bluecloth'
+require 'nokogiri'
+require 'bluecloth'
 
-$LOAD_PATH.unshift base = __DIR__/'..'
+$LOAD_PATH.unshift base = __DIR__('..')
 require 'start'
 
 describe 'wiktacular' do
-  behaves_like 'http'
+  behaves_like :rack_test
   NEWPAGE = "newpagename"
 
   def check_page(name)
-    page = get('/'+name)
+    page = get(name)
     page.status.should == 200
     page.body.should.not == nil
 
-    doc = Hpricot(page.body)
+    doc = Nokogiri::HTML(page.body)
     doc.at('title').inner_html.should == 'Wiktacular'
 
-    menu = doc.search('div#menu>a')
+    menu = doc.css('div#menu a')
     menu[0].inner_html.should == 'Home'
     menu[1].inner_html.should == 'New Entry'
 
-    navigation = doc.search('div#navigation>div>a')
+    navigation = doc.css('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 = 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   => base/:public,
-           :template_root => base/:template
     get('/').status.should == 200
   end
 
@@ -56,58 +55,59 @@ describe 'wiktacular' 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 
+    doc.at('div#content').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.should.not == nil
     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
+  def edit_page(name, text = 'new text')
+    page = post('/save', 'handle' => name,'text' => text)
+    page.status.should == 302
+    path = MainController.r(:index, name)
+    page.location.should == "http://example.org#{path}"
   end
-  
+
   def delete_page(name)
     page = get('/delete/'+name)
-    page.status.should == 303
-    page.location.should == '/'
+    page.status.should == 302
+    page.location.should == 'http://example.org/'
   end
 
   def revert_page(name)
     page = get('/revert/'+name)
-    page.status.should == 303
-    page.location.should == '/'+name
+    page.status.should == 302
+    page.location.should == 'http://example.org/'+name
   end
 
   def unrevert_page(name)
     page = get('/revert/'+name)
-    page.status.should == 303
-    page.location.should == '/'+name
+    page.status.should == 302
+    page.location.should == 'http://example.org/'+name
   end
 
   it 'editing should create page' do
     edit_page(NEWPAGE, 'new text')
-    doc = check_page(NEWPAGE)
+    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 = 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 = check_page("/#{NEWPAGE}")
     doc.at('div#text').inner_html.strip.should == '<p>some other text</p>'
     delete_page(NEWPAGE)
   end
@@ -115,10 +115,10 @@ describe 'wiktacular' do
   it "should be possible to revert changes" do
     edit_page(NEWPAGE, 'first text')
     edit_page(NEWPAGE, 'second text')
-    doc = check_page(NEWPAGE)
+    doc = check_page("/#{NEWPAGE}")
     doc.at('div#text').inner_html.strip.should == '<p>second text</p>'
     revert_page(NEWPAGE)
-    doc = check_page(NEWPAGE)
+    doc = check_page("/#{NEWPAGE}")
     doc.at('div#text').inner_html.strip.should == '<p>first text</p>'
   end
 
@@ -126,33 +126,32 @@ describe 'wiktacular' do
     edit_page(NEWPAGE, 'first text')
     edit_page(NEWPAGE, 'second text')
     revert_page(NEWPAGE)
-    doc = check_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 = check_page("/#{NEWPAGE}")
     doc.at('div#text').inner_html.strip.should == '<p>first text</p>'
   end
 
   it "should convert [[#{NEWPAGE}]] to existing link" do
     edit_page(NEWPAGE, "Link: [[#{NEWPAGE}]]")
-    doc = check_page(NEWPAGE)
+    doc = check_page("/#{NEWPAGE}")
     a = doc.at('div#text>p>a')
     a['class'].should == 'exists'
-    a['href'].should == NEWPAGE
+    a['href'].should == "/index/#{NEWPAGE}"
     a.inner_html.should == NEWPAGE
   end
 
   it "should convert [[chunky bacon]] to nonexisting link" do
     edit_page(NEWPAGE, "Link: [[chunky bacon]]")
-    doc = check_page(NEWPAGE)
+    doc = check_page("/#{NEWPAGE}")
     a = doc.at('div#text>p>a')
     a['class'].should == 'nonexists'
-    a['href'].should == "chunky+bacon"
+    a['href'].should == "/index/chunky+bacon"
     a.inner_html.should == "chunky bacon"
   end
 
-  after do
-    WikiEntry.new(NEWPAGE).delete
+  should 'delete page for cleanup' do
+    WikiEntry.new(NEWPAGE).delete.first.should =~ /#{NEWPAGE}$/
   end
-
 end

data/examples/{wiktacular → app/wiktacular}/src/controller.rb

@@ -1,9 +1,11 @@
 class MainController < Ramaze::Controller
-  
+  layout :application
+  before_all {setup}
 
-  def index handle = "main"
-    @handle = handle
+  def index(handle = "main")
     @entry = WikiEntry.new(handle)
+    @handle = @entry.name
+
     if @entry.exists?
       @text = EntryView.render(@entry.content)
       @history = @entry.history.map{|f|
@@ -15,41 +17,39 @@ class MainController < Ramaze::Controller
     end
   end
 
-  def edit handle
-    @handle = handle
+  def edit(handle)
     @entry = WikiEntry.new(handle)
+    @handle = @entry.name
     @text = @entry.content
   end
 
-  def revert handle
+  def revert(handle)
     WikiEntry[handle].revert
-    redirect Rs(handle)
+    redirect route(handle)
   end
 
-  def unrevert handle
+  def unrevert(handle)
     WikiEntry[handle].unrevert
-    redirect Rs(handle)
+    redirect route(handle)
   end
 
-  def delete handle
-    WikiEntry[handle].delete
+  def delete(handle)
+    WikiEntry.new(handle).delete
     redirect_referer
   end
 
   def save
     redirect_referer unless request.post?
+
     handle = request['handle']
     entry = WikiEntry.new(handle)
     entry.save(request['text'])
-    redirect Rs(:index, handle)
+    redirect entry.route
   end
 
-  def html_layout
+  def setup
     @nodes = WikiEntry.titles.map{|f|
-        name = File.basename(f)
-        %[<a href="/#{name}">#{name}</a>]
-      }.join("\n")
+      anchor File.basename(f)
+    }.join("\n")
   end
-
-  layout '/html_layout'
 end

data/examples/{wiktacular → app/wiktacular}/src/model.rb

@@ -2,18 +2,22 @@ require 'fileutils'
 require 'cgi'
 
 class WikiEntry
-  ENTRIES_DIR = __DIR__/'../mkd'
+  ENTRIES_DIR = __DIR__('../mkd')
+
   class << self
     def [](name)
-      if File.exist?(ENTRIES_DIR/File.basename(File.expand_path(name)))
+      if File.exist?(File.join(ENTRIES_DIR, File.basename(File.expand_path(name))))
         new(name)
       end
     end
+
     def titles
-      Dir[ENTRIES_DIR/'*'].entries
+      Dir[File.join(ENTRIES_DIR,'*')].entries
     end
   end
 
+  include Ramaze::Helper::CGI
+
   attr_reader :history, :current, :name
 
   def initialize(name)
@@ -27,7 +31,7 @@ class WikiEntry
     @history = Dir["#{base}/*_*.mkd"]
   end
 
-  def save newtext
+  def save(newtext)
     FileUtils.mkdir_p(base)
 
     if content != newtext
@@ -42,7 +46,7 @@ class WikiEntry
   end
 
   def delete
-    FileUtils.rm_rf(base)
+    FileUtils.rm_rf(base) if exists?
   end
 
   def revert
@@ -64,7 +68,11 @@ class WikiEntry
   end
 
   def base
-    ENTRIES_DIR/@name
+    File.join(ENTRIES_DIR, @name)
+  end
+
+  def route
+    MainController.route(:index, name)
   end
 
   def content
@@ -81,21 +89,29 @@ class WikiEntry
 end
 
 class EntryView
-  include Ramaze::Helper::Methods
-  helper :cgi, :link
-
   class << self
-
     def render content
       mkd2html(content || "No Entry")
     end
 
-    def mkd2html text
+    def mkd2html(text)
       html = BlueCloth.new(text).to_html
-      html.gsub!(/\[\[(.*?)\]\]/) do |m|
-        exists = WikiEntry[$1] ? 'exists' : 'nonexists'
-        A(h($1), :href => $1, :class => exists)
+
+      html.gsub!(/\[\[(.*?)\]\]/) do
+        name = $1
+
+        if entry = WikiEntry[name]
+          exists = 'exists'
+          route = entry.route
+        else
+          exists = 'nonexists'
+          route = MainController.route(:index, name)
+        end
+
+        title = Rack::Utils.escape_html(name)
+        "<a href='#{route}' class='#{exists}'>#{title}</a>"
       end
+
       html
     end
   end

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

@@ -5,4 +5,4 @@ require 'bluecloth'
 require 'src/model'
 require 'src/controller'
 
-Ramaze.start :adapter => :mongrel
+Ramaze.start

data/examples/{wiktacular/template → app/wiktacular/view}/edit.xhtml

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

data/examples/{wiktacular/template → app/wiktacular/view}/new.xhtml

@@ -2,5 +2,5 @@
   <input type="text" name="handle" />
   <textarea name="text"></textarea>
   <input type="submit" />
-  or #{A('cancel',:href=>'/')}
+  or #{anchor('cancel','/')}
 </form>

data/examples/{element.rb → 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

@@ -0,0 +1,26 @@
+require 'ramaze'
+
+class MainController < Ramaze::Controller
+  helper :gestalt
+
+  def index
+    build do
+      html do
+        head do
+          title "Welcome to Gestalt"
+        end
+
+        body do
+          h1 "Gestalt reports for duty"
+
+          p "Feel free to take a look at my source.",
+            "That's what open source is for anyway."
+
+          a(:href => 'http://ramaze.net'){ 'ramaze.net' }
+        end
+      end
+    end
+  end
+end
+
+Ramaze.start

data/examples/basic/hello.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'ramaze'
+
+# 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
+    "Hello, World!"
+  end
+end
+
+Ramaze.start

data/examples/{layout.rb → basic/layout.rb}

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  map '/'
   layout :page
+  provide :html, :engine => :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

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'ramaze'
+
+class LinkingController < Ramaze::Controller
+  map '/'
+
+  def index
+    %{simple link <br/> <a href="#{r(:help)}">Help?</a>}
+  end
+
+  def new
+    "something new!"
+  end
+
+  def help
+    %{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="#{LinkingController.r(:index)}">Back to Original Controller</a>}
+  end
+end
+
+Ramaze.start

data/examples/basic/partial.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'ramaze'
+
+# This is a small extension to the hello world example, showing how to use the
+# <render> tag of Nagoro.
+#
+# Browse to /more and /even_more
+
+class MainController < Ramaze::Controller
+  engine :nagoro
+
+  def index
+    "Hello, World!"
+  end
+
+  def more
+    @tail = request[:tail] || 'the standard'
+    'More of <render src="/index" /> #@tail'
+  end
+
+  def even_more
+    '<render src="/more" tail="This is even more" />'
+  end
+end
+
+Ramaze.start

data/examples/{simple.rb → basic/simple.rb}

@@ -3,8 +3,9 @@ require 'ramaze'
 
 # A very simple little application, you can simply run it and
 # point your browser to http://localhost:7000
-# you can change the port by setting
-# Global.port = 80
+#
+# You can change the port by setting
+# Ramaze.options.adapter.port = 80
 # this most likely requires root-privileges though.
 
 # This example shows following (requests to the mentioned base-url) :
@@ -24,24 +25,20 @@ class SimpleController < Ramaze::Controller
     "simple"
   end
 
-  def simple
-    request.inspect
-  end
-
-  def join first, second
+  def join(first, second)
     [first, second].join
   end
 
   def join_all *strings
     strings.join
   end
-  
+
   def sum first, second
-    first.to_i + second.to_i
+    "#{first.to_i + second.to_i}"
   end
-  
+
   def post_or_get
-    request.post? ? 'POST' : 'GET'
+    request.request_method
   end
 end
 
@@ -53,4 +50,4 @@ class OtherController < Ramaze::Controller
   end
 end
 
-Ramaze.start
+Ramaze.start

data/examples/{caching.rb → helpers/cache.rb}

@@ -2,18 +2,18 @@ require 'rubygems'
 require 'ramaze'
 
 class MainController < Ramaze::Controller
-  map :/
-
+  map '/'
   helper :cache
-  cache :index
 
   def index
-%[
+    @number = rand * 100
+
+%q[
 <html>
   <head><title>examples/caching</title></head>
   <body>
     <p>
-      This action just shows you a random number: #{rand * 100}.<br />
+      This action just shows you a random number: #{@number}.<br />
       If you <a href="/">refresh</a> the page it won't change since you see a cached version.<br />
       But if you <a href="/invalidate">invalidate</a> it, the page will be regenerated.
     </p>
@@ -22,10 +22,12 @@ class MainController < Ramaze::Controller
 ]
   end
 
+  cache_action :method => 'index'
+
   def invalidate
-    action_cache.delete '/index'
+    Ramaze::Cache.action.delete('/')
     redirect :/
   end
 end
 
-Ramaze.start
+Ramaze.start

data/examples/helpers/paginate.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'ramaze'
+
+USERS = DATA.read.split("\n")
+
+class MainController < Ramaze::Controller
+  helper :paginate
+
+  trait :paginate => {
+    :limit => 6,
+    :var => 'user_page',
+  }
+
+  def index
+    @pager = paginate(USERS)
+%q~
+<html>
+  
+  <head><title>Users</title></head>
+  <body>
+    #{@pager.navigation if @pager.needed?}
+    <pre>
+      <?r @pager.each do |user| ?>
+        #{user}
+      <?r end ?>
+    </pre>
+    #{@pager.navigation if @pager.needed?}
+  </body>
+</html>
+~
+  end
+end
+
+Ramaze.start
+
+__END__
+Michael Fellinger       1868 [ 77.13% ]
+Aman Gupta               211 [  8.71% ]
+Jonathan Buch             89 [  3.67% ]
+Gabriele Renzi            49 [  2.02% ]
+Ara T. Howard             44 [  1.82% ]
+Clive Crous               37 [  1.53% ]
+Keita Yamaguchi           27 [  1.11% ]
+Ryan Grove                17 [  0.70% ]
+Pistos                    16 [  0.66% ]
+Wang, Jinjing             11 [  0.45% ]
+Colin Shea                 9 [  0.37% ]
+Sam Carr                   6 [  0.25% ]
+Stephan Maka               5 [  0.21% ]
+samcarr                    4 [  0.17% ]
+raggi                      3 [  0.12% ]
+Clinton R. Nixon           3 [  0.12% ]
+Chris Duncan               3 [  0.12% ]
+Richard Outten             2 [  0.08% ]
+Andy Smith                 2 [  0.08% ]
+skaar                      1 [  0.04% ]
+Yasushi Abe                1 [  0.04% ]
+Thomas Leitner             1 [  0.04% ]
+Rob Lievaart               1 [  0.04% ]
+Riku Raisaenen             1 [  0.04% ]
+Matt Rubens                1 [  0.04% ]
+Martin Hilbig              1 [  0.04% ]
+Leo Borisenko              1 [  0.04% ]
+Lars Olsson                1 [  0.04% ]
+Jeremy Evans               1 [  0.04% ]
+Jean-Francois Chevrette    1 [  0.04% ]
+James Tucker               1 [  0.04% ]
+Fabian Buch                1 [  0.04% ]
+Christian Neukirchen       1 [  0.04% ]
+Carlo Zottmann             1 [  0.04% ]
+Andrew Farmer              1 [  0.04% ]