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

@@ -11,6 +11,6 @@ include Ramaze
 require 'src/controller'
 require 'src/element'
-Global.setup(YAML.load_file('conf/global.yaml'))
+Global.setup
 start

data/examples/blog/src/controller.rb CHANGED

@@ -1,16 +1,18 @@
 #          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
   helper :form, :auth, :aspect
+  trait :auth_table => {'manveru' => Digest::SHA1.hexdigest('password')}
   def index
     @title = 'Ramaze Blog'
-    @entries = Entry.all.reverse
+    @entries = Entry.keys.reverse.map{|k| Entry[k]}
   end
-  def view oid
-    @entry = Entry[oid.to_i]
+  def view eid
+    @entry = Entry[eid]
   end
   def new
@@ -18,25 +20,25 @@ class MainController < Template::Ramaze
   end
   def add
-    entry = Entry.new.assign(request.params)
+    entry = Entry.new.merge!(request.params)
     entry.time = Time.now
     session[:result] = "#{entry.title} added successfully" if entry.save
     redirect :/
   end
-  def edit oid
-    @entry = Entry[oid.to_i]
+  def edit eid
+    @entry = Entry[eid]
   end
   def save
-    redirect_referer unless oid = request.params.delete('oid').to_i
-    entry = Entry[oid].assign(request.params)
+    redirect_referer unless eid = request.params.delete('eid')
+    entry = Entry[eid].merge!(request.params)
     session[:result] = "#{entry.title} saved successfully" if entry.save
     redirect :/
   end
-  def delete oid
-    if entry = Entry[oid.to_i]
+  def delete eid
+    if entry = Entry[eid]
       if entry.delete
         session[:result] = "#{entry.title} deleted successfully"
       else

data/examples/blog/src/element.rb CHANGED

@@ -1,8 +1,13 @@
-class Page < Element
-  include Trinity
+class Page < Controller
+  attr_accessor :content
   helper :auth
+  def initialize content
+    @content = content
+  end
   def render
+    p :render => content
     %{
 <html>
   <head>
@@ -24,7 +29,7 @@ class Page < Element
       <span id="title">
         <a href="#{R :/}">#{@title || 'Blogging Ramaze'}</a>
       </span>
-      <?r if check_login ?>
+      <?r if logged_in? ?>
         <span id="login"> #{link R(:logout), :title => 'logout'} </span>
       <?r else ?>
         <span id="login"> #{link R(:login), :title => 'login'} </span>
@@ -35,13 +40,13 @@ class Page < Element
   def sidebar
     entries =
-      Entry.all.map do |e|
+      Entry.all.map do |eid, e|
       %{
         <div>
-          #{link R(:/, :view, e.oid), :title => e.title}
+          #{link R(:/, :view, eid), :title => e.title}
         </div>
       }
-    end
+      end
     %{
     <div id="sidebar">

data/examples/blog/src/model.rb CHANGED

@@ -1,29 +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.
-begin
-  require 'rubygems'
-  gem 'facets', '=1.4.5'
-  require '/home/manveru/prog/projects/nitroproject/glycerin'
-rescue LoadError
-end
-require 'og'
+require 'ramaze/store/yaml'
-class Comment
-  attr_accessor :text, String
-  attr_accessor :time, Time
-  attr_accessor :author_name, String
-  attr_accessor :author_email, String
-end
-class Entry
-  attr_accessor :title, String
-  attr_accessor :text,  String, :control => :textarea
-  attr_accessor :time,  Time
-  has_many Comment
-end
+Entry = Ramaze::Store::YAML.new :entry
-unless defined? Entry.ogmanager
-  Og.setup
+if Entry.empty?
+  entry = Entry.new
+  entry.time = Time.now
+  entry.title = 'Nothing special'
+  entry.text = 'even less special'
+  entry.save
 end

data/examples/blog/template/edit.xhtml CHANGED

@@ -1,6 +1,8 @@
 <Page>
   <form method="POST" action="#{R self, :save}">
     <input type="hidden" name="oid" value="#{@entry.oid}" />
-    #{form @entry, :deny => [/time/, /oid/]}
+    <input type="text" name="title" value="#{@entry.title}" />
+    <textarea name="text">#{@entry.text}</textarea>
+    <input type="submit" />
   </form>
 </Page>

data/examples/blog/template/index.xhtml CHANGED

@@ -12,13 +12,13 @@
         #{BlueCloth.new(entry.text.to_s).to_html}
       </div>
       <div class="menu">
-        <?r if check_login ?>
-          #{link self, :delete, entry.oid, :title => 'Delete'}
-          #{link self, :edit, entry.oid, :title => 'Edit'}<br />
+        <?r if logged_in? ?>
+          #{link self, :delete, entry.eid, :title => 'Delete'}
+          #{link self, :edit, entry.eid, :title => 'Edit'}<br />
         <?r end ?>
         Entry #{@entries.size - i}/#{@entries.size}
       </div>
     </div>
   <?r end ?>
-  #{link(self, :new, :title => 'New Entry') if check_login}
+  #{link(self, :new, :title => 'New Entry') if logged_in?}
 </Page>

data/examples/caching.rb CHANGED

@@ -2,9 +2,11 @@ require 'ramaze'
 include Ramaze
-class MainController < Template::Ramaze
+class MainController < Controller
   helper :cache
+  trait :actions_cached => [:index]
   def index
     calc = "100_000 ** 100_00"
     %[
@@ -14,10 +16,8 @@ class MainController < Template::Ramaze
   end
   def invalidate
-    uncache_all
+    action_cache.clear
   end
-  cache :index
 end
 run

data/examples/element.rb CHANGED

@@ -1,20 +1,23 @@
 require 'ramaze'
 include Ramaze
-class Page < Template::Ramaze::Element
+class Page < Ezamar::Element
   def render
     %{
      <html>
-       <h1>
-         #{@hash['title']}
-       </h1>
-       #{content}
+      <head>
+        <title>examples/element</title>
+      </head>
+      <body>
+        <h1>#{@hash['title']}</h1>
+        #{content}
+      </body>
     </html>
     }
   end
 end
-class SideBar < Template::Ramaze::Element
+class SideBar < Ezamar::Element
   def render
     %{
      <div class="sidebar">
@@ -24,7 +27,7 @@ class SideBar < Template::Ramaze::Element
   end
 end
-class MainController < Template::Ramaze
+class MainController < Controller
   def index
     %{
     <Page title="Test">

data/examples/hello.rb CHANGED

@@ -6,18 +6,17 @@ require 'ramaze'
 include Ramaze
 # This is named MainController to automagically map it to '/'
-#   Global.mapping['/'] => MainController
+#   Global.mapping['/'] = MainController
 # would do the same thing.
 # you can access it now with http://localhost:7000/
 # This should output
 # Hello, World!
 # in your browser
-class MainController < Template::Ramaze
+class MainController < Controller
   def index
     "Hello, World!"
   end
 end
-# use this to start your app if you don't want to use the `ramaze` bin
-# start
+start

data/examples/simple.rb CHANGED

@@ -22,7 +22,7 @@ require 'ramaze'
 include Ramaze
-class SimpleController < Template::Ramaze
+class SimpleController < Controller
   def index
     "simple"
   end
@@ -48,13 +48,15 @@ class SimpleController < Template::Ramaze
   end
 end
-class OtherController < Template::Ramaze
+class OtherController < Controller
   def index
     "Hello, World from #{self.class.name}"
   end
 end
-Global.mapping    = {
+Global.mapping = {
   '/'      => SimpleController,
   '/other' => OtherController
 }
+start

data/examples/templates/template/external.amrita ADDED

@@ -0,0 +1,19 @@
+<html>
+  <head>
+    <title>Template::Amrita2 external</title>
+  </head>
+  <body>
+  <h1 id="title">Title</h1>
+    <a id="link_home">Home</a>
+    <p>
+      Here you can pass some stuff if you like, parameters are just passed like this:<br />
+      <a id="link_one"></a><br />
+      <a id="link_two"></a><br />
+      <a id="link_three"></a>
+    </p>
+    <div id="args">
+      *args
+    </div>
+    <div id="inspect_parameters"></div>
+  </body>
+</html>

data/examples/templates/template/{external.rmze → external.zmr} RENAMED

@@ -1,9 +1,9 @@
 <html>
   <head>
-    <title>Template::Ramaze external</title>
+    <title>Template::Ezamar external</title>
   </head>
   <body>
-  <h1>The #{@action} Template for Ramaze</h1>
+  <h1>The #{@action} Template for Ezamar</h1>
     #{link :/, :title => 'Home'}
     <p>
       Here you can pass some stuff if you like, parameters are just passed like this:<br />

data/examples/templates/template_amrita2.rb ADDED

@@ -0,0 +1,48 @@
+#          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'
+include Ramaze
+# TODO:
+# implement the amrita2 example, man, this engine is awkward :P
+class MainController < Controller
+  trait :engine => Template::Amrita2
+  def index
+    %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
+  end
+  def title
+    "The #{@action} Template for Ramaze"
+  end
+  def link_home
+    link :/, :title => 'Home'
+  end
+  def link_one
+      link self, @action, :one, :title => "#@action/one"
+  end
+  def link_two
+      link self, @action, :one, :two, :three, :title => "#@action/one/two/three"
+  end
+  def link_three
+      link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar"
+  end
+  def inspect_parameters
+    request.params.inspect
+  end
+  def args
+    @params.map{|arg| "<span>#{arg}</span>"}.join(' ')
+  end
+end
+start

data/examples/templates/template_erubis.rb CHANGED

@@ -5,7 +5,10 @@ require 'ramaze'
 include Ramaze
-class MainController < Template::Erubis
+class MainController < Controller
+  trait :engine => Template::Erubis
   def index
     %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
   end
@@ -15,7 +18,7 @@ class MainController < Template::Erubis
     transform %q{
 <html>
   <head>
-    <title>Template::Ramaze internal</title>
+    <title>Template::Erubis internal</title>
   </head>
   <body>
   <h1>The <%= @action %> Template</h1>

data/examples/templates/{template_ramaze.rb → template_ezamar.rb} RENAMED

@@ -5,25 +5,29 @@ require 'ramaze'
 include Ramaze
-class MainController < Template::Ramaze
+class MainController < Controller
+  helper :link
   def index
     %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
   end
   def internal *args
     @args = args
-    transform %q{
+    %q{
 <html>
   <head>
-    <title>Template::Ramaze internal</title>
+    <title>Template::Ezamar internal</title>
   </head>
   <body>
-  <h1>The #{@action} Template</h1>
+  <h1>The #{@action} Template for Ezamar</h1>
+    #{link :/, :title => 'Home'}
     <p>
       Here you can pass some stuff if you like, parameters are just passed like this:<br />
-      #{link self, @action, :one, :title => 'external/one'}<br />
-      #{link self, @action, :one, :two, :three, :title => 'external/one/two/three'}<br />
-      #{link self, @action, :one, :foo => :bar, :title => 'external?foo=bar'}<br />
+      #{link self, @action, :one, :title => "#@action/one"}<br />
+      #{link self, @action, :one, :two, :three, :title => "#@action/one/two/three"}<br />
+      #{link self, @action, :one, :foo => :bar, :title => "#@action?foo=bar"}<br />
     </p>
     <div>
       The arguments you have passed to this action are:
@@ -47,3 +51,5 @@ class MainController < Template::Ramaze
     @args = args
   end
 end
+run

data/examples/templates/template_haml.rb CHANGED

@@ -5,7 +5,10 @@ require 'ramaze'
 include Ramaze
-class MainController < Template::Haml
+class MainController < Controller
+  trait :engine => Template::Haml
   def index
     %{ #{link self.class} | #{link self.class, :internal} | #{link self.class, :external} }
   end