Pistos-ramaze 2009.04.08 → 2009.06.12

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+.yardoc
+ydoc

data/MANIFEST

@@ -1,8 +1,15 @@
+.gitignore
 .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
@@ -34,13 +41,12 @@ doc/meta/configuration.txt
 doc/meta/internals.txt
 doc/meta/users.kml
 doc/tutorial/todolist.html
-doc/tutorial/todolist.mkd
 doc/tutorial/todolist.txt
-examples/app/auth/layout/auth.nag
+examples/app/auth/layout/auth.xhtml
 examples/app/auth/start.rb
-examples/app/auth/view/index.nag
-examples/app/auth/view/login.nag
-examples/app/auth/view/secret.nag
+examples/app/auth/view/index.xhtml
+examples/app/auth/view/login.xhtml
+examples/app/auth/view/secret.xhtml
 examples/app/blog/README
 examples/app/blog/app.rb
 examples/app/blog/config.ru
@@ -69,15 +75,18 @@ 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/locale/de.yaml
+examples/app/localization/locale/en.yaml
+examples/app/localization/locale/ja.yaml
 examples/app/localization/start.rb
 examples/app/sourceview/public/coderay.css
 examples/app/sourceview/public/images/file.gif
@@ -113,7 +122,7 @@ examples/app/wikore/spec/wikore.rb
 examples/app/wikore/src/controller.rb
 examples/app/wikore/src/model.rb
 examples/app/wikore/start.rb
-examples/app/wikore/template/index.xhtml
+examples/app/wikore/view/index.xhtml
 examples/app/wiktacular/README
 examples/app/wiktacular/mkd/link/2007-07-20_19-45-51.mkd
 examples/app/wiktacular/mkd/link/current.mkd
@@ -153,7 +162,6 @@ examples/helpers/httpdigest.rb
 examples/helpers/identity.rb
 examples/helpers/nitro_form.rb
 examples/helpers/paginate.rb
-examples/helpers/provide.rb
 examples/helpers/rest.rb
 examples/helpers/simple_captcha.rb
 examples/misc/css.rb
@@ -182,6 +190,7 @@ examples/templates/view/external.rem
 examples/templates/view/external.rhtml
 examples/templates/view/external.tenjin
 examples/templates/view/external.zmr
+lib/proto/app.rb
 lib/proto/config.ru
 lib/proto/controller/init.rb
 lib/proto/controller/main.rb
@@ -196,13 +205,13 @@ lib/proto/public/ramaze.png
 lib/proto/spec/main.rb
 lib/proto/start.rb
 lib/proto/view/index.xhtml
-lib/proto/view/page.xhtml
 lib/ramaze.rb
 lib/ramaze/app.rb
 lib/ramaze/cache.rb
 lib/ramaze/cache/localmemcache.rb
 lib/ramaze/cache/memcache.rb
 lib/ramaze/cache/sequel.rb
+lib/ramaze/contrib/addressable_route.rb
 lib/ramaze/contrib/app_graph.rb
 lib/ramaze/contrib/email.rb
 lib/ramaze/contrib/facebook.rb
@@ -236,6 +245,7 @@ lib/ramaze/helper/gestalt.rb
 lib/ramaze/helper/gravatar.rb
 lib/ramaze/helper/httpdigest.rb
 lib/ramaze/helper/identity.rb
+lib/ramaze/helper/layout.rb
 lib/ramaze/helper/link.rb
 lib/ramaze/helper/localize.rb
 lib/ramaze/helper/markaby.rb
@@ -278,15 +288,12 @@ lib/ramaze/snippets.rb
 lib/ramaze/snippets/array/put_within.rb
 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
 lib/ramaze/snippets/numeric/time.rb
 lib/ramaze/snippets/object/__dir__.rb
-lib/ramaze/snippets/object/acquire.rb
 lib/ramaze/snippets/object/instance_variable_defined.rb
 lib/ramaze/snippets/object/pretty.rb
 lib/ramaze/snippets/object/scope.rb
@@ -299,7 +306,6 @@ lib/ramaze/snippets/ramaze/fiber.rb
 lib/ramaze/snippets/ramaze/struct.rb
 lib/ramaze/snippets/string/camel_case.rb
 lib/ramaze/snippets/string/color.rb
-lib/ramaze/snippets/string/each.rb
 lib/ramaze/snippets/string/end_with.rb
 lib/ramaze/snippets/string/esc.rb
 lib/ramaze/snippets/string/ord.rb
@@ -308,16 +314,19 @@ lib/ramaze/snippets/string/start_with.rb
 lib/ramaze/snippets/string/unindent.rb
 lib/ramaze/snippets/thread/into.rb
 lib/ramaze/spec.rb
+lib/ramaze/spec/bacon.rb
 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
@@ -331,6 +340,7 @@ lib/ramaze/view/tenjin.rb
 lib/vendor/etag.rb
 lib/vendor/route_exceptions.rb
 ramaze.gemspec
+spec/contrib/addressable_route.rb
 spec/contrib/rest.rb
 spec/examples/caching.rb
 spec/examples/css.rb
@@ -358,10 +368,12 @@ spec/ramaze/action/view/single_wrapper.xhtml
 spec/ramaze/action/view/sub/sub_wrapper.erb
 spec/ramaze/action/view/sub/sub_wrapper.xhtml
 spec/ramaze/app.rb
+spec/ramaze/bin/ramaze.rb
 spec/ramaze/cache/localmemcache.rb
 spec/ramaze/cache/memcache.rb
 spec/ramaze/cache/sequel.rb
 spec/ramaze/controller/actionless_templates.rb
+spec/ramaze/controller/lonely_mapping.rb
 spec/ramaze/controller/mapping.rb
 spec/ramaze/controller/provide_inheritance.rb
 spec/ramaze/controller/resolve.rb
@@ -392,12 +404,13 @@ spec/ramaze/helper/formatting.rb
 spec/ramaze/helper/gestalt.rb
 spec/ramaze/helper/gravatar.rb
 spec/ramaze/helper/httpdigest.rb
+spec/ramaze/helper/layout.rb
+spec/ramaze/helper/layout/default.xhtml
 spec/ramaze/helper/link.rb
 spec/ramaze/helper/localize.rb
 spec/ramaze/helper/maruku.rb
 spec/ramaze/helper/pager.rb
 spec/ramaze/helper/paginate.rb
-spec/ramaze/helper/partial.rb
 spec/ramaze/helper/request_accessor.rb
 spec/ramaze/helper/sequel_form.rb
 spec/ramaze/helper/simple_captcha.rb
@@ -421,6 +434,7 @@ spec/ramaze/public/ramaze.png
 spec/ramaze/public/test_download.css
 spec/ramaze/request.rb
 spec/ramaze/rewrite/file.css
+spec/ramaze/session/memcache.rb
 spec/ramaze/struct.rb
 spec/ramaze/template/ramaze/external.test
 spec/ramaze/view.rb
@@ -430,6 +444,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
@@ -454,7 +470,6 @@ spec/ramaze/view/tenjin/external.rbhtml
 spec/ramaze/view/tenjin/sum.rbhtml
 spec/snippets/array/put_within.rb
 spec/snippets/binding/locals.rb
-spec/snippets/kernel/constant.rb
 spec/snippets/numeric/filesize_format.rb
 spec/snippets/numeric/time.rb
 spec/snippets/object/__dir__.rb
@@ -472,16 +487,16 @@ tasks/bacon.rake
 tasks/changelog.rake
 tasks/copyright.rake
 tasks/gem.rake
-tasks/gem_installer.rake
+tasks/gem_setup.rake
 tasks/git.rake
 tasks/grancher.rake
-tasks/install_dependencies.rake
 tasks/jquery.rake
 tasks/manifest.rake
 tasks/metric_changes.rake
 tasks/rcov.rake
 tasks/release.rake
 tasks/reversion.rake
+tasks/setup.rake
 tasks/todo.rake
 tasks/traits.rake
 tasks/yard.rake

data/{README.markdown → README.md}

@@ -13,7 +13,7 @@ give you the ultimate tools, but you have to use them yourself to achieve
 perfect custom-tailored results.
 
 Another one of the goals during development of Ramaze was to make every part as
-modular and therefor reuasable as possible, not only to provide a basic
+modular and therefor reusable as possible, not only to provide a basic
 understanding after the first glance, but also to make it as simple as possible
 to reuse parts of the code.
 
@@ -136,11 +136,6 @@ Ramaze offers following features at the moment:
 
       Wrapping the functionality of Ramazes logging facilities.
 
-    * Markaby
-
-      Allows you to use Markaby in your Controller without having it as the
-      default templating engine.
-
     * Nitroform
 
       Hooks up on nitros form builder to help you creating forms from Og
@@ -241,7 +236,7 @@ There are some basic principles that Ramaze tries to follow:
 
       $ gem install ramaze
 
-  Versions are made as we see fit and get an announcment out (usually that's
+  Versions are made as we see fit and get an announcement out (usually that's
   the major obstacle as there is a lot to announce).
 
   If you want to install the nightly gem of Ramaze you can do this with:
@@ -279,7 +274,7 @@ There are some basic principles that Ramaze tries to follow:
 
         $ export RUBYLIB="$HOME/ruby/ramaze/lib:$HOME/.site_ruby:$HOME/ruby/bacon/lib"
 
-  * use `require 'ramaze'` systemwide from everywhere
+  * use `require 'ramaze'` system wide from everywhere
 
     add a file to your `site_ruby` directory named 'ramaze.rb'
     the content should be: `require '/path/to/git/repo/ramaze/lib/ramaze'`
@@ -399,23 +394,9 @@ For help you can:
 - Join the Mailinglist at http://groups.google.com/group/ramaze
 
 
-# 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
+There is a large number of people who made Ramaze possible by their ongoing
 efforts in the world of open source and by encouraging and helping me.
 
 This list is by no means a full listing of all these people, but I try to
@@ -427,7 +408,7 @@ I would like to thank:
 
     For giving the world Ruby and bringing fun back into programming.
 
-* Zed Shawn a.k.a. zedas
+* Zed Shaw a.k.a. zedas
 
     For developing Mongrel, Ramaze started out as a simple Hello World based
     on that awesome server.

data/Rakefile

@@ -6,18 +6,22 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-PROJECT_SPECS = Dir['spec/{contrib,examples,ramaze,snippets}/**/*.rb']
-PROJECT_MODULE = 'Ramaze'
+PROJECT_SPECS = FileList[
+  'spec/{contrib,examples,ramaze,snippets}/**/*.rb',
+  'lib/proto/spec/*.rb'
+]
+
+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."
 ]
 
 # To release the monthly version do:
-# $ PROJECT_VERSION=2009.03 rake release
+# $ VERSION=2009.03 rake release
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'ramaze'
@@ -25,39 +29,42 @@ GEMSPEC = Gem::Specification.new{|s|
   s.summary      = "Ramaze is a simple and modular web framework"
   s.description  = s.summary
   s.email        = 'm.fellinger@gmail.com'
-  s.homepage     = 'http://github.com/manveru/org'
+  s.homepage     = 'http://ramaze.net'
   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.required_rubygems_version = '>= 1.3.1'
 
-  # s.add_dependency('rack', '>= 0.9.9') # lies!
-  # s.add_dependency('manveru-innate', '>= 2009.04')
+  s.add_dependency('innate', '= 2009.06.12')
 
-  # 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')
-  # 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('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')
+  # rip those out if they cause you trouble
+  s.add_development_dependency('Remarkably',      '~> 0.5.2')
+  s.add_development_dependency('bacon',           '>= 1.1.0')
+  s.add_development_dependency('erubis',          '>= 2.6.4')
+  s.add_development_dependency('ezamar',          '>= 2009.06')
+  s.add_development_dependency('haml',            '~> 2.0.9')
+  s.add_development_dependency('hpricot',         '>= 0.8.1')
+  s.add_development_dependency('json',            '>= 1.1.6')
+  s.add_development_dependency('liquid',          '~> 2.0.0')
+  s.add_development_dependency('localmemcache',   '~> 0.4.0')
+  s.add_development_dependency('memcache-client', '~> 1.7.2')
+  s.add_development_dependency('nagoro',          '>= 2009.05')
+  s.add_development_dependency('rack-test',       '>= 0.3.0')
+  s.add_development_dependency('sequel',          '=  3.1.0')
+  s.add_development_dependency('tagz',            '>= 5.0.1')
+  s.add_development_dependency('tenjin',          '~> 0.6.1')
 
   s.post_install_message = <<MESSAGE.strip
 ============================================================
 
 Thank you for installing Ramaze!
 You can now do create a new project:
-# ramaze --create yourproject
+# ramaze create yourproject
 
 ============================================================
 MESSAGE

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)