RubyGems - ramaze - Versions diffs - 0.3.0 → 0.3.5 - Mend

ramaze 0.3.0 → 0.3.5

Files changed (122) hide show

data/Rakefile +3 -2
data/bin/ramaze +9 -3
data/doc/AUTHORS +6 -2
data/doc/CHANGELOG +272 -66
data/doc/GPL +12 -13
data/doc/README.html +729 -0
data/doc/changes.txt +5757 -0
data/doc/changes.xml +5759 -0
data/doc/meta/announcement.txt +48 -39
data/doc/tutorial/todolist.mkd +10 -12
data/examples/blog/start.rb +1 -0
data/examples/caching.rb +1 -0
data/examples/element.rb +3 -0
data/examples/hello.rb +1 -3
data/examples/identity.rb +5 -8
data/examples/layout.rb +1 -0
data/examples/linking.rb +1 -0
data/examples/memleak_detector.rb +1 -0
data/examples/nitro_form.rb +1 -0
data/examples/rammit/start.rb +1 -0
data/examples/rapaste/Rakefile +7 -0
data/examples/rapaste/{src/controller.rb → controller/paste.rb} +28 -3
data/examples/rapaste/{src/model.rb → model/paste.rb} +0 -4
data/examples/rapaste/public/css/display.css +17 -0
data/examples/rapaste/spec/rapaste.rb +2 -2
data/examples/rapaste/start.rb +9 -4
data/examples/rapaste/{template → view}/copy.xhtml +0 -0
data/examples/rapaste/{template → view}/index.xhtml +0 -0
data/examples/rapaste/{template → view}/layout.xhtml +3 -0
data/examples/rapaste/{template → view}/list.xhtml +4 -3
data/examples/rapaste/view/search.xhtml +41 -0
data/examples/rapaste/{template → view}/view.xhtml +0 -0
data/examples/simple.rb +3 -3
data/examples/templates/template/external.amrita +9 -9
data/examples/templates/template/external.redcloth +19 -0
data/examples/templates/template_amrita2.rb +40 -7
data/examples/templates/template_erubis.rb +3 -3
data/examples/templates/template_ezamar.rb +1 -3
data/examples/templates/template_haml.rb +1 -3
data/examples/templates/template_liquid.rb +3 -3
data/examples/templates/template_markaby.rb +1 -3
data/examples/templates/template_nagoro.rb +1 -3
data/examples/templates/template_redcloth.rb +59 -0
data/examples/templates/template_remarkably.rb +1 -3
data/examples/templates/template_xslt.rb +1 -4
data/examples/todolist/src/controller/main.rb +1 -1
data/examples/todolist/start.rb +1 -2
data/examples/upload/start.rb +19 -0
data/examples/upload/view/index.xhtml +25 -0
data/examples/whywiki/start.rb +1 -3
data/examples/wikore/start.rb +3 -0
data/examples/wiktacular/mkd/newpagename/current.mkd +1 -0
data/examples/wiktacular/mkd/newpagename/current.mkd.bak +1 -0
data/examples/wiktacular/start.rb +1 -0
data/lib/proto/controller/main.rb +0 -3
data/lib/proto/public/js/jquery.js +106 -93
data/lib/proto/spec/main.rb +2 -5
data/lib/proto/start.rb +0 -3
data/lib/ramaze.rb +3 -2
data/lib/ramaze/action.rb +6 -10
data/lib/ramaze/adapter/lsws.rb +19 -0
data/lib/ramaze/contrib/email.rb +84 -0
data/lib/ramaze/contrib/email.rb-darcs-backup0 +81 -0
data/lib/ramaze/contrib/gettext.rb +1 -0
data/lib/ramaze/contrib/gettext/parser.rb +46 -0
data/lib/ramaze/contrib/route.rb +3 -36
data/lib/ramaze/controller.rb +4 -6
data/lib/ramaze/controller/resolve.rb +28 -1
data/lib/ramaze/dispatcher.rb +1 -1
data/lib/ramaze/dispatcher/file.rb +17 -0
data/lib/ramaze/global/globalstruct.rb +7 -4
data/lib/ramaze/helper/auth.rb +1 -1
data/lib/ramaze/helper/identity.rb +25 -15
data/lib/ramaze/helper/link.rb +29 -8
data/lib/ramaze/helper/maruku.rb +7 -0
data/lib/ramaze/helper/partial.rb +25 -10
data/lib/ramaze/route.rb +56 -0
data/lib/ramaze/snippets/metaid.rb +17 -0
data/lib/ramaze/spec/helper.rb +0 -2
data/lib/ramaze/spec/helper/mock_http.rb +6 -0
data/lib/ramaze/spec/helper/pretty_output.rb +5 -1
data/lib/ramaze/store/default.rb +3 -1
data/lib/ramaze/template.rb +1 -1
data/lib/ramaze/template/amrita2.rb +21 -15
data/lib/ramaze/template/bijou.rb +39 -0
data/lib/ramaze/template/builder.rb +28 -0
data/lib/ramaze/template/redcloth.rb +24 -0
data/lib/ramaze/template/sass.rb +3 -1
data/lib/ramaze/tool/create.rb +2 -1
data/lib/ramaze/tool/localize.rb +6 -1
data/lib/ramaze/trinity/request.rb +8 -0
data/lib/ramaze/trinity/session.rb +8 -5
data/lib/ramaze/version.rb +1 -1
data/rake_tasks/gem.rake +0 -1
data/rake_tasks/maintenance.rake +4 -1
data/spec/contrib/route.rb +14 -63
data/spec/examples/linking.rb +2 -2
data/spec/examples/templates/template_redcloth.rb +28 -0
data/spec/ramaze/controller/subclass.rb +21 -0
data/spec/ramaze/dispatcher/file.rb +31 -0
data/spec/ramaze/helper/link.rb +46 -0
data/spec/ramaze/helper/partial.rb +22 -1
data/spec/ramaze/helper/template/locals.xhtml +1 -0
data/spec/ramaze/helper/template/recursive_locals.xhtml +7 -0
data/spec/ramaze/params.rb +8 -0
data/spec/ramaze/request.rb +14 -0
data/spec/ramaze/route.rb +107 -0
data/spec/ramaze/session.rb +4 -2
data/spec/ramaze/template/amrita2.rb +21 -7
data/spec/ramaze/template/amrita2/external.amrita +6 -0
data/spec/ramaze/template/amrita2/sum.amrita +1 -1
data/spec/ramaze/template/bijou.rb +25 -0
data/spec/ramaze/template/builder.rb +55 -0
data/spec/ramaze/template/builder/external.rxml +3 -0
data/spec/ramaze/template/haml.rb +15 -0
data/spec/ramaze/template/haml/locals.haml +1 -0
data/spec/ramaze/template/redcloth.rb +38 -0
data/spec/ramaze/template/redcloth/external.redcloth +1 -0
metadata +472 -442
data/examples/rapaste/rapaste.sqlite +0 -0
data/spec/ramaze/template/amrita2/data.amrita +0 -6
data/spec/ramaze/template/amrita2/index.amrita +0 -1

data/examples/rapaste/{template → view}/list.xhtml RENAMED Viewed

@@ -7,9 +7,10 @@
     <div class="item">
       <div class="item_meta">
         <a href="/#{paste.id}">
-        <span class="syntax">#{paste.syntax_name}</span>
-        <span class="created">created #{time_diff(paste.created)} ago</span>
-      </a>
+          <span class="paste_id">#{paste.id}</span>
+          <span class="syntax">#{paste.syntax_name}</span>
+          <span class="created">created #{time_diff(paste.created)} ago</span>
+        </a>
       </div>
       <div class="fragment">#{paste.text_fragment(@style)}</div>
       <?r if paste.lines[11,1] ?>

data/examples/rapaste/view/search.xhtml ADDED Viewed

@@ -0,0 +1,41 @@
+<?r if @pastes ?>
+  <h3>Search Results</h3>
+  <?r if @pastes.empty? ?>
+    <div>
+      No pastes matched your search criteria.
+    </div>
+    <?r if Paste.empty? ?>
+    <p class="list_empty">
+      There are no pastes at all yet!  Go on and <a href="#{Rs(:/)}">Add one</a>.
+    </p>
+    <?r end ?>
+  <?r else ?>
+    <div id="list_head">
+      Total search results: #{@pastes.size}
+      <?r if @hit_limit ?>(maximum)<?r end ?>
+    </div>
+    <div class="list">
+      <?r @pastes.each do |paste| ?>
+        <div class="item">
+          <div class="item_meta">
+            <a href="/#{paste.id}">
+            <span class="syntax">#{paste.syntax_name}</span>
+            <span class="created">created #{time_diff(paste.created)} ago</span>
+          </a>
+          </div>
+          <div class="fragment">#{paste.text_fragment(@style)}</div>
+          <?r if paste.lines[11,1] ?>
+            <div class="more"><a href="/#{paste.id}">more...</a></div>
+          <?r else ?>
+            <div class="more"><a href="/#{paste.id}">show...</a></div>
+          <?r end ?>
+        </div>
+      <?r end ?>
+    </table>
+  <?r end ?>
+<?r end ?>

data/examples/rapaste/{template → view}/view.xhtml RENAMED Viewed

File without changes

data/examples/simple.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 # A very simple little application, you can simply run it and
@@ -54,3 +52,5 @@ class OtherController < Ramaze::Controller
     "Hello, World from #{self.class.name}"
   end
 end
+Ramaze.start

data/examples/templates/template/external.amrita CHANGED Viewed

@@ -3,17 +3,17 @@
     <title>Template::Amrita2 external</title>
   </head>
   <body>
-  <h1 id="title">Title</h1>
-    <a id="link_home">Home</a>
+  <h1 am:src="title" />
+    <%= link_home %>
     <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>
+      <%= link_one %><br />
+      <%= link_two %><br />
+      <%= link_three %>
     </p>
-    <div id="args">
-      *args
-    </div>
-    <div id="inspect_parameters"></div>
+    <<div<
+      <<:args<
+        <span><%= $_ %></span>
+    <%= inspect_parameters %>
   </body>
 </html>

data/examples/templates/template/external.redcloth ADDED Viewed

@@ -0,0 +1,19 @@
+h1. The <%= @place %> Template for RedCloth
+"Home":<%= Rs(:/) %>
+Here you can pass some stuff if you like, parameters are just passed like this:<br />
+"<%= @place %>/one":<%= Rs(@place, :one) %><br />
+"<%= @place %>/two/three":<%= Rs(@place, :two, :three) %><br />
+"<%= @place %>/one?foo=bar":<%= Rs(@place, :foo => :bar) %>
+The arguments you have passed to this action are:<br />
+<% if @args.empty? %>
+  none
+<% else %>
+  <% @args.each do |arg| %>
+    <span><%= arg %></span>
+  <% end %>
+<% end %>
+<%= request.params.inspect %>

data/examples/templates/template_amrita2.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 # TODO:
@@ -10,10 +8,45 @@ class MainController < Ramaze::Controller
   template_root __DIR__/:template
   engine :Amrita2
+  def index
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
+  end
+  def internal(*args)
+    @data = binding
+    @place = :internal
+    <<__AMRITA2__
+<html>
+  <head>
+    <title>Template::Amrita2 external</title>
+  </head>
+  <body>
+  <h1 am:src="title" />
+    <%= link_home %>
+    <p>
+      Here you can pass some stuff if you like, parameters are just passed like this:<br />
+      <%= link_one %><br />
+      <%= link_two %><br />
+      <%= link_three %>
+    </p>
+    <<div<
+      <<:args<
+        <span><%= $_ %></span>
+    <%= inspect_parameters %>
+  </body>
+</html>
+__AMRITA2__
+  end
+  def external(*args)
+    @data = binding
+    @place = :external
+  end
   private
   def title
-    "The external Template for Amrita2"
+    "The #{@place} Template for Amrita2"
   end
   def link_home
@@ -21,15 +54,15 @@ class MainController < Ramaze::Controller
   end
   def link_one
-    A('/external/one', :href => Rs(:external, :one))
+    A("/#{@place}/one", :href => Rs(@place, :one))
   end
   def link_two
-    A("/external/one/two/three", :href => Rs(:external, :one, :two, :three))
+    A("/#{@place}/one/two/three", :href => Rs(@place, :one, :two, :three))
   end
   def link_three
-    A("/external?foo=bar", :href => Rs(:external, :one, :foo => :bar))
+    A("/#{@place}?foo=bar", :href => Rs(@place, :one, :foo => :bar))
   end
   def inspect_parameters

data/examples/templates/template_erubis.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller
@@ -51,3 +49,5 @@ class MainController < Ramaze::Controller
     @place = :external
   end
 end
+Ramaze.start

data/examples/templates/template_ezamar.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller

data/examples/templates/template_haml.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller

data/examples/templates/template_liquid.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller
@@ -63,3 +61,5 @@ class MainController < Ramaze::Controller
     @hash = liquid_hash(:external, *args)
   end
 end
+Ramaze.start

data/examples/templates/template_markaby.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller

data/examples/templates/template_nagoro.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller

data/examples/templates/template_redcloth.rb ADDED Viewed

@@ -0,0 +1,59 @@
+require 'rubygems'
+require 'ramaze'
+class MainController < Ramaze::Controller
+  template_root __DIR__/:template
+  engine :RedCloth
+  layout :layout
+  def index
+    @place = :home
+    %{ #{A 'Home', :href => :/} | #{A(:internal)} | #{A(:external)} }
+  end
+  def internal(*args)
+    @place = :internal
+    @args = args
+    <<__REDCLOTH__
+h1. The <%= @place %> Template for RedCloth
+"Home":<%= Rs(:/) %>
+Here you can pass some stuff if you like, parameters are just passed like this:<br />
+"<%= @place %>/one":<%= Rs(@place, :one) %><br />
+"<%= @place %>/two/three":<%= Rs(@place, :two, :three) %><br />
+"<%= @place %>/one?foo=bar":<%= Rs(@place, :one, :foo => :bar) %>
+The arguments you have passed to this action are:<br />
+<% if @args.empty? %>
+  none
+<% else %>
+  <% @args.each do |arg| %>
+    <span><%= arg %></span>
+  <% end %>
+<% end %>
+<%= request.params.inspect %>
+__REDCLOTH__
+  end
+  def external(*args)
+    @place = :external
+    @args = args
+  end
+  def layout
+    <<__HTML__
+<html>
+  <head>
+    <title>Template::RedCloth <%= @place %></title>
+  </head>
+  <body>
+#{@content}
+  </body>
+</html>
+__HTML__
+  end
+end
+Ramaze.start

data/examples/templates/template_remarkably.rb CHANGED Viewed

@@ -1,6 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 class MainController < Ramaze::Controller

data/examples/templates/template_xslt.rb CHANGED Viewed

@@ -1,7 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
-#           Copyright (c) 2007  Stephan Maka  stephan@spaceboyz.net
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
 require 'ramaze/gestalt'

data/examples/todolist/src/controller/main.rb CHANGED Viewed

@@ -8,7 +8,7 @@
 #  map '/otherurl'
 # this will force the controller to be mounted on: /otherurl
-class MainController < Controller
+class MainController < Ramaze::Controller
   def index
     @tasks = []

data/examples/todolist/start.rb CHANGED Viewed

@@ -1,10 +1,9 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
+require 'rubygems'
 require 'ramaze'
-include Ramaze
 require 'src/controller/main'
 require 'src/element/page'
 require 'src/model'

data/examples/upload/start.rb ADDED Viewed

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'ramaze'
+class MainController < Ramaze::Controller
+  def index
+    return unless request.post?
+    @inspection = h(request.params.pretty_inspect)
+    tempfile, filename, @type =
+      request[:file].values_at(:tempfile, :filename, :type)
+    @extname, @basename = File.extname(filename), File.basename(filename)
+    @file_size = tempfile.size
+    FileUtils.move(tempfile.path, Ramaze::Global.public_root/@basename)
+    @is_image = @type.split('/').first == 'image'
+  end
+end
+Ramaze.start

data/examples/upload/view/index.xhtml ADDED Viewed

@@ -0,0 +1,25 @@
+<html>
+  <body>
+    <form method="POST" enctype="multipart/form-data">
+      Upload file: <input type="file" name="file" /><br />
+      <input type="submit" name="submit" value="Submit" />
+    </form>
+    <?r if @inspection ?>
+      <h3>#{@basename}</h3>
+      File size: #{@file_size} bytes
+      <?r if @is_image ?>
+        <h4>Uploaded Image</h4>
+        <img src="#{@basename}" alt="Uploaded Image"/><br/>
+      <?r else ?>
+        <p>You uploaded a #{@type} file.  Upload an image file to see it here.</p>
+      <?r end ?>
+      <h4>request.params.inspect:</h4>
+      <pre>#{@inspection}</pre>
+    <?r end ?>
+  </body>
+</html>

data/examples/whywiki/start.rb CHANGED Viewed

@@ -1,8 +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.
 # written as an example of how to implement the minimal _why wiki
+require 'rubygems'
 require 'ramaze'
 require 'bluecloth'

data/examples/wikore/start.rb CHANGED Viewed

@@ -1,6 +1,9 @@
+require 'rubygems'
 require 'ramaze'
 $wikore = {}
 require 'src/model'
 require 'src/controller'
+Ramaze.start

data/examples/wiktacular/mkd/newpagename/current.mkd ADDED Viewed

	@@ -0,0 +1 @@
1	+ first text

data/examples/wiktacular/mkd/newpagename/current.mkd.bak ADDED Viewed

	@@ -0,0 +1 @@
1	+ second text

data/examples/wiktacular/start.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'ramaze'
 require 'bluecloth'