RubyGems - ramaze - Versions diffs - 0.0.7 → 0.0.8 - Mend

ramaze 0.0.7 → 0.0.8

Files changed (193) hide show

data/Rakefile +52 -19
data/bin/ramaze +19 -6
data/doc/CHANGELOG +33 -0
data/doc/COPYING +1 -1
data/doc/FAQ +92 -0
data/doc/GPL +340 -0
data/doc/INSTALL +34 -0
data/doc/ProjectInfo +53 -0
data/doc/README +187 -110
data/doc/readme_chunks/appendix.txt +13 -0
data/doc/readme_chunks/examples.txt +38 -0
data/doc/readme_chunks/features.txt +82 -0
data/doc/readme_chunks/getting_help.txt +5 -0
data/doc/readme_chunks/getting_started.txt +18 -0
data/doc/readme_chunks/installing.txt +41 -0
data/doc/readme_chunks/introduction.txt +18 -0
data/doc/readme_chunks/principles.txt +41 -0
data/doc/readme_chunks/thanks.txt +59 -0
data/doc/tutorial/todolist.txt +546 -0
data/examples/blog/main.rb +1 -1
data/examples/blog/src/controller.rb +13 -11
data/examples/blog/src/element.rb +11 -6
data/examples/blog/src/model.rb +8 -23
data/examples/blog/template/edit.xhtml +3 -1
data/examples/blog/template/index.xhtml +4 -4
data/examples/caching.rb +4 -4
data/examples/element.rb +10 -7
data/examples/hello.rb +3 -4
data/examples/simple.rb +5 -3
data/examples/templates/template/external.amrita +19 -0
data/examples/templates/template/{external.rmze → external.zmr} +2 -2
data/examples/templates/template_amrita2.rb +48 -0
data/examples/templates/template_erubis.rb +5 -2
data/examples/templates/{template_ramaze.rb → template_ezamar.rb} +13 -7
data/examples/templates/template_haml.rb +4 -1
data/examples/templates/template_liquid.rb +2 -1
data/examples/templates/template_markaby.rb +2 -1
data/examples/todolist/conf/benchmark.yaml +35 -0
data/examples/todolist/conf/debug.yaml +34 -0
data/examples/todolist/conf/live.yaml +33 -0
data/examples/todolist/conf/silent.yaml +31 -0
data/examples/todolist/conf/stage.yaml +33 -0
data/examples/todolist/main.rb +18 -0
data/examples/todolist/public/404.jpg +0 -0
data/examples/todolist/public/css/coderay.css +105 -0
data/examples/todolist/public/css/ramaze_error.css +42 -0
data/{lib/proto → examples/todolist}/public/error.xhtml +0 -0
data/examples/todolist/public/favicon.ico +0 -0
data/examples/todolist/public/js/jquery.js +1923 -0
data/examples/todolist/public/ramaze.png +0 -0
data/examples/todolist/src/controller/main.rb +56 -0
data/examples/todolist/src/element/page.rb +26 -0
data/examples/todolist/src/model.rb +14 -0
data/examples/todolist/template/index.xhtml +17 -0
data/examples/todolist/template/new.xhtml +7 -0
data/examples/todolist/todolist.db +9 -0
data/examples/whywiki/main.rb +3 -8
data/examples/whywiki/template/show.xhtml +4 -0
data/lib/proto/public/error.zmr +77 -0
data/lib/proto/src/controller/main.rb +2 -1
data/lib/proto/src/element/page.rb +2 -1
data/lib/proto/src/model.rb +3 -2
data/lib/ramaze.rb +7 -9
data/lib/ramaze/adapter.rb +51 -0
data/lib/ramaze/adapter/cgi.rb +23 -0
data/lib/ramaze/adapter/fcgi.rb +22 -0
data/lib/ramaze/adapter/mongrel.rb +7 -86
data/lib/ramaze/adapter/webrick.rb +14 -133
data/lib/ramaze/cache/memcached.rb +6 -0
data/lib/ramaze/cache/yaml_store.rb +3 -1
data/lib/ramaze/controller.rb +292 -2
data/lib/ramaze/dispatcher.rb +85 -213
data/lib/ramaze/error.rb +10 -0
data/lib/ramaze/global.rb +8 -0
data/lib/ramaze/helper/aspect.rb +30 -7
data/lib/ramaze/helper/auth.rb +16 -9
data/lib/ramaze/helper/cache.rb +40 -35
data/lib/ramaze/helper/feed.rb +1 -1
data/lib/ramaze/helper/flash.rb +34 -0
data/lib/ramaze/helper/link.rb +8 -2
data/lib/ramaze/helper/openid.rb +63 -0
data/lib/ramaze/helper/redirect.rb +12 -11
data/lib/ramaze/helper/stack.rb +5 -7
data/lib/ramaze/inform.rb +12 -1
data/lib/ramaze/snippets/kernel/aquire.rb +1 -1
data/lib/ramaze/snippets/kernel/{self_method.rb → method.rb} +3 -18
data/lib/ramaze/snippets/kernel/{rescue_require.rb → pretty_inspect.rb} +7 -6
data/lib/ramaze/snippets/method/name.rb +22 -0
data/lib/ramaze/snippets/{kernel → ramaze}/autoreload.rb +0 -0
data/lib/ramaze/snippets/ramaze/caller_info.rb +14 -0
data/lib/ramaze/snippets/{kernel → ramaze}/caller_lines.rb +3 -10
data/lib/ramaze/snippets/rdoc/usage_no_exit.rb +49 -23
data/lib/ramaze/snippets/string/DIVIDE.rb +0 -1
data/lib/ramaze/store/default.rb +58 -2
data/lib/ramaze/store/yaml.rb +161 -0
data/lib/ramaze/template.rb +27 -86
data/lib/ramaze/template/amrita2.rb +14 -19
data/lib/ramaze/template/erubis.rb +15 -38
data/lib/ramaze/template/ezamar.rb +100 -0
data/lib/ramaze/template/ezamar/element.rb +166 -0
data/lib/ramaze/template/ezamar/engine.rb +124 -0
data/lib/ramaze/template/ezamar/morpher.rb +155 -0
data/lib/ramaze/template/haml.rb +16 -43
data/lib/ramaze/template/liquid.rb +11 -51
data/lib/ramaze/template/markaby.rb +44 -42
data/lib/ramaze/tool/mime.rb +18 -0
data/lib/ramaze/tool/mime_types.yaml +615 -0
data/lib/ramaze/trinity/request.rb +20 -196
data/lib/ramaze/trinity/response.rb +4 -33
data/lib/ramaze/trinity/session.rb +150 -72
data/lib/ramaze/version.rb +1 -1
data/spec/adapter_spec.rb +20 -0
data/spec/public/favicon.ico +0 -0
data/spec/public/ramaze.png +0 -0
data/spec/public/test_download.css +141 -0
data/spec/{tc_request.rb → request_tc_helper.rb} +45 -21
data/spec/spec_all.rb +77 -34
data/spec/spec_helper.rb +8 -157
data/spec/spec_helper_context.rb +72 -0
data/spec/spec_helper_requester.rb +52 -0
data/spec/spec_helper_simple_http.rb +433 -0
data/spec/tc_adapter_mongrel.rb +3 -15
data/spec/tc_adapter_webrick.rb +4 -14
data/spec/tc_cache.rb +3 -5
data/spec/tc_controller.rb +22 -12
data/spec/tc_dependencies.rb +13 -0
data/spec/tc_element.rb +8 -7
data/spec/tc_error.rb +13 -7
data/spec/tc_global.rb +16 -18
data/spec/tc_helper_aspect.rb +2 -4
data/spec/tc_helper_auth.rb +15 -14
data/spec/tc_helper_cache.rb +5 -7
data/spec/tc_helper_feed.rb +0 -2
data/spec/tc_helper_flash.rb +103 -0
data/spec/tc_helper_form.rb +4 -6
data/spec/tc_helper_link.rb +1 -3
data/spec/tc_helper_redirect.rb +23 -8
data/spec/tc_helper_stack.rb +31 -15
data/spec/tc_morpher.rb +1 -3
data/spec/tc_params.rb +48 -7
data/spec/tc_request_mongrel.rb +9 -0
data/spec/tc_request_webrick.rb +5 -0
data/spec/tc_session.rb +41 -25
data/spec/tc_store.rb +55 -6
data/spec/tc_store_yaml.rb +71 -0
data/spec/tc_template_amrita2.rb +3 -3
data/spec/tc_template_erubis.rb +2 -3
data/spec/{tc_template_ramaze.rb → tc_template_ezamar.rb} +15 -5
data/spec/tc_template_haml.rb +4 -3
data/spec/tc_template_liquid.rb +3 -4
data/spec/tc_template_markaby.rb +4 -6
data/spec/tc_tidy.rb +1 -3
data/spec/template/amrita2/{data.html → data.amrita} +0 -0
data/spec/template/amrita2/{index.html → index.amrita} +0 -0
data/spec/template/amrita2/{sum.html → sum.amrita} +0 -0
data/spec/template/ezamar/another/long/action.zmr +1 -0
data/spec/template/ezamar/combined.zmr +1 -0
data/spec/template/{ramaze/file_only.rmze → ezamar/file_only.zmr} +0 -0
data/spec/template/{ramaze/index.rmze → ezamar/index.zmr} +0 -0
data/spec/template/{ramaze/nested.rmze → ezamar/nested.zmr} +0 -0
data/spec/template/ezamar/some__long__action.zmr +1 -0
data/spec/template/{ramaze/sum.rmze → ezamar/sum.zmr} +0 -0
metadata +181 -123
data/doc/allison/LICENSE +0 -184
data/doc/allison/README +0 -37
data/doc/allison/allison.css +0 -300
data/doc/allison/allison.gif +0 -0
data/doc/allison/allison.js +0 -307
data/doc/allison/allison.rb +0 -287
data/doc/allison/cache/BODY +0 -588
data/doc/allison/cache/CLASS_INDEX +0 -4
data/doc/allison/cache/CLASS_PAGE +0 -1
data/doc/allison/cache/FILE_INDEX +0 -4
data/doc/allison/cache/FILE_PAGE +0 -1
data/doc/allison/cache/FONTS +0 -1
data/doc/allison/cache/FR_INDEX_BODY +0 -1
data/doc/allison/cache/IMGPATH +0 -1
data/doc/allison/cache/INDEX +0 -1
data/doc/allison/cache/JAVASCRIPT +0 -307
data/doc/allison/cache/METHOD_INDEX +0 -4
data/doc/allison/cache/METHOD_LIST +0 -1
data/doc/allison/cache/SRC_PAGE +0 -1
data/doc/allison/cache/STYLE +0 -322
data/doc/allison/cache/URL +0 -1
data/doc/changes.txt +0 -2021
data/doc/changes.xml +0 -2024
data/lib/ramaze/snippets/kernel/silently.rb +0 -13
data/lib/ramaze/snippets/thread/deadQUESTIONMARK.rb +0 -11
data/lib/ramaze/template/haml/actionview_stub.rb +0 -20
data/lib/ramaze/template/ramaze.rb +0 -177
data/lib/ramaze/template/ramaze/element.rb +0 -166
data/lib/ramaze/template/ramaze/morpher.rb +0 -156
data/spec/tc_test.rb +0 -17

data/examples/todolist/public/ramaze.png ADDED

Binary file

data/examples/todolist/src/controller/main.rb ADDED

@@ -0,0 +1,56 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+class MainController < Controller
+  trait :engine => Template::Ezamar
+  def index
+    @tasks = []
+    TodoList.original.each do |title, parameters|
+      if parameters[:done]
+        status = 'done'
+        toggle = link( R( self, :open, CGI.escape(title) ), :title => 'Open Task' )
+      else
+        status = 'not done'
+        toggle = link( R( self, :close, CGI.escape(title) ), :title => 'Close Task' )
+      end
+      delete = link( R( self, :delete, CGI.escape(title) ), :title => 'Delete' )
+      @tasks << [title, status, toggle, delete]
+    end
+    @tasks.sort!
+  end
+  def create
+    title = request['title']
+    TodoList[title] = {:done => false}
+    redirect R(self)
+  end
+  def open title
+    task_status title, false
+    redirect R(self)
+  end
+  def close title
+    task_status title, true
+    redirect R(self)
+  end
+  def delete title
+    TodoList.delete title
+    redirect R(self)
+  end
+  def error
+    @foo = 'bar'
+  end
+  private
+  def task_status title, status
+    task = TodoList[title]
+    task[:done] = status
+    TodoList[title] = task
+  end
+end

data/examples/todolist/src/element/page.rb ADDED

@@ -0,0 +1,26 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+class Page < Ezamar::Element
+  def render
+    %(
+    <html>
+      <head>
+        <title>TodoList</title>
+        <style>
+          table     { width:       100%;              }
+          tr        { background:  #efe; width: 100%; }
+          tr:hover  { background:  #dfd;              }
+          td.title  { font-weight: bold; width: 60%;  }
+          td.status { margin:      1em;               }
+          a         { color:       #3a3;              }
+        </style>
+      </head>
+      <body>
+        <h1>#{@hash['title']}</h1>
+        #{content}
+      </body>
+    </html>
+    )
+  end
+end

data/examples/todolist/src/model.rb ADDED

@@ -0,0 +1,14 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+require 'ramaze/store/default'
+TodoList = Ramaze::Store::Default.new('todolist.db')
+{
+  'Laundry'     => {:done => false},
+  'Wash dishes' => {:done => false},
+}.each do |task, parameters|
+  TodoList[task] = parameters
+end

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

@@ -0,0 +1,17 @@
+<Page title="TodoList">
+  <a href="/new">New Task</a>
+  <?r if @tasks.empty? ?>
+    No Tasks
+  <?r else ?>
+    <table>
+      <?r @tasks.each do |title, status, toggle, delete| ?>
+        <tr>
+          <td class="title">  #{title}  </td>
+          <td class="status"> #{status} </td>
+          <td class="toggle"> #{toggle} </td>
+          <td class="delete"> #{delete} </td>
+        </tr>
+      <?r end ?>
+    </table>
+  <?r end ?>
+</Page>

data/examples/todolist/template/new.xhtml ADDED

@@ -0,0 +1,7 @@
+<Page title="New Task">
+  <a href="/">Back to TodoList</a>
+  <form method="POST" action="create">
+    Task: <input type="text" name="title" /><br />
+    <input type="submit" />
+  </form>
+</Page>

data/examples/todolist/todolist.db ADDED

@@ -0,0 +1,9 @@
+---
+Wash dishes:
+  :done: false
+foobar:
+  :done: false
+Laundry:
+  :done: false
+implement:
+  :done: false

data/examples/whywiki/main.rb CHANGED

@@ -3,11 +3,6 @@
 # written as an example of how to implement the minimal _why wiki
-begin
-  require 'rubygems'
-rescue LoadError
-end
 require 'ramaze'
 require 'bluecloth'
@@ -15,7 +10,7 @@ include Ramaze
 Db = YAMLStoreCache.new('wiki.yaml')
-class WikiController < Template::Ramaze
+class WikiController < Controller
   def index
     redirect(R(:show, 'Home'))
   end
@@ -25,7 +20,8 @@ class WikiController < Template::Ramaze
     @text = Db[page].to_s
     @text.gsub!(/\[\[(.*?)\]\]/) do |m|
-      link( R(self, :show, CGI.escape($1)), :title => $1)
+      exists = Db[$1] ? 'exists' : 'nonexists'
+      link( R(self, :show, CGI.escape($1)), :title => $1, :class => exists)
     end
     @text = BlueCloth.new(@text).to_html
@@ -50,7 +46,6 @@ end
 Global.adapter = :mongrel
 #Global.tidy = true
-#Global.mode = :benchmark
 Global.mapping = {'/' => WikiController}
 start

data/examples/whywiki/template/show.xhtml CHANGED

@@ -1,6 +1,10 @@
 <html>
   <head>
     <title>MicroWiki #{@page}</title>
+    <style>
+      a.exists{ color: #00f; }
+      a.nonexists{ color: #f00; }
+    </style>
   </head>
     #{ link(R(self), :title => "&lt; Home") unless @page == "Home" }
   <body>

data/lib/proto/public/error.zmr ADDED

@@ -0,0 +1,77 @@
+<html>
+  <head>
+    <title>#{@title}</title>
+    <?r if @coderay ?>
+      <style>
+        #{CodeRay::Encoders[:html]::CSS.new.stylesheet}
+      </style>
+    <?r end ?>
+    <link rel="stylesheet" href="/css/ramaze_error.css" />
+    <script type="text/javascript" src="/js/jquery.js"></script>
+  </head>
+  <body>
+    <img id="logo" alt="Ramaze" src="/ramaze.png" />
+    <h1>#{@title}</h1>
+    <table class="main">
+      <tr class="head">
+        <td>File</td><td>Line</td><td>Method</td>
+      </tr>
+      <?r @backtrace.each do |lines, hash, file, lineno, meth| ?>
+        <tr id="line_#{hash}" style="background:rgb(#{@colors.shift},200,200);">
+          <td>#{file}</td><td>#{lineno}</td><td><pre>#{meth}</pre></td>
+        </tr>
+        <tr id="source_#{hash}" style="display:none;">
+          <td colspan="3">
+            <div class="source">
+              <table style="width:100%;">
+                <tr>
+                  <td colspan="2">vim #{file} +#{lineno}</td>
+                </tr>
+                <?r
+                  if @coderay
+                    code = lines.map{|no, code, cur| code}.join("\n")
+                    options = {
+                      :wrap => :div,
+                      :line_numbers => :inline,
+                      :line_number_start => (lineno.to_i - Global.inform_backtrace_size)
+                      }
+                     ?>
+                     #{CodeRay.scan(code, :ruby).html(options)}
+                <?r else ?>
+                  <?r lines.each do |llineno, lcode, lcurrent| ?>
+                    <tr class="source" #{'style="background:#faa;"' if lcurrent}>
+                      <td>#{llineno}</td>
+                      <td><pre>#{lcode.rstrip}</pre></td>
+                    </tr>
+                  <?r end ?>
+                <?r end ?>
+              </table>
+            </div>
+            <script type="text/javascript">
+              $("tr#line_#{hash}").click(function(){$("tr#source_#{hash}").toggle()});
+            </script>
+          </td>
+        </tr>
+      <?r end ?>
+    </table>
+    <?r
+      {
+        'Session'   => Thread.current[:session],
+        'Request'   => Thread.current[:request],
+        'Response'  => Thread.current[:response],
+        'Global'    => Global,
+      }.each do |title, content|
+        hash = [title, content].object_id.abs
+      ?>
+      <div class="additional">
+        <h3 id="show_#{hash}">#{title}</h3>
+        <pre style="display:none" id="is_#{hash}">#{CGI.escapeHTML(content.pretty_inspect)}</pre>
+        <script type="text/javascript">
+          $("h3#show_#{hash}").click(function(){$("pre#is_#{hash}").toggle()});
+        </script>
+      </div>
+    <?r end ?>
+  </body>
+</html>

data/lib/proto/src/controller/main.rb CHANGED

@@ -1,6 +1,7 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
-class MainController < Template::Ramaze
+class MainController < Controller
   def index
     "Hello, World"
   end

data/lib/proto/src/element/page.rb CHANGED

@@ -1,6 +1,7 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
-class Page < Element
+class Page < Ezamar::Element
   def render
     %{
     <html>

data/lib/proto/src/model.rb CHANGED

@@ -1,5 +1,6 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
-require 'yaml/store'
-Db = YAML::Store.new('yaml.db')
+require 'ramaze/store/default'
+Db = Ramaze::Store::Default.new('yaml.db')

data/lib/ramaze.rb CHANGED

@@ -17,16 +17,17 @@ require 'pp'
 require 'ramaze/snippets'
 require 'ramaze/cache'
-require 'ramaze/controller'
-require 'ramaze/dispatcher'
+require 'ramaze/trinity'
 require 'ramaze/error'
+require 'ramaze/dispatcher'
 require 'ramaze/gestalt'
 require 'ramaze/global'
 require 'ramaze/inform'
 require 'ramaze/http_status'
-require 'ramaze/snippets'
 require 'ramaze/helper'
-require 'ramaze/template'
+require 'ramaze/controller'
+require 'ramaze/template/ezamar'
+require 'ramaze/adapter'
 require 'ramaze/version'
 module Ramaze
@@ -74,7 +75,6 @@ module Ramaze
   end
   alias run start
-  alias new start
   # same as start(:force => true)
@@ -91,7 +91,7 @@ module Ramaze
   def startup
     tasks = Global.startup + Global.ramaze_startup
-    execute *tasks
+    execute(*tasks)
   end
   # Execute the tasks specified in Global.shutdown
@@ -101,7 +101,7 @@ module Ramaze
   def shutdown
     tasks = Global.shutdown + Global.ramaze_shutdown
-    execute *tasks
+    execute(*tasks)
   end
   # executes a list of tasks, depending on the task-object, if it responds to
@@ -183,7 +183,6 @@ module Ramaze
       else
         mapping["/#{name.split('::').last.snake_case}"] = c
       end
-      c.__send__(:send, :include, Ramaze::Controller)
     end
     Global.mapping.merge!(mapping) if Global.mapping.empty?
@@ -195,7 +194,6 @@ module Ramaze
     Global.controllers.map! do |controller|
       controller = constant(controller)
-      controller.send(:include, Ramaze::Controller)
     end
   end

data/lib/ramaze/adapter.rb ADDED

@@ -0,0 +1,51 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+require 'rack'
+require 'benchmark'
+# for OSX compatibility
+Socket.do_not_reverse_lookup = true
+module Ramaze::Adapter
+  class Base
+    class << self
+      def stop
+        Informer.debug "Stopping #{self.class}"
+      end
+      def call(env)
+        new.call(env)
+      end
+    end
+    def call(env)
+      if Ramaze::Global.inform_tags.include?(:benchmark)
+        time = Benchmark.measure{ respond env }
+        info "request took #{time.real}s"
+      else
+        respond env
+      end
+      @response = Thread.current[:response]
+      [@response.status, @response.header, self]
+    end
+    def respond env
+      Ramaze::Dispatcher.handle(::Rack::Request.new(env), ::Rack::Response.new)
+    end
+    def each
+      body = @response.body
+      if body.respond_to?(:read)
+        until body.eof?
+          yield body.read(1024)
+        end
+      else
+        yield body
+      end
+    end
+  end
+end

data/lib/ramaze/adapter/cgi.rb ADDED

@@ -0,0 +1,23 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+require 'ramaze/adapter'
+module Ramaze::Adapter
+  class Cgi < Base
+    class << self
+      def start host, ports
+        global = Ramaze::Global
+        global.inform_to = :stderr if global.inform_to == $stdout
+        run_server
+      end
+      def run_server
+        Thread.new do
+          Thread.current[:task] = :cgi
+          Rack::Handler::CGI.run(self)
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/adapter/fcgi.rb ADDED

@@ -0,0 +1,22 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+require 'ramaze/adapter'
+module Ramaze::Adapter
+  class Fcgi < Base
+    class << self
+      def start host, ports
+        run_server
+      end
+      def run_server
+        Thread.new do
+          Thread.current[:task] = :cgi
+          Rack::Handler::FastCGI.run(self)
+        end
+      end
+    end
+  end
+end