RubyGems - Pistos-ramaze - Versions diffs - 2009.04.08 → 2009.06.12 - Mend

Pistos-ramaze 2009.04.08 → 2009.06.12

Files changed (227) hide show

data/.gitignore +3 -0
data/MANIFEST +37 -22
data/{README.markdown → README.md} +5 -24
data/Rakefile +33 -26
data/benchmark/bench_templates/bench.rb +67 -0
data/benchmark/bench_templates/view/large.erb +79 -0
data/benchmark/bench_templates/view/large.haml +41 -0
data/benchmark/bench_templates/view/large.xhtml +79 -0
data/benchmark/bench_templates/view/small.erb +21 -0
data/benchmark/bench_templates/view/small.haml +12 -0
data/benchmark/bench_templates/view/small.xhtml +21 -0
data/benchmark/run.rb +14 -21
data/benchmark/suite/minimal.rb +3 -5
data/benchmark/suite/no_informer.rb +0 -2
data/benchmark/suite/no_sessions.rb +3 -4
data/benchmark/suite/no_template.rb +1 -3
data/benchmark/suite/simple.rb +1 -3
data/benchmark/suite/template_erubis.rb +0 -2
data/benchmark/suite/template_etanni.rb +8 -0
data/benchmark/suite/template_ezamar.rb +1 -3
data/benchmark/suite/template_haml.rb +0 -2
data/benchmark/suite/template_liquid.rb +0 -2
data/benchmark/suite/template_markaby.rb +0 -2
data/benchmark/suite/template_nagoro.rb +1 -3
data/benchmark/suite/template_redcloth.rb +0 -2
data/benchmark/suite/template_tenjin.rb +0 -2
data/bin/ramaze +11 -163
data/doc/AUTHORS +15 -8
data/doc/CHANGELOG +10094 -12262
data/doc/meta/announcement.txt +93 -46
data/doc/tutorial/todolist.html +22 -58
data/doc/tutorial/todolist.txt +20 -39
data/examples/app/auth/layout/{auth.nag → auth.xhtml} +0 -0
data/examples/app/auth/view/{index.nag → index.xhtml} +0 -0
data/examples/app/auth/view/{login.nag → login.xhtml} +0 -0
data/examples/app/auth/view/{secret.nag → secret.xhtml} +0 -0
data/examples/app/blog/app.rb +1 -1
data/examples/app/blog/controller/comment.rb +1 -1
data/examples/app/blog/controller/entry.rb +12 -3
data/examples/app/blog/model/init.rb +5 -0
data/examples/app/blog/model/tag.rb +2 -2
data/examples/app/blog/view/entry/index.nag +3 -3
data/examples/app/blog/view/feed.atom.nag +1 -1
data/examples/app/blog/view/feed.rss.nag +1 -1
data/examples/app/blog/view/index.nag +1 -1
data/examples/app/blog/view/tag/index.nag +1 -1
data/examples/app/chat/layout/{default.nag → default.xhtml} +0 -0
data/examples/app/chat/view/{chat.nag → chat.xhtml} +0 -0
data/examples/app/chat/view/{index.nag → index.xhtml} +0 -0
data/examples/app/localization/locale/de.yaml +5 -0
data/examples/app/localization/locale/en.yaml +5 -0
data/examples/app/localization/locale/ja.yaml +5 -0
data/examples/app/localization/start.rb +33 -20
data/examples/app/wikore/spec/wikore.rb +4 -6
data/examples/app/wikore/src/controller.rb +9 -11
data/examples/app/wikore/src/model.rb +7 -10
data/examples/app/wikore/start.rb +1 -1
data/examples/app/wikore/{template → view}/index.xhtml +0 -0
data/examples/helpers/cache.rb +6 -4
data/examples/misc/css.rb +6 -12
data/examples/misc/rapp.rb +28 -17
data/lib/proto/app.rb +14 -0
data/lib/proto/config.ru +8 -5
data/lib/proto/controller/init.rb +3 -3
data/lib/proto/spec/main.rb +9 -11
data/lib/proto/start.rb +6 -10
data/lib/ramaze.rb +8 -9
data/lib/ramaze/app.rb +4 -3
data/lib/ramaze/cache/localmemcache.rb +2 -2
data/lib/ramaze/cache/memcache.rb +26 -1
data/lib/ramaze/cache/sequel.rb +24 -9
data/lib/ramaze/contrib/addressable_route.rb +56 -0
data/lib/ramaze/contrib/email.rb +2 -0
data/lib/ramaze/contrib/facebook/facebook.rb +4 -4
data/lib/ramaze/contrib/sequel/create_join.rb +1 -0
data/lib/ramaze/contrib/sequel/form_field.rb +4 -4
data/lib/ramaze/contrib/sequel/image.rb +9 -11
data/lib/ramaze/contrib/sequel/relation.rb +17 -3
data/lib/ramaze/controller.rb +26 -18
data/lib/ramaze/gestalt.rb +4 -1
data/lib/ramaze/helper.rb +1 -0
data/lib/ramaze/helper/auth.rb +0 -5
data/lib/ramaze/helper/cache.rb +65 -25
data/lib/ramaze/helper/form.rb +14 -2
data/lib/ramaze/helper/formatting.rb +3 -1
data/lib/ramaze/helper/gestalt.rb +32 -0
data/lib/ramaze/helper/identity.rb +3 -3
data/lib/ramaze/helper/layout.rb +97 -0
data/lib/ramaze/helper/link.rb +6 -25
data/lib/ramaze/helper/localize.rb +13 -3
data/lib/ramaze/helper/paginate.rb +4 -2
data/lib/ramaze/helper/ultraviolet.rb +2 -0
data/lib/ramaze/helper/user.rb +3 -3
data/lib/ramaze/log/rotatinginformer.rb +10 -10
data/lib/ramaze/request.rb +3 -5
data/lib/ramaze/setup.rb +22 -9
data/lib/ramaze/spec.rb +8 -12
data/lib/ramaze/spec/bacon.rb +34 -0
data/lib/ramaze/spec/helper/template_examples.rb +15 -22
data/lib/ramaze/tool/bin.rb +340 -0
data/lib/ramaze/tool/project_creator.rb +1 -1
data/lib/ramaze/version.rb +1 -1
data/lib/ramaze/view.rb +6 -11
data/lib/ramaze/view/erubis.rb +2 -2
data/lib/ramaze/view/ezamar.rb +2 -2
data/lib/ramaze/view/gestalt.rb +14 -0
data/lib/ramaze/view/haml.rb +2 -1
data/lib/ramaze/view/liquid.rb +45 -11
data/lib/ramaze/view/maruku.rb +2 -1
data/lib/ramaze/view/nagoro/render_partial.rb +9 -9
data/lib/ramaze/view/sass.rb +1 -1
data/lib/ramaze/view/tenjin.rb +7 -4
data/lib/vendor/etag.rb +4 -2
data/lib/vendor/route_exceptions.rb +9 -15
data/ramaze.gemspec +56 -9
data/spec/contrib/addressable_route.rb +30 -0
data/spec/contrib/rest.rb +2 -2
data/spec/examples/caching.rb +5 -7
data/spec/examples/css.rb +3 -3
data/spec/examples/element.rb +4 -3
data/spec/examples/hello.rb +3 -3
data/spec/examples/helpers/httpdigest.rb +44 -69
data/spec/examples/linking.rb +3 -3
data/spec/examples/simple.rb +3 -3
data/spec/examples/templates/template_erubis.rb +8 -4
data/spec/examples/templates/template_ezamar.rb +9 -4
data/spec/examples/templates/template_haml.rb +8 -4
data/spec/examples/templates/template_liquid.rb +8 -4
data/spec/examples/templates/template_markaby.rb +9 -5
data/spec/examples/templates/template_nagoro.rb +9 -5
data/spec/examples/templates/template_redcloth.rb +8 -4
data/spec/examples/templates/template_remarkably.rb +8 -4
data/spec/examples/templates/template_tenjin.rb +8 -4
data/spec/helper.rb +1 -2
data/spec/ramaze/action/render.rb +4 -1
data/spec/ramaze/app.rb +5 -2
data/spec/ramaze/bin/ramaze.rb +96 -0
data/spec/ramaze/cache/localmemcache.rb +1 -1
data/spec/ramaze/cache/memcache.rb +7 -1
data/spec/ramaze/cache/sequel.rb +1 -1
data/spec/ramaze/controller/actionless_templates.rb +2 -2
data/spec/ramaze/controller/lonely_mapping.rb +18 -0
data/spec/ramaze/controller/mapping.rb +4 -15
data/spec/ramaze/controller/provide_inheritance.rb +5 -2
data/spec/ramaze/controller/resolve.rb +2 -2
data/spec/ramaze/controller/subclass.rb +2 -2
data/spec/ramaze/controller/template_resolving.rb +2 -2
data/spec/ramaze/dispatcher/directory.rb +5 -2
data/spec/ramaze/dispatcher/file.rb +28 -26
data/spec/ramaze/error.rb +3 -3
data/spec/ramaze/files.rb +5 -2
data/spec/ramaze/gestalt.rb +26 -17
data/spec/ramaze/helper/auth.rb +30 -41
data/spec/ramaze/helper/bench.rb +6 -2
data/spec/ramaze/helper/cache.rb +45 -5
data/spec/ramaze/helper/flash.rb +11 -15
data/spec/ramaze/helper/form.rb +6 -3
data/spec/ramaze/helper/formatting.rb +4 -1
data/spec/ramaze/helper/gestalt.rb +4 -1
data/spec/ramaze/helper/gravatar.rb +4 -1
data/spec/ramaze/helper/httpdigest.rb +51 -66
data/spec/ramaze/helper/layout.rb +79 -0
data/spec/ramaze/helper/layout/default.xhtml +5 -0
data/spec/ramaze/helper/link.rb +33 -12
data/spec/ramaze/helper/localize.rb +9 -4
data/spec/ramaze/helper/maruku.rb +5 -2
data/spec/ramaze/helper/pager.rb +2 -2
data/spec/ramaze/helper/paginate.rb +5 -2
data/spec/ramaze/helper/request_accessor.rb +5 -2
data/spec/ramaze/helper/sequel_form.rb +7 -2
data/spec/ramaze/helper/simple_captcha.rb +10 -14
data/spec/ramaze/helper/stack.rb +32 -40
data/spec/ramaze/helper/user.rb +19 -14
data/spec/ramaze/helper/xhtml.rb +4 -1
data/spec/ramaze/log/informer.rb +1 -1
data/spec/ramaze/log/logging.rb +4 -1
data/spec/ramaze/log/syslog.rb +6 -6
data/spec/ramaze/params.rb +5 -6
data/spec/ramaze/request.rb +16 -1
data/spec/ramaze/session/memcache.rb +66 -0
data/spec/ramaze/struct.rb +4 -1
data/spec/ramaze/view.rb +2 -2
data/spec/ramaze/view/erubis.rb +2 -2
data/spec/ramaze/view/ezamar.rb +2 -2
data/spec/ramaze/view/gestalt.rb +94 -0
data/spec/ramaze/view/gestalt/external.ges +8 -0
data/spec/ramaze/view/haml.rb +2 -2
data/spec/ramaze/view/liquid.rb +2 -2
data/spec/ramaze/view/nagoro.rb +2 -2
data/spec/ramaze/view/redcloth.rb +2 -2
data/spec/ramaze/view/remarkably.rb +2 -2
data/spec/ramaze/view/sass.rb +2 -2
data/spec/ramaze/view/tagz.rb +2 -2
data/spec/ramaze/view/tenjin.rb +2 -2
data/spec/snippets/array/put_within.rb +30 -25
data/spec/snippets/binding/locals.rb +4 -1
data/spec/snippets/numeric/filesize_format.rb +4 -1
data/spec/snippets/numeric/time.rb +5 -2
data/spec/snippets/object/__dir__.rb +4 -1
data/spec/snippets/ordered_set.rb +4 -1
data/spec/snippets/ramaze/acquire.rb +4 -1
data/spec/snippets/ramaze/dictionary.rb +4 -1
data/spec/snippets/ramaze/struct.rb +4 -1
data/spec/snippets/string/camel_case.rb +4 -1
data/spec/snippets/string/color.rb +4 -1
data/spec/snippets/string/snake_case.rb +4 -1
data/spec/snippets/string/unindent.rb +4 -1
data/spec/snippets/thread/into.rb +4 -1
data/tasks/bacon.rake +5 -3
data/tasks/changelog.rake +3 -1
data/tasks/{gem_installer.rake → gem_setup.rake} +45 -22
data/tasks/release.rake +12 -27
data/tasks/setup.rake +6 -0
data/tasks/todo.rake +2 -4
metadata +205 -31
data/CHANGELOG +0 -16546
data/benchmark/suite/template_builder.rb +0 -12
data/doc/tutorial/todolist.mkd +0 -787
data/examples/helpers/provide.rb +0 -23
data/lib/proto/view/page.xhtml +0 -27
data/lib/ramaze/snippets/divide.rb +0 -22
data/lib/ramaze/snippets/kernel/constant.rb +0 -41
data/lib/ramaze/snippets/object/acquire.rb +0 -37
data/lib/ramaze/snippets/string/each.rb +0 -19
data/spec/ramaze/helper/partial.rb +0 -40
data/spec/snippets/kernel/constant.rb +0 -23
data/tasks/install_dependencies.rake +0 -6

data/benchmark/bench_templates/view/large.erb ADDED

@@ -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>

data/benchmark/bench_templates/view/large.haml ADDED

@@ -0,0 +1,41 @@
+%html
+  %head
+    %title
+      - if @title
+        = @title
+  %body
+    %h1
+      - if @h1
+        = @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

data/benchmark/bench_templates/view/large.xhtml ADDED

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

data/benchmark/bench_templates/view/small.erb ADDED

@@ -0,0 +1,21 @@
+<html>
+  <head>
+    <title>
+      <% if @title %>
+        <%= @title %>
+      <% end %>
+    </title>
+  </head>
+  <body>
+    <h1>
+      <% if @h1 %>
+        <%= @h1 %>
+      <% end %>
+    </h1>
+    <div>
+      <% if @div %>
+        <%= @div %>
+      <% end %>
+    </div>
+  </body>
+</html>

data/benchmark/bench_templates/view/small.haml ADDED

@@ -0,0 +1,12 @@
+%html
+  %head
+    %title
+      - if @title
+        = @title
+  %body
+    %h1
+      - if @h1
+        = @h1
+    %div
+      - if @div
+        = @div

data/benchmark/bench_templates/view/small.xhtml ADDED

@@ -0,0 +1,21 @@
+<html>
+  <head>
+    <title>
+      <?r if @title ?>
+        #{@title}
+      <?r end ?>
+    </title>
+  </head>
+  <body>
+    <h1>
+      <?r if @h1 ?>
+        #{@h1}
+      <?r end ?>
+    </h1>
+    <div>
+      <?r if @div ?>
+        #{@div}
+      <?r end ?>
+    </div>
+  </body>
+</html>

data/benchmark/run.rb CHANGED

@@ -144,8 +144,8 @@ class RamazeBenchmark
   end
   attr_accessor :requests, :adapters, :port, :log, :display_code, :target
-  attr_accessor :concurrent, :paths, :benchmarker, :informer, :sessions
-  attr_accessor :show_log, :ignored_tags, :formats
+  attr_accessor :concurrent, :paths, :benchmarker, :informer
+  attr_accessor :mode, :show_log, :formats
   def initialize()
     @adapters = [:webrick]
@@ -157,10 +157,9 @@ class RamazeBenchmark
     @paths = ["/"]
     @target = /.+/
     @informer = true
-    @sessions = true
-    @ignored_tags = [:debug, :dev]
     @formats = ["text"]
     @writers = []
+    @mode = :live
     yield self
   end
@@ -175,8 +174,8 @@ class RamazeBenchmark
     end
     # benchmarks
-    __DIR__ = File.expand_path(File.dirname(__FILE__))
-    Dir[__DIR__('suite/*.rb')].each do |filename|
+    glob = File.expand_path('../suite/*.rb', __FILE__)
+    Dir.glob(glob) do |filename|
       @adapters.each do |adapter|
         @paths.each do |path|
           benchmark(filename, adapter, path) if @target.match(filename)
@@ -199,7 +198,6 @@ class RamazeBenchmark
     l :Concurrent, @concurrent
     l :Path,       path
     l :Informer,   @informer
-    l :Sessions,   @sessions
     if @display_code
       l :Code, "<code ruby>\n#{File.read(filename)}\n</code>\n\n"
     end
@@ -248,17 +246,17 @@ class RamazeBenchmark
   def ramaze(filename, adapter)
     pid = fork do
       begin
-        require filename
-        Ramaze::Log.ignored_tags = @ignored_tags
+        require 'ramaze'
+        Ramaze.options.mode = @mode
         if @informer
           unless @show_log
-            Ramaze::Log.loggers = [Ramaze::Logging::Logger::Informer.new("/dev/null")]
+            require 'ramaze/log/informer'
+            Ramaze::Log.loggers = [Ramaze::Logger::Informer.new("/dev/null")]
           end
         else
           Ramaze::Log.loggers = []
         end
-        Ramaze::Global.sessions = @sessions
-        Ramaze::Global.sourcereload = false
+        require filename
         Ramaze.start :adapter => adapter, :port => @port
       rescue LoadError => ex; l :Error, ex; end
     end
@@ -324,23 +322,18 @@ RamazeBenchmark.new do |bm|
       bm.paths = paths.split(",")
     end
-    opt.on('--no-informer', 'Disable informer') do
-      bm.informer = false
+    opt.on('--mode MODE', '[live] Ramaze mode') do |mode|
+      bm.mode = mode.to_sym
     end
-    opt.on('--ignored-tags TAGS',
-           '[debug,dev] Specify ignored tags for Ramaze::Log') do |tags|
-      bm.ignored_tags = tags.split(",").map{|e| e.to_sym }
+    opt.on('--no-informer', 'Disable informer') do
+      bm.informer = false
     end
     opt.on('--show-log', 'Show log') do
       bm.show_log = true
     end
-    opt.on('--no-sessions', 'Disable sessions') do
-      bm.sessions = false
-    end
     opt.on('--target REGEXP',
            '[/.+/] Specify benchmark scripts to measure') do |name|
       bm.target = Regexp.compile(name)

data/benchmark/suite/minimal.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :None
@@ -8,6 +6,6 @@ class MainController < Ramaze::Controller
   end
 end
-Ramaze::Global.sourcereload = false
-Ramaze::Global.sessions = false
-Ramaze::Log.loggers = []
+Ramaze.middleware!(:bench){|m| m.run(Ramaze::AppMap) }
+Ramaze.options.mode = :bench
+Ramaze::Log.loggers.clear

data/benchmark/suite/no_informer.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   def index
     "Hello, World!"

data/benchmark/suite/no_sessions.rb CHANGED

@@ -1,10 +1,9 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   def index
     "Hello, World!"
   end
 end
-Ramaze::Log.loggers = []
-Ramaze::Global.sessions = false
+Ramaze.middleware!(:nosessions){|m| m.run(Ramaze::AppMap) }
+Ramaze.options.mode = :nosessions
+Ramaze::Log.loggers.clear

data/benchmark/suite/no_template.rb CHANGED

@@ -1,9 +1,7 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :None
   def index
     "Hello, World!"
   end
-end
+end

data/benchmark/suite/simple.rb CHANGED

@@ -1,7 +1,5 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   def index
     "Hello, World!"
   end
-end
+end

data/benchmark/suite/template_erubis.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Erubis

data/benchmark/suite/template_etanni.rb ADDED

@@ -0,0 +1,8 @@
+class MainController < Ramaze::Controller
+  engine :Etanni
+  def index
+    @hello = "Hello, World!"
+    '<html><body><?r 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
+  end
+end

data/benchmark/suite/template_ezamar.rb CHANGED

@@ -1,10 +1,8 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Ezamar
   def index
     @hello = "Hello, World!"
-    '<html><body><? 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
+    '<html><body><?r 10.times do ?><span>#{@hello}</span><?r end ?></body></html>'
   end
 end

data/benchmark/suite/template_haml.rb CHANGED

@@ -1,5 +1,3 @@
-require 'ramaze'
 class MainController < Ramaze::Controller
   engine :Haml