ramaze 0.3.9.1 → 2008.06
Sign up to get free protection for your applications and to get access to all the features.
- data/{doc/README → README.markdown} +78 -32
- data/Rakefile +53 -50
- data/benchmark/results.txt +131 -0
- data/benchmark/run.rb +362 -0
- data/benchmark/suite/minimal.rb +13 -0
- data/benchmark/suite/no_informer.rb +9 -0
- data/benchmark/suite/no_sessions.rb +10 -0
- data/benchmark/suite/no_template.rb +9 -0
- data/benchmark/suite/simple.rb +7 -0
- data/benchmark/suite/template_amrita2.rb +17 -0
- data/benchmark/suite/template_builder.rb +12 -0
- data/benchmark/suite/template_erubis.rb +10 -0
- data/benchmark/suite/template_ezamar.rb +10 -0
- data/benchmark/suite/template_haml.rb +15 -0
- data/benchmark/suite/template_liquid.rb +13 -0
- data/benchmark/suite/template_markaby.rb +11 -0
- data/benchmark/suite/template_nagoro.rb +10 -0
- data/benchmark/suite/template_redcloth.rb +15 -0
- data/benchmark/suite/template_tenjin.rb +10 -0
- data/benchmark/test.rb +35 -0
- data/bin/ramaze +32 -122
- data/cache.yaml +7 -0
- data/doc/AUTHORS +26 -22
- data/doc/CHANGELOG +16720 -3907
- data/doc/INSTALL +77 -19
- data/doc/LEGAL +0 -4
- data/doc/meta/announcement.txt +43 -54
- data/doc/meta/configuration.txt +3 -2
- data/doc/readme_chunks/examples.txt +2 -2
- data/doc/readme_chunks/installing.txt +66 -20
- data/doc/tutorial/todolist.html +338 -520
- data/doc/tutorial/todolist.mkd +36 -2
- data/examples/{auth → app/auth}/auth.rb +0 -0
- data/examples/{auth → app/auth}/template/layout.haml +0 -0
- data/examples/{auth → app/auth}/template/login.haml +0 -0
- data/examples/{blog → app/blog}/README +0 -0
- data/examples/{blog → app/blog}/controller/main.rb +1 -1
- data/examples/{blog → app/blog}/model/entry.rb +1 -1
- data/examples/{blog → app/blog}/public/styles/blog.css +0 -0
- data/examples/{blog → app/blog}/spec/blog.rb +2 -2
- data/examples/{blog → app/blog}/start.rb +0 -0
- data/examples/{blog → app/blog}/view/edit.xhtml +0 -0
- data/examples/{blog → app/blog}/view/index.xhtml +0 -0
- data/examples/{blog → app/blog}/view/layout.xhtml +0 -0
- data/examples/{blog → app/blog}/view/new.xhtml +0 -0
- data/examples/app/chat/model/history.rb +36 -0
- data/examples/app/chat/model/message.rb +7 -0
- data/examples/app/chat/public/css/chat.css +13 -0
- data/examples/app/chat/public/js/chat.js +22 -0
- data/examples/app/chat/public/js/jquery.js +3436 -0
- data/examples/app/chat/start.rb +40 -0
- data/examples/app/chat/view/chat.xhtml +9 -0
- data/examples/app/chat/view/index.xhtml +7 -0
- data/examples/app/chat/view/layout.xhtml +13 -0
- data/examples/app/localization/start.rb +35 -0
- data/examples/{rammit → app/rammit}/spec/rammit.rb +2 -1
- data/examples/{rammit → app/rammit}/src/controller/main.rb +0 -0
- data/examples/{rammit → app/rammit}/src/controller/page.rb +0 -0
- data/examples/{rammit → app/rammit}/src/model.rb +0 -0
- data/examples/{rammit → app/rammit}/start.rb +0 -0
- data/examples/{rammit → app/rammit}/template/index.xhtml +0 -0
- data/examples/{rammit → app/rammit}/template/page/view.xhtml +0 -0
- data/examples/{rapaste → app/rapaste}/Rakefile +0 -1
- data/examples/{rapaste → app/rapaste}/controller/paste.rb +3 -3
- data/examples/{rapaste → app/rapaste}/model/paste.rb +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/active4d.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/all_hallows_eve.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/amy.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/blackboard.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/brilliance_black.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/brilliance_dull.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/cobalt.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/dawn.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/display.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/eiffel.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/espresso_libre.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/idle.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/iplastic.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/lazy.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/mac_classic.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/magicwb_amiga.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/pastels_on_dark.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/slush_poppies.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/spacecadet.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/sunburst.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/twilight.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/css/zenburnesque.css +0 -0
- data/examples/{rapaste → app/rapaste}/public/js/jquery.js +0 -0
- data/examples/{rapaste → app/rapaste}/spec/rapaste.rb +2 -2
- data/examples/{rapaste → app/rapaste}/start.rb +0 -0
- data/examples/{rapaste → app/rapaste}/view/copy.xhtml +0 -0
- data/examples/{rapaste → app/rapaste}/view/index.xhtml +0 -0
- data/examples/{rapaste → app/rapaste}/view/layout.xhtml +0 -0
- data/examples/{rapaste → app/rapaste}/view/list.xhtml +0 -0
- data/examples/{rapaste → app/rapaste}/view/search.xhtml +0 -0
- data/examples/{rapaste → app/rapaste}/view/view.xhtml +0 -0
- data/examples/{sourceview → app/sourceview}/public/coderay.css +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/file.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/folder.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/tv-collapsable-last.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/tv-collapsable.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/tv-expandable-last.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/tv-expandable.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/tv-item-last.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/images/tv-item.gif +0 -0
- data/examples/{sourceview → app/sourceview}/public/jquery.js +0 -0
- data/examples/{sourceview → app/sourceview}/public/jquery.treeview.css +0 -0
- data/examples/{sourceview → app/sourceview}/public/jquery.treeview.js +0 -0
- data/examples/{sourceview → app/sourceview}/public/sourceview.js +0 -0
- data/examples/{sourceview → app/sourceview}/sourceview.rb +1 -1
- data/examples/{sourceview → app/sourceview}/template/index.haml +0 -0
- data/examples/{todolist → app/todolist}/README +0 -0
- data/examples/{todolist → app/todolist}/public/favicon.ico +0 -0
- data/examples/{todolist → app/todolist}/public/js/jquery.js +0 -0
- data/examples/{todolist → app/todolist}/public/ramaze.png +0 -0
- data/examples/{todolist → app/todolist}/spec/todolist.rb +2 -2
- data/examples/{todolist → app/todolist}/src/controller/main.rb +0 -0
- data/examples/{todolist → app/todolist}/src/element/page.rb +0 -0
- data/examples/{todolist → app/todolist}/src/model.rb +0 -0
- data/examples/{todolist → app/todolist}/start.rb +0 -0
- data/examples/{todolist → app/todolist}/template/index.xhtml +0 -0
- data/examples/{todolist → app/todolist}/template/new.xhtml +0 -0
- data/examples/{upload → app/upload}/start.rb +0 -0
- data/examples/{upload → app/upload}/view/index.xhtml +0 -0
- data/examples/{whywiki → app/whywiki}/spec/whywiki.rb +3 -3
- data/examples/{whywiki → app/whywiki}/start.rb +0 -0
- data/examples/{whywiki → app/whywiki}/template/edit.xhtml +0 -0
- data/examples/{whywiki → app/whywiki}/template/show.xhtml +0 -0
- data/examples/{wikore → app/wikore}/spec/wikore.rb +2 -2
- data/examples/{wikore → app/wikore}/src/controller.rb +0 -0
- data/examples/{wikore → app/wikore}/src/model.rb +0 -0
- data/examples/{wikore → app/wikore}/start.rb +0 -0
- data/examples/{wikore → app/wikore}/template/index.xhtml +0 -0
- data/examples/{wiktacular → app/wiktacular}/README +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/link/2007-07-20_19-45-51.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/link/current.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/main/2007-07-20_16-31-33.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/main/2007-07-20_19-21-12.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/main/2007-07-20_19-23-10.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/main/2007-07-20_19-45-07.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/main/current.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/markdown/current.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/2007-07-20_16-43-46.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/2007-07-20_19-43-50.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/2007-07-21_18-46-01.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/2007-07-21_18-46-32.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/2007-07-21_18-47-08.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/2007-07-21_18-47-54.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/mkd/testing/current.mkd +0 -0
- data/examples/{wiktacular → app/wiktacular}/public/favicon.ico +0 -0
- data/examples/{wiktacular → app/wiktacular}/public/screen.css +0 -0
- data/examples/{wiktacular → app/wiktacular}/spec/wiktacular.rb +4 -5
- data/examples/{wiktacular → app/wiktacular}/src/controller.rb +0 -0
- data/examples/{wiktacular → app/wiktacular}/src/model.rb +0 -0
- data/examples/{wiktacular → app/wiktacular}/start.rb +0 -0
- data/examples/{wiktacular → app/wiktacular}/template/edit.xhtml +0 -0
- data/examples/{wiktacular → app/wiktacular}/template/html_layout.xhtml +0 -0
- data/examples/{wiktacular → app/wiktacular}/template/index.xhtml +0 -0
- data/examples/{wiktacular → app/wiktacular}/template/new.xhtml +0 -0
- data/examples/{element.rb → basic/element.rb} +0 -0
- data/examples/basic/gestalt.rb +27 -0
- data/examples/{hello.rb → basic/hello.rb} +0 -0
- data/examples/{layout.rb → basic/layout.rb} +0 -0
- data/examples/{linking.rb → basic/linking.rb} +0 -0
- data/examples/{simple.rb → basic/simple.rb} +3 -3
- data/examples/{caching.rb → helpers/cache.rb} +0 -0
- data/examples/helpers/form_with_sequel.rb +24 -0
- data/examples/helpers/httpdigest.rb +50 -0
- data/examples/{identity.rb → helpers/identity.rb} +0 -0
- data/examples/{nitro_form.rb → helpers/nitro_form.rb} +0 -0
- data/examples/helpers/provide.rb +23 -0
- data/examples/helpers/rest.rb +28 -0
- data/examples/helpers/simple_captcha.rb +29 -0
- data/examples/{css.rb → misc/css.rb} +0 -0
- data/examples/{facebook.rb → misc/facebook.rb} +0 -0
- data/examples/{memleak_detector.rb → misc/memleak_detector.rb} +0 -0
- data/examples/misc/nagoro_element.rb +43 -0
- data/examples/{ramaise.rb → misc/ramaise.rb} +0 -0
- data/examples/misc/rapp.rb +45 -0
- data/examples/misc/sequel_scaffolding.rb +34 -0
- data/examples/{simple_auth.rb → misc/simple_auth.rb} +0 -0
- data/examples/templates/template_amrita2.rb +1 -1
- data/examples/templates/template_erubis.rb +2 -2
- data/examples/templates/template_ezamar.rb +1 -1
- data/examples/templates/template_haml.rb +2 -2
- data/examples/templates/template_liquid.rb +2 -2
- data/examples/templates/template_markaby.rb +1 -1
- data/examples/templates/template_nagoro.rb +1 -1
- data/examples/templates/template_redcloth.rb +2 -2
- data/examples/templates/template_remarkably.rb +1 -1
- data/examples/templates/template_tenjin.rb +5 -9
- data/examples/templates/template_xslt.rb +1 -1
- data/lib/proto/public/dispatch.fcgi +0 -0
- data/lib/proto/public/js/jquery.js +750 -577
- data/lib/proto/spec/main.rb +1 -1
- data/lib/proto/start.ru +8 -0
- data/lib/proto/view/page.xhtml +13 -1
- data/lib/ramaze.rb +32 -15
- data/lib/ramaze/action.rb +18 -1
- data/lib/ramaze/action/render.rb +45 -17
- data/lib/ramaze/adapter.rb +8 -7
- data/lib/ramaze/adapter/base.rb +79 -13
- data/lib/ramaze/adapter/cgi.rb +5 -10
- data/lib/ramaze/adapter/ebb.rb +6 -20
- data/lib/ramaze/adapter/fake.rb +12 -0
- data/lib/ramaze/adapter/fcgi.rb +5 -11
- data/lib/ramaze/adapter/lsws.rb +5 -9
- data/lib/ramaze/adapter/mongrel.rb +5 -9
- data/lib/ramaze/adapter/scgi.rb +4 -8
- data/lib/ramaze/adapter/thin.rb +6 -11
- data/lib/ramaze/adapter/webrick.rb +13 -22
- data/lib/ramaze/cache.rb +36 -10
- data/lib/ramaze/cache/memcached.rb +3 -2
- data/lib/ramaze/contrib.rb +1 -1
- data/lib/ramaze/contrib/email.rb +1 -1
- data/lib/ramaze/contrib/file_cache.rb +1 -1
- data/lib/ramaze/contrib/gems.rb +79 -0
- data/lib/ramaze/contrib/gettext/po.rb +0 -0
- data/lib/ramaze/contrib/profiling.rb +1 -1
- data/lib/ramaze/contrib/rest.rb +14 -0
- data/lib/ramaze/controller.rb +45 -12
- data/lib/ramaze/controller/error.rb +4 -4
- data/lib/ramaze/controller/resolve.rb +61 -42
- data/lib/ramaze/current.rb +2 -2
- data/lib/ramaze/current/request.rb +25 -2
- data/lib/ramaze/current/response.rb +8 -0
- data/lib/ramaze/current/session.rb +64 -36
- data/lib/ramaze/current/session/flash.rb +14 -2
- data/lib/ramaze/current/session/hash.rb +3 -2
- data/lib/ramaze/dispatcher.rb +25 -12
- data/lib/ramaze/dispatcher/action.rb +12 -3
- data/lib/ramaze/dispatcher/directory.rb +4 -1
- data/lib/ramaze/dispatcher/error.rb +3 -3
- data/lib/ramaze/dispatcher/file.rb +11 -3
- data/lib/ramaze/gestalt.rb +1 -1
- data/lib/ramaze/helper.rb +17 -21
- data/lib/ramaze/helper/aspect.rb +20 -14
- data/lib/ramaze/helper/auth.rb +1 -1
- data/lib/ramaze/helper/cache.rb +3 -6
- data/lib/ramaze/helper/cgi.rb +6 -2
- data/lib/ramaze/helper/flash.rb +7 -7
- data/lib/ramaze/helper/form.rb +281 -0
- data/lib/ramaze/helper/formatting.rb +76 -0
- data/lib/ramaze/helper/gestalt.rb +15 -0
- data/lib/ramaze/helper/gravatar.rb +15 -0
- data/lib/ramaze/helper/httpdigest.rb +48 -0
- data/lib/ramaze/helper/identity.rb +87 -62
- data/lib/ramaze/helper/partial.rb +11 -2
- data/lib/ramaze/helper/redirect.rb +12 -3
- data/lib/ramaze/helper/rest.rb +43 -0
- data/lib/ramaze/helper/sendfile.rb +1 -3
- data/lib/ramaze/helper/sequel.rb +3 -0
- data/lib/ramaze/helper/simple_captcha.rb +31 -0
- data/lib/ramaze/helper/stack.rb +14 -5
- data/lib/ramaze/helper/user.rb +86 -34
- data/lib/ramaze/helper/xhtml.rb +23 -0
- data/lib/ramaze/log.rb +1 -2
- data/lib/ramaze/log/analogger.rb +24 -19
- data/lib/ramaze/log/growl.rb +24 -19
- data/lib/ramaze/log/hub.rb +25 -22
- data/lib/ramaze/log/informer.rb +104 -99
- data/lib/ramaze/log/knotify.rb +17 -12
- data/lib/ramaze/log/logger.rb +14 -8
- data/lib/ramaze/log/logging.rb +63 -60
- data/lib/ramaze/log/syslog.rb +24 -19
- data/lib/ramaze/log/xosd.rb +77 -71
- data/lib/ramaze/option.rb +153 -0
- data/lib/ramaze/option/dsl.rb +45 -0
- data/lib/ramaze/option/holder.rb +153 -0
- data/lib/ramaze/option/merger.rb +108 -0
- data/lib/ramaze/route.rb +15 -2
- data/lib/ramaze/setup.rb +50 -0
- data/lib/ramaze/snippets/binding/locals.rb +1 -1
- data/lib/ramaze/snippets/dictionary.rb +3 -3
- data/lib/ramaze/snippets/divide.rb +7 -7
- data/lib/ramaze/snippets/kernel/__dir__.rb +1 -1
- data/lib/ramaze/snippets/kernel/acquire.rb +0 -5
- data/lib/ramaze/snippets/metaid.rb +1 -1
- data/lib/ramaze/snippets/numeric/filesize_format.rb +11 -5
- data/lib/ramaze/snippets/object/instance_variable_defined.rb +8 -0
- data/lib/ramaze/snippets/object/scope.rb +1 -1
- data/lib/ramaze/snippets/object/thread_accessor.rb +1 -1
- data/lib/ramaze/snippets/ordered_set.rb +5 -1
- data/lib/ramaze/snippets/ramaze/deprecated.rb +7 -0
- data/lib/ramaze/snippets/ramaze/thread_accessor.rb +15 -1
- data/lib/ramaze/snippets/string/esc.rb +2 -2
- data/lib/ramaze/snippets/string/start_with.rb +1 -0
- data/lib/ramaze/snippets/string/unindent.rb +9 -1
- data/lib/ramaze/snippets/struct/values_at.rb +17 -1
- data/lib/ramaze/snippets/thread/into.rb +1 -1
- data/lib/ramaze/sourcereload.rb +83 -76
- data/lib/ramaze/spec/helper.rb +39 -26
- data/lib/ramaze/spec/helper/bacon.rb +5 -5
- data/lib/ramaze/spec/helper/mock_http.rb +1 -7
- data/lib/ramaze/spec/helper/pretty_output.rb +10 -2
- data/lib/ramaze/spec/helper/requester.rb +14 -0
- data/lib/ramaze/template.rb +6 -3
- data/lib/ramaze/template/amrita2.rb +1 -0
- data/lib/ramaze/template/erubis.rb +7 -1
- data/lib/ramaze/template/ezamar/render_partial.rb +1 -1
- data/lib/ramaze/template/nagoro.rb +1 -0
- data/lib/ramaze/template/redcloth.rb +1 -0
- data/lib/ramaze/template/tagz.rb +8 -8
- data/lib/ramaze/template/tenjin.rb +42 -2
- data/lib/ramaze/template/xslt.rb +4 -0
- data/lib/ramaze/tool/daemonize.rb +37 -0
- data/lib/ramaze/tool/localize.rb +142 -106
- data/lib/ramaze/version.rb +2 -10
- data/rake_tasks/conf.rake +11 -13
- data/rake_tasks/gem.rake +59 -37
- data/rake_tasks/git.rake +41 -0
- data/rake_tasks/maintenance.rake +263 -299
- data/rake_tasks/release.rake +63 -0
- data/rake_tasks/spec.rake +1 -1
- data/ramaze.gemspec +731 -0
- data/spec/contrib/profiling.rb +5 -2
- data/spec/examples/caching.rb +1 -1
- data/spec/examples/css.rb +1 -1
- data/spec/examples/element.rb +1 -1
- data/spec/examples/hello.rb +1 -1
- data/spec/examples/linking.rb +1 -1
- data/spec/examples/simple.rb +1 -1
- data/spec/examples/simple_auth.rb +1 -1
- data/spec/ramaze/action/cache.rb +58 -14
- data/spec/ramaze/action/file_cache.rb +48 -0
- data/spec/ramaze/action/layout.rb +2 -2
- data/spec/ramaze/action/render.rb +1 -2
- data/spec/ramaze/action/{template → view}/bar.xhtml +0 -0
- data/spec/ramaze/action/{template → view}/instancevars/layout.xhtml +0 -0
- data/spec/ramaze/action/{template → view}/other_wrapper.xhtml +0 -0
- data/spec/ramaze/action/{template → view}/single_wrapper.xhtml +0 -0
- data/spec/ramaze/action/{template → view}/sub/sub_wrapper.xhtml +0 -0
- data/spec/ramaze/adapter.rb +29 -2
- data/spec/ramaze/adapter/ebb.rb +12 -0
- data/spec/ramaze/cache.rb +82 -15
- data/spec/ramaze/controller.rb +6 -3
- data/spec/ramaze/controller/actionless_templates.rb +2 -2
- data/spec/ramaze/controller/resolve.rb +1 -1
- data/spec/ramaze/controller/template_resolving.rb +4 -6
- data/spec/ramaze/controller/{template → view}/greet.xhtml +0 -0
- data/spec/ramaze/controller/{template → view}/list.xhtml +0 -0
- data/spec/ramaze/controller/{template → view}/other/greet/other.xhtml +0 -0
- data/spec/ramaze/controller/{template → view}/other_wrapper.xhtml +0 -0
- data/spec/ramaze/error.rb +1 -1
- data/spec/ramaze/helper/aspect.rb +4 -4
- data/spec/ramaze/helper/cache.rb +56 -39
- data/spec/ramaze/helper/flash.rb +14 -1
- data/spec/ramaze/helper/form.rb +118 -0
- data/spec/ramaze/helper/formatting.rb +21 -0
- data/spec/ramaze/helper/link.rb +2 -2
- data/spec/ramaze/helper/pager.rb +2 -2
- data/spec/ramaze/helper/partial.rb +13 -1
- data/spec/ramaze/helper/simple_captcha.rb +22 -0
- data/spec/ramaze/helper/user.rb +7 -10
- data/spec/ramaze/helper/{template → view}/locals.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/loop.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/num.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/partial.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/recursive.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/recursive_local_ivars.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/recursive_locals.xhtml +0 -0
- data/spec/ramaze/helper/{template → view}/test_template.xhtml +0 -0
- data/spec/ramaze/localize.rb +22 -0
- data/spec/ramaze/log/informer.rb +10 -10
- data/spec/ramaze/log/syslog.rb +1 -1
- data/spec/ramaze/request.rb +13 -1
- data/spec/ramaze/request/ebb.rb +9 -0
- data/spec/ramaze/rewrite.rb +36 -0
- data/spec/ramaze/rewrite/file.css +1 -0
- data/spec/ramaze/route.rb +1 -0
- data/spec/ramaze/template.rb +5 -5
- data/spec/ramaze/template/amrita2.rb +1 -1
- data/spec/ramaze/template/builder.rb +18 -22
- data/spec/ramaze/template/erubis.rb +1 -1
- data/spec/ramaze/template/ezamar.rb +1 -1
- data/spec/ramaze/template/haml.rb +2 -2
- data/spec/ramaze/template/liquid.rb +1 -1
- data/spec/ramaze/template/markaby.rb +1 -1
- data/spec/ramaze/template/nagoro.rb +1 -1
- data/spec/ramaze/template/redcloth.rb +1 -1
- data/spec/ramaze/template/remarkably.rb +1 -1
- data/spec/ramaze/template/sass.rb +1 -1
- data/spec/ramaze/template/tagz.rb +1 -1
- data/spec/ramaze/template/tenjin.rb +4 -6
- data/spec/ramaze/template/xslt.rb +1 -1
- data/spec/snippets/string/unindent.rb +6 -0
- data/spec/snippets/struct/values_at.rb +8 -0
- metadata +522 -487
- data/doc/ProjectInfo +0 -53
- data/doc/migrate/1110_to_1111.txt +0 -131
- data/lib/ramaze/contrib/route.rb +0 -22
- data/lib/ramaze/global.rb +0 -116
- data/lib/ramaze/global/dsl.rb +0 -39
- data/lib/ramaze/global/globalstruct.rb +0 -147
- data/lib/ramaze/helper/inform.rb +0 -40
- data/lib/ramaze/inform.rb +0 -4
- data/lib/ramaze/snippets/kernel/aquire.rb +0 -1
- data/lib/vendor/bacon.rb +0 -323
- data/rake_tasks/darcs.rake +0 -5
- data/spec/contrib/route.rb +0 -36
data/benchmark/run.rb
ADDED
@@ -0,0 +1,362 @@
|
|
1
|
+
require "optparse"
|
2
|
+
require "timeout"
|
3
|
+
require "net/http"
|
4
|
+
|
5
|
+
class String
|
6
|
+
def /(o) File.join(self, o.to_s) end
|
7
|
+
end
|
8
|
+
|
9
|
+
class RamazeBenchmark
|
10
|
+
|
11
|
+
class BasicWriter
|
12
|
+
def initialize
|
13
|
+
@ljust = 24
|
14
|
+
end
|
15
|
+
|
16
|
+
def write(key, val)
|
17
|
+
if key == "Name"
|
18
|
+
puts "====== #{val} ======"
|
19
|
+
else
|
20
|
+
puts((key.to_s + ":").ljust(@ljust) + val.to_s)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def flush
|
25
|
+
puts
|
26
|
+
$stdout.flush
|
27
|
+
end
|
28
|
+
|
29
|
+
def close; end
|
30
|
+
end
|
31
|
+
|
32
|
+
class CSVWriter
|
33
|
+
def initialize
|
34
|
+
@keys, @vals = [], []
|
35
|
+
end
|
36
|
+
|
37
|
+
def write(key, val)
|
38
|
+
@keys << key
|
39
|
+
@vals << (val =~ /^\d[\d.]+/ ? $& : val)
|
40
|
+
end
|
41
|
+
|
42
|
+
def flush
|
43
|
+
unless @header
|
44
|
+
puts FasterCSV.generate{|csv| csv << @keys }
|
45
|
+
@header = true
|
46
|
+
end
|
47
|
+
|
48
|
+
puts FasterCSV.generate{|csv| csv << @vals }
|
49
|
+
@keys, @vals = [], []
|
50
|
+
end
|
51
|
+
|
52
|
+
def close; end
|
53
|
+
end
|
54
|
+
|
55
|
+
class GruffWriter
|
56
|
+
RPS = "Requests per second"
|
57
|
+
|
58
|
+
def initialize
|
59
|
+
@benchmarks = {}
|
60
|
+
@order = []
|
61
|
+
end
|
62
|
+
|
63
|
+
def write(key, val)
|
64
|
+
@benchmark ||= {}
|
65
|
+
@benchmark[key] = (val =~ /^\d[\d.]+/ ? $&.to_f : val)
|
66
|
+
end
|
67
|
+
|
68
|
+
def flush
|
69
|
+
if @benchmark["Requests per second"]
|
70
|
+
name = @benchmark["Name"]
|
71
|
+
@benchmarks[name] ||= []
|
72
|
+
@benchmarks[name] << @benchmark
|
73
|
+
@order << name unless @order.include?(name)
|
74
|
+
end
|
75
|
+
@benchmark = nil
|
76
|
+
end
|
77
|
+
|
78
|
+
def close
|
79
|
+
g = Gruff::SideBar.new(800)
|
80
|
+
g.title = "Ramaze Benchmark"
|
81
|
+
setup_gruff_data(g)
|
82
|
+
g.labels = gruff_labels
|
83
|
+
g.sort = false
|
84
|
+
g.hide_legend = true if graph_type == :simple
|
85
|
+
g.x_axis_label = "requests/sec"
|
86
|
+
g.minimum_value = 0
|
87
|
+
g.write
|
88
|
+
end
|
89
|
+
|
90
|
+
private
|
91
|
+
|
92
|
+
def gruff_labels
|
93
|
+
table = {}
|
94
|
+
@order.each_with_index do |bname, idx|
|
95
|
+
table[idx] = bname
|
96
|
+
end
|
97
|
+
return table
|
98
|
+
end
|
99
|
+
|
100
|
+
def adapters
|
101
|
+
@benchmarks.to_a[0][1].map{|bm| bm["Adapter"]}.uniq
|
102
|
+
end
|
103
|
+
|
104
|
+
def paths
|
105
|
+
@benchmarks.to_a[0][1].map{|bm| bm["Path"]}.uniq
|
106
|
+
end
|
107
|
+
|
108
|
+
def graph_type
|
109
|
+
case [adapters.size > 1, paths.size > 1]
|
110
|
+
when [true , true ]; :both
|
111
|
+
when [true , false]; :adapter
|
112
|
+
when [false, true ]; :path
|
113
|
+
else :simple; end
|
114
|
+
end
|
115
|
+
|
116
|
+
def setup_gruff_data(g)
|
117
|
+
case graph_type
|
118
|
+
when :simple
|
119
|
+
g.data("", @order.map{|name| @benchmarks[name][0][RPS] }, '#6886B4')
|
120
|
+
when :adapter
|
121
|
+
adapters.each do |adapter|
|
122
|
+
g.data(adapter, @order.map{|name|
|
123
|
+
@benchmarks[name].find{|bm| bm["Adapter"] == adapter}[RPS]
|
124
|
+
})
|
125
|
+
end
|
126
|
+
when :path
|
127
|
+
paths.each do |path|
|
128
|
+
g.data(path, @order.map{|name|
|
129
|
+
@benchmarks[name].find{|bm| bm["Path"] == path}[RPS]
|
130
|
+
})
|
131
|
+
end
|
132
|
+
when :both
|
133
|
+
adapters.each do |adapter|
|
134
|
+
paths.each do |path|
|
135
|
+
g.data("#{adapter}, #{path}", @order.map{|name|
|
136
|
+
@benchmarks[name].find{|bm|
|
137
|
+
bm["Adapter"] == adapter && bm["Path"] == path
|
138
|
+
}[RPS]
|
139
|
+
})
|
140
|
+
end
|
141
|
+
end
|
142
|
+
end
|
143
|
+
end
|
144
|
+
end
|
145
|
+
|
146
|
+
attr_accessor :requests, :adapters, :port, :log, :display_code, :target
|
147
|
+
attr_accessor :concurrent, :paths, :benchmarker, :informer, :sessions
|
148
|
+
attr_accessor :show_log, :ignored_tags, :formats
|
149
|
+
|
150
|
+
def initialize()
|
151
|
+
@adapters = [:webrick]
|
152
|
+
@port = rand(32768-1)+32768
|
153
|
+
@requests = 100
|
154
|
+
@concurrent = 10
|
155
|
+
@signal = 'SIGKILL'
|
156
|
+
@host = "127.0.0.1"
|
157
|
+
@paths = ["/"]
|
158
|
+
@target = /.+/
|
159
|
+
@informer = true
|
160
|
+
@sessions = true
|
161
|
+
@ignored_tags = [:debug, :dev]
|
162
|
+
@formats = ["text"]
|
163
|
+
@writers = []
|
164
|
+
yield self
|
165
|
+
end
|
166
|
+
|
167
|
+
def start
|
168
|
+
# setup writers
|
169
|
+
@formats.each do |format|
|
170
|
+
case format
|
171
|
+
when "csv" ; @writers << CSVWriter.new
|
172
|
+
when "gruff"; @writers << GruffWriter.new
|
173
|
+
when "text" ; @writers << BasicWriter.new
|
174
|
+
end
|
175
|
+
end
|
176
|
+
|
177
|
+
# benchmarks
|
178
|
+
__DIR__ = File.expand_path(File.dirname(__FILE__))
|
179
|
+
Dir[__DIR__/"suite"/"*.rb"].each do |filename|
|
180
|
+
@adapters.each do |adapter|
|
181
|
+
@paths.each do |path|
|
182
|
+
benchmark(filename, adapter, path) if @target.match(filename)
|
183
|
+
end
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
187
|
+
# close writers
|
188
|
+
@writers.each do |writer|
|
189
|
+
writer.close
|
190
|
+
end
|
191
|
+
end
|
192
|
+
|
193
|
+
# start to measure
|
194
|
+
def benchmark(filename, adapter, path)
|
195
|
+
# output informations
|
196
|
+
l :Name, filename.scan(/\/([^\/]+)\.rb/).to_s
|
197
|
+
l :Adapter, adapter
|
198
|
+
l :Requests, @requests
|
199
|
+
l :Concurrent, @concurrent
|
200
|
+
l :Path, path
|
201
|
+
l :Informer, @informer
|
202
|
+
l :Sessions, @sessions
|
203
|
+
if @display_code
|
204
|
+
l :Code, "<code ruby>\n#{File.read(filename)}\n</code>\n\n"
|
205
|
+
end
|
206
|
+
|
207
|
+
# real benchmark
|
208
|
+
ramaze(filename, adapter) do |pid|
|
209
|
+
l "Mem usage before", "#{memsize(pid)}MB"
|
210
|
+
ab(path).each do |line|
|
211
|
+
l *line.split(/:\s*/)
|
212
|
+
end
|
213
|
+
l "Mem usage after", "#{memsize(pid)}MB"
|
214
|
+
end
|
215
|
+
|
216
|
+
# flush writers
|
217
|
+
@writers.each do |writer|
|
218
|
+
writer.flush
|
219
|
+
end
|
220
|
+
end
|
221
|
+
|
222
|
+
private
|
223
|
+
|
224
|
+
# memory usage size
|
225
|
+
def memsize(pid)
|
226
|
+
(`ps -p #{pid} -o rss=`.strip.to_f/10.24).round/100.0
|
227
|
+
end
|
228
|
+
|
229
|
+
# output
|
230
|
+
def l(key, val)
|
231
|
+
@writers.each do |writer|
|
232
|
+
writer.write(key.to_s, val)
|
233
|
+
end
|
234
|
+
end
|
235
|
+
|
236
|
+
# url of ramaze server
|
237
|
+
def url(path)
|
238
|
+
"http://#{@host}:#{@port}#{path}"
|
239
|
+
end
|
240
|
+
|
241
|
+
# apache benchmark
|
242
|
+
def ab(path)
|
243
|
+
re = /^(Fail|Req|Time|Total transferred|Document Length|Transfer rate)/
|
244
|
+
`ab -c #{@concurrent} -n #{@requests} #{url(path)}`.split("\n").grep(re)
|
245
|
+
end
|
246
|
+
|
247
|
+
# startup
|
248
|
+
def ramaze(filename, adapter)
|
249
|
+
pid = fork do
|
250
|
+
begin
|
251
|
+
require filename
|
252
|
+
Ramaze::Log.ignored_tags = @ignored_tags
|
253
|
+
if @informer
|
254
|
+
unless @show_log
|
255
|
+
Ramaze::Log.loggers = [Ramaze::Logging::Logger::Informer.new("/dev/null")]
|
256
|
+
end
|
257
|
+
else
|
258
|
+
Ramaze::Log.loggers = []
|
259
|
+
end
|
260
|
+
Ramaze::Global.sessions = @sessions
|
261
|
+
Ramaze::Global.sourcereload = false
|
262
|
+
Ramaze.start :adapter => adapter, :port => @port
|
263
|
+
rescue LoadError => ex; l :Error, ex; end
|
264
|
+
end
|
265
|
+
|
266
|
+
yield pid if wait_to_startup
|
267
|
+
|
268
|
+
Process.kill(@signal, pid)
|
269
|
+
Process.waitpid2(pid)
|
270
|
+
end
|
271
|
+
|
272
|
+
# wait for ramaze to start up
|
273
|
+
def wait_to_startup
|
274
|
+
begin
|
275
|
+
Timeout.timeout(5) do
|
276
|
+
loop do
|
277
|
+
begin
|
278
|
+
sleep 1; Net::HTTP.new(@host, @port).head("/"); return true
|
279
|
+
rescue Errno::ECONNREFUSED; end
|
280
|
+
end
|
281
|
+
end
|
282
|
+
rescue Timeout::Error
|
283
|
+
l "Error", "failed to start benchmark script"; return false
|
284
|
+
end
|
285
|
+
end
|
286
|
+
end
|
287
|
+
|
288
|
+
Signal.trap(:INT, proc{exit})
|
289
|
+
|
290
|
+
RamazeBenchmark.new do |bm|
|
291
|
+
OptionParser.new(false, 24, " ") do |opt|
|
292
|
+
opt.on('-a', '--adapters NAMES', '[webrick] Specify adapters') do |adapters|
|
293
|
+
bm.adapters = adapters.split(",")
|
294
|
+
end
|
295
|
+
|
296
|
+
opt.on('--formats (text|csv|gruff)', '[text] Specify output formats') do |formats|
|
297
|
+
bm.formats = formats.split(",")
|
298
|
+
bm.formats.each do |format|
|
299
|
+
case format
|
300
|
+
when "csv" ; require "fastercsv"
|
301
|
+
when "gruff"; require "gruff"
|
302
|
+
end
|
303
|
+
end
|
304
|
+
end
|
305
|
+
|
306
|
+
opt.on('-n', '--requests NUM', '[100] Number of requests') do |n|
|
307
|
+
bm.requests = n
|
308
|
+
end
|
309
|
+
|
310
|
+
opt.on('-c', '--concurrent NUM', '[10] Number of multiple requests') do |n|
|
311
|
+
bm.concurrent = n
|
312
|
+
end
|
313
|
+
|
314
|
+
opt.on('--code', 'Display benchmark code') do |n|
|
315
|
+
bm.display_code = true
|
316
|
+
end
|
317
|
+
|
318
|
+
opt.on('-p', '--port NUM',
|
319
|
+
'[random(32768-65535)] Specify port number') do |n|
|
320
|
+
bm.port = n
|
321
|
+
end
|
322
|
+
|
323
|
+
opt.on('--paths PATHS', '[/] Specify request paths') do |paths|
|
324
|
+
bm.paths = paths.split(",")
|
325
|
+
end
|
326
|
+
|
327
|
+
opt.on('--no-informer', 'Disable informer') do
|
328
|
+
bm.informer = false
|
329
|
+
end
|
330
|
+
|
331
|
+
opt.on('--ignored-tags TAGS',
|
332
|
+
'[debug,dev] Specify ignored tags for Ramaze::Log') do |tags|
|
333
|
+
bm.ignored_tags = tags.split(",").map{|e| e.to_sym }
|
334
|
+
end
|
335
|
+
|
336
|
+
opt.on('--show-log', 'Show log') do
|
337
|
+
bm.show_log = true
|
338
|
+
end
|
339
|
+
|
340
|
+
opt.on('--no-sessions', 'Disable sessions') do
|
341
|
+
bm.sessions = false
|
342
|
+
end
|
343
|
+
|
344
|
+
opt.on('--target REGEXP',
|
345
|
+
'[/.+/] Specify benchmark scripts to measure') do |name|
|
346
|
+
bm.target = Regexp.compile(name)
|
347
|
+
end
|
348
|
+
|
349
|
+
opt.on('-h', '--help', 'Show this message') do
|
350
|
+
puts opt.help
|
351
|
+
exit
|
352
|
+
end
|
353
|
+
|
354
|
+
begin
|
355
|
+
opt.parse!(ARGV)
|
356
|
+
rescue OptionParser::ParseError => ex
|
357
|
+
puts "[ERROR] " + ex
|
358
|
+
puts opt.help
|
359
|
+
exit
|
360
|
+
end
|
361
|
+
end
|
362
|
+
end.start
|
@@ -0,0 +1,17 @@
|
|
1
|
+
require 'ramaze'
|
2
|
+
|
3
|
+
class MainController < Ramaze::Controller
|
4
|
+
engine :Amrita2
|
5
|
+
|
6
|
+
def index
|
7
|
+
@data = { :hello => "Hello, World!" }
|
8
|
+
%q[
|
9
|
+
<<html<
|
10
|
+
<<body<
|
11
|
+
<<%<
|
12
|
+
<% 10.times do %>
|
13
|
+
<span><%= $_[:hello] %></span>
|
14
|
+
<% end %>
|
15
|
+
]
|
16
|
+
end
|
17
|
+
end
|