ramaze 2009.04 → 2009.05

data/CHANGELOG

@@ -1,3 +1,171 @@
+[1719994 | Wed May 06 15:39:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.05
+
+[6025293 | Wed May 06 15:36:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * VERSION=xxx rake release:xxx
+
+[025d2f0 | Wed May 06 15:33:00 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * bring rakefile up to date
+
+[645a7e9 | Wed May 06 15:31:47 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Finally move readme to README.md
+
+[fe285e1 | Wed May 06 15:31:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove some useless stuff from the readme
+
+[9622f31 | Wed May 06 15:21:25 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Last minute changes to tasks
+
+[966fce3 | Wed May 06 12:38:55 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Object#constant since it collides with facets
+
+[1d9215a | Sun May 03 18:10:44 UTC 2009] Andreas Karlsson <andreas@proxel.se>
+
+  * Clean up benchmarking.
+
+    Clean up benchmarking a bit adding support for a mode switch,
+    which defaults to "live". Move "require 'ramaze'" to support
+    custom environments and killing the logging correctly.
+    
+    Also fix bug where Ramaze.start was run in one of the files
+    in the suite, and finally remove the unused --no-sessions.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[b8337e9 | Tue May 05 15:29:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some more non-serious fail
+
+[be9d471 | Tue May 05 14:23:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't use Binding#eval
+
+[b79699a | Tue May 05 06:13:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add comment about the state of serialization in Sequel
+
+[38a1f25 | Tue May 05 05:13:25 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make the sequel cache and the spec of sequel_form compatible with sequel 3.0.0
+
+[0a0553a | Mon May 04 16:39:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Chat examples uses Etanni, not Nagoro
+
+[5778a31 | Sat May 02 21:04:38 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * refactored bin code to lib/ramaze/tool/bin
+
+[b84b566 | Sun May 03 14:53:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Request::current is in Innate
+
+[53108b8 | Sat May 02 13:29:18 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * We don't rely on STATE anymore
+
+[8d2e57b | Sat May 02 14:09:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the benchmarks
+
+[2d5dda3 | Fri May 01 10:22:13 UTC 2009] Andreas Karlsson <andreas@proxel.se>
+
+  * Use faster method for erubis templates.
+
+    The evaluate method uses instance_eval on a cached proc instead of using
+    eval like the erb compatible result method does.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[cfd250c | Fri May 01 07:02:03 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Skip :install_dependencies until we figure out something better
+
+[1829f38 | Fri May 01 07:00:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Seems like a regression in rack-test...
+
+[09d6fa1 | Fri May 01 07:00:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the errors spec, it should run in :dev mode since :live has no ShowExceptions anymore
+
+[499c4ed | Fri May 01 06:55:57 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make RouteExceptions a little bit less verbose
+
+[a8c6383 | Fri May 01 06:55:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Give the other engines compile caching as well (where it makes sense)
+
+[81380cf | Fri May 01 05:49:55 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adapt gestalt spec to latest rack-test
+
+[e784317 | Fri May 01 05:43:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the helper/caching example
+
+[93a741b | Thu Apr 30 09:06:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use caching for Haml
+
+[47a6dec | Thu Apr 30 09:06:17 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Integrate View better with Innate
+
+[e86a143 | Thu Apr 30 07:57:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Split up Haml engine, prepare for caching
+
+[b2747cc | Wed Apr 29 09:33:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't use ShowExceptinos in live mode
+
+[552a4c3 | Tue Apr 28 17:52:34 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix RotatingInformer
+
+[2e53d6e | Tue Apr 28 04:50:27 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix the release tasks
+
+[e3c1418 | Tue Apr 28 04:49:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Give the paginator a count
+
+[a395c1c | Mon Apr 27 03:33:16 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Ultraviolet needs traited
+
+[a65aaad | Mon Apr 27 01:47:48 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Forward logging to Ramaze::Log by default
+
+[d0536fa | Sun Apr 26 12:21:41 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Add support Gestalt as another template engine.
+
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[37b2928 | Sun Apr 26 11:51:52 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Add gestalt to take text and attributes as arguments.
+
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[42e96b1 | Sat Apr 25 15:19:31 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04
+
 [8a0c6ac | Sat Apr 25 14:31:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Update dependencies

data/MANIFEST

@@ -1,8 +1,15 @@
 .mailmap
 CHANGELOG
 MANIFEST
-README.markdown
+README.md
 Rakefile
+benchmark/bench_templates/bench.rb
+benchmark/bench_templates/view/large.erb
+benchmark/bench_templates/view/large.haml
+benchmark/bench_templates/view/large.xhtml
+benchmark/bench_templates/view/small.erb
+benchmark/bench_templates/view/small.haml
+benchmark/bench_templates/view/small.xhtml
 benchmark/results.txt
 benchmark/run.rb
 benchmark/suite/minimal.rb
@@ -10,8 +17,8 @@ benchmark/suite/no_informer.rb
 benchmark/suite/no_sessions.rb
 benchmark/suite/no_template.rb
 benchmark/suite/simple.rb
-benchmark/suite/template_builder.rb
 benchmark/suite/template_erubis.rb
+benchmark/suite/template_etanni.rb
 benchmark/suite/template_ezamar.rb
 benchmark/suite/template_haml.rb
 benchmark/suite/template_liquid.rb
@@ -69,15 +76,15 @@ examples/app/blog/view/feed.atom.nag
 examples/app/blog/view/feed.rss.nag
 examples/app/blog/view/index.nag
 examples/app/blog/view/tag/index.nag
-examples/app/chat/layout/default.nag
+examples/app/chat/layout/default.xhtml
 examples/app/chat/model/history.rb
 examples/app/chat/model/message.rb
 examples/app/chat/public/css/chat.css
 examples/app/chat/public/js/chat.js
 examples/app/chat/public/js/jquery.js
 examples/app/chat/start.rb
-examples/app/chat/view/chat.nag
-examples/app/chat/view/index.nag
+examples/app/chat/view/chat.xhtml
+examples/app/chat/view/index.xhtml
 examples/app/localization/start.rb
 examples/app/sourceview/public/coderay.css
 examples/app/sourceview/public/images/file.gif
@@ -279,7 +286,6 @@ lib/ramaze/snippets/binding/locals.rb
 lib/ramaze/snippets/blankslate.rb
 lib/ramaze/snippets/divide.rb
 lib/ramaze/snippets/fiber.rb
-lib/ramaze/snippets/kernel/constant.rb
 lib/ramaze/snippets/kernel/pretty_inspect.rb
 lib/ramaze/snippets/metaid.rb
 lib/ramaze/snippets/numeric/filesize_format.rb
@@ -310,12 +316,14 @@ lib/ramaze/spec/helper/bacon.rb
 lib/ramaze/spec/helper/pretty_output.rb
 lib/ramaze/spec/helper/snippets.rb
 lib/ramaze/spec/helper/template_examples.rb
+lib/ramaze/tool/bin.rb
 lib/ramaze/tool/create.rb
 lib/ramaze/tool/project_creator.rb
 lib/ramaze/version.rb
 lib/ramaze/view.rb
 lib/ramaze/view/erubis.rb
 lib/ramaze/view/ezamar.rb
+lib/ramaze/view/gestalt.rb
 lib/ramaze/view/haml.rb
 lib/ramaze/view/liquid.rb
 lib/ramaze/view/maruku.rb
@@ -427,6 +435,8 @@ spec/ramaze/view/erubis/sum.rhtml
 spec/ramaze/view/ezamar.rb
 spec/ramaze/view/ezamar/external.zmr
 spec/ramaze/view/ezamar/sum.zmr
+spec/ramaze/view/gestalt.rb
+spec/ramaze/view/gestalt/external.ges
 spec/ramaze/view/haml.rb
 spec/ramaze/view/haml/external.haml
 spec/ramaze/view/haml/sum.haml

data/{README.markdown → README.md}

@@ -399,20 +399,6 @@ For help you can:
 - Join the Mailinglist at http://ramaze.rubyforge.org
 
 
-# Appendix
-
-* Performance
-  * Serving
-
-    For best performance you should consider using Mongrel to host your
-    application.
-
-  * Caching
-
-    You can easily cache your pages using the CacheHelper.
-    Also, using MemCache gives you high-end performance and security.
-
-
 # And thanks to...
 
 There is a large number of people who made Ramaze possibe by their ongoing

data/Rakefile

@@ -11,11 +11,11 @@ PROJECT_SPECS = FileList[
   'lib/proto/spec/*.rb'
 ]
 
-PROJECT_MODULE = 'Ramaze'
+PROJECT_MODULE      = 'Ramaze'
 PROJECT_JQUERY_FILE = 'lib/proto/public/js/jquery.js'
-PROJECT_README = 'README.markdown'
-PROJECT_RUBYFORGE_GROUP_ID = 3034
-PROJECT_COPYRIGHT = [
+PROJECT_README      = 'README.md'
+PROJECT_VERSION     = ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')
+PROJECT_COPYRIGHT   = [
   "#          Copyright (c) #{Time.now.year} Michael Fellinger m.fellinger@gmail.com",
   "# All files in this distribution are subject to the terms of the Ruby license."
 ]
@@ -31,30 +31,30 @@ GEMSPEC = Gem::Specification.new{|s|
   s.email        = 'm.fellinger@gmail.com'
   s.homepage     = 'http://github.com/manveru/org'
   s.platform     = Gem::Platform::RUBY
-  s.version      = (ENV['PROJECT_VERSION'] || Date.today.strftime("%Y.%m.%d"))
+  s.version      = PROJECT_VERSION
   s.files        = `git ls-files`.split("\n").sort
   s.has_rdoc     = true
   s.require_path = 'lib'
-  s.bindir = "bin"
-  s.executables = ["ramaze"]
+  s.bindir       = "bin"
+  s.executables  = ["ramaze"]
   s.rubyforge_project = "ramaze"
 
-  s.add_dependency('rack',   '= 1.0.0')
-  s.add_dependency('innate', '= 2009.04')
+  s.add_dependency('innate', '~> 2009.05')
 
-  # s.add_development_dependency('rack-test',  '>=0.1.0')
-  # s.add_development_dependency('json',       '>=1.1.3')
-  # s.add_development_dependency('erubis',     '>=2.6.4')
+  # rip those out if they cause you trouble
+  # s.add_development_dependency('rack-test',       '>=0.2.0')
+  # s.add_development_dependency('json',            '>=1.1.3')
+  # s.add_development_dependency('erubis',          '>=2.6.4')
   # s.add_development_dependency('ezamar')
-  # s.add_development_dependency('haml',       '~>2.0.9')
-  # s.add_development_dependency('hpricot',    '>=0.7')
-  # s.add_development_dependency('liquid',     '~>2.0.0')
-  # s.add_development_dependency('memcache',   '~>1.7.0')
+  # s.add_development_dependency('haml',            '~>2.0.9')
+  # s.add_development_dependency('hpricot',         '>=0.8.1')
+  # s.add_development_dependency('liquid',          '~>2.0.0')
+  # s.add_development_dependency('memcache-client', '~>1.7.2')
   # s.add_development_dependency('nagoro')
-  # s.add_development_dependency('Remarkably', '~>0.5.2')
-  # s.add_development_dependency('sequel',     '>=2.11.0')
-  # s.add_development_dependency('tagz',       '>=5.0.1')
-  # s.add_development_dependency('tenjin',     '~>0.6.1')
+  # s.add_development_dependency('Remarkably',      '~>0.5.2')
+  # s.add_development_dependency('sequel',          '= 3.0.0')
+  # s.add_development_dependency('tagz',            '>=5.0.1')
+  # s.add_development_dependency('tenjin',          '~>0.6.1')
 
   s.post_install_message = <<MESSAGE.strip
 ============================================================

data/benchmark/bench_templates/bench.rb

@@ -0,0 +1,67 @@
+require 'ramaze'
+
+class BenchCore < Ramaze::Controller
+  map '/'
+end
+
+Ramaze.start(:started => true)
+
+Innate::Log.loggers.clear
+
+require 'benchmark'
+
+Benchmark.bmbm(20) do |b|
+  n = 500
+  urls = ['/small', '/large']
+  engines = %w[Etanni Haml ERB]
+
+  urls.each do |url|
+    engines.each do |engine|
+      b.report("Unached %10s %p:" % [engine, url]) do
+        BenchCore.provide(:html, :engine => engine)
+        Innate::View.options.cache = false
+        n.times{ Innate::Mock.get(url) }
+      end
+
+      b.report("Cached %11s %p:" % [engine, url]) do
+        BenchCore.provide(:html, :engine => engine)
+        Innate::Cache.view.clear
+        Innate::View.options.cache = true
+        n.times{ Innate::Mock.get(url) }
+      end
+    end
+  end
+end
+
+__END__
+This benchmark is from Sat May  2 14:58:14 JST 2009
+n = 500
+
+Rehearsal ----------------------------------------------------------------
+Unached     Etanni "/small":   6.560000   0.490000   7.050000 (  7.138829)
+Cached      Etanni "/small":   6.370000   0.420000   6.790000 (  6.859946)
+Unached       Haml "/small":   8.680000   0.600000   9.280000 (  9.379500)
+Cached        Haml "/small":   6.830000   0.370000   7.200000 (  7.239311)
+Unached        ERB "/small":   8.980000   0.540000   9.520000 (  9.585725)
+Cached         ERB "/small":   6.470000   0.450000   6.920000 (  6.961339)
+Unached     Etanni "/large":   7.800000   0.490000   8.290000 (  8.338521)
+Cached      Etanni "/large":   7.480000   0.400000   7.880000 (  7.927069)
+Unached       Haml "/large":  11.970000   0.620000  12.590000 ( 12.645620)
+Cached        Haml "/large":   6.760000   0.490000   7.250000 (  7.296633)
+Unached        ERB "/large":  20.700000   1.000000  21.700000 ( 21.752810)
+Cached         ERB "/large":   7.590000   0.430000   8.020000 (  8.079993)
+----------------------------------------------------- total: 112.490000sec
+
+                                   user     system      total        real
+Unached     Etanni "/small":   6.450000   0.420000   6.870000 (  6.869656)
+Cached      Etanni "/small":   6.280000   0.420000   6.700000 (  6.702520)
+Unached       Haml "/small":   8.810000   0.510000   9.320000 (  9.343563)
+Cached        Haml "/small":   6.670000   0.450000   7.120000 (  7.125798)
+Unached        ERB "/small":   8.890000   0.540000   9.430000 (  9.450362)
+Cached         ERB "/small":   6.530000   0.400000   6.930000 (  6.942688)
+Unached     Etanni "/large":   7.830000   0.500000   8.330000 (  8.348678)
+Cached      Etanni "/large":   7.320000   0.470000   7.790000 (  7.798482)
+Unached       Haml "/large":  11.880000   0.630000  12.510000 ( 12.531796)
+Cached        Haml "/large":   6.870000   0.410000   7.280000 (  7.298600)
+Unached        ERB "/large":  20.570000   0.930000  21.500000 ( 21.523399)
+Cached         ERB "/large":   7.560000   0.430000   7.990000 (  7.999896)

data/benchmark/bench_templates/view/large.erb

@@ -0,0 +1,79 @@
+<html>
+  <head>
+    <title>
+      <% if @title %>
+        <%= @title %>
+      <% end %>
+    </title>
+  </head>
+  <body>
+    <h1>
+      <% if @h1 %>
+        <%= @h1 %>
+      <% end %>
+    </h1>
+    <div>
+      <% if @v1 %>
+        <% if @v2 %>
+          <% if @v3 %>
+            <% if @v4 %>
+              <% if @v5 %>
+                <% if @v6 %>
+                  <% if @v7 %>
+                    <% if @v8 %>
+                      <% if @v9 %>
+                        <% if @v10 %>
+                          <% if @v11 %>
+                            <% if @v12 %>
+                              <% if @v13 %>
+                                <% if @v14 %>
+                                  <% if @v15 %>
+                                    <% if @v16 %>
+                                      <% if @v17 %>
+                                        <% if @v18 %>
+                                          <% if @v19 %>
+                                            <% if @v20 %>
+                                              <% if @v21 %>
+                                                <% if @v22 %>
+                                                  <% if @v23 %>
+                                                    <% if @v24 %>
+                                                      <% if @v25 %>
+                                                        <% if @v26 %>
+                                                          <% if @v27 %>
+                                                            <% if @v28 %>
+                                                              <% if @v29 %>
+                                                                <% if @v30 %>
+                                                                  <%= stuff %>
+                                                                <% end %>
+                                                              <% end %>
+                                                            <% end %>
+                                                          <% end %>
+                                                        <% end %>
+                                                      <% end %>
+                                                    <% end %>
+                                                  <% end %>
+                                                <% end %>
+                                              <% end %>
+                                            <% end %>
+                                          <% end %>
+                                        <% end %>
+                                      <% end %>
+                                    <% end %>
+                                  <% end %>
+                                <% end %>
+                              <% end %>
+                            <% end %>
+                          <% end %>
+                        <% end %>
+                      <% end %>
+                    <% end %>
+                  <% end %>
+                <% end %>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </body>
+</html>