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
@@ -0,0 +1,45 @@
|
|
1
|
+
# Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
|
2
|
+
# All files in this distribution are subject to the terms of the Ruby license.
|
3
|
+
|
4
|
+
module Ramaze
|
5
|
+
module Option
|
6
|
+
class DSL
|
7
|
+
attr_reader :holder
|
8
|
+
|
9
|
+
def initialize(holder, &block)
|
10
|
+
@holder = holder
|
11
|
+
@config = {}
|
12
|
+
instance_eval(&block) if block_given?
|
13
|
+
end
|
14
|
+
|
15
|
+
def o(doc, key, value, options = {})
|
16
|
+
@config[key] = [doc, value, options]
|
17
|
+
|
18
|
+
holder.add_option(key, value, complain = false)
|
19
|
+
holder.trait[key] = options.merge(:doc => doc)
|
20
|
+
end
|
21
|
+
|
22
|
+
# to generate a new sorted source file from the config, was only used to
|
23
|
+
# merge new and old DSL.
|
24
|
+
def output
|
25
|
+
@config.keys.sort_by{|k,v| k.to_s }.each do |key|
|
26
|
+
doc, value, options = @config[key]
|
27
|
+
puts "o %s," % doc.dump
|
28
|
+
|
29
|
+
if options.empty?
|
30
|
+
puts " %p, %p" % [key, value]
|
31
|
+
else
|
32
|
+
format = options.map{|(k,v)| '%p => %p' % [k,v]}.join(', ')
|
33
|
+
puts " %p, %p, %s" % [key, value, format]
|
34
|
+
end
|
35
|
+
|
36
|
+
puts
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def self.dsl(&block)
|
42
|
+
Option::DSL.new(&block)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -0,0 +1,153 @@
|
|
1
|
+
# Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
|
2
|
+
# All files in this distribution are subject to the terms of the Ruby license.
|
3
|
+
|
4
|
+
require 'ramaze/option/merger'
|
5
|
+
|
6
|
+
module Ramaze
|
7
|
+
module Option
|
8
|
+
class Holder
|
9
|
+
include Merger
|
10
|
+
|
11
|
+
def initialize(options = {})
|
12
|
+
@members = Set.new
|
13
|
+
|
14
|
+
options.each do |key, value|
|
15
|
+
add_option(key, value, complain = false)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
def add_option(key, value, complain = true)
|
20
|
+
Log.warn("Adding #{key} to #{self}") if complain
|
21
|
+
|
22
|
+
self.class.class_eval do
|
23
|
+
attr_reader key unless method_defined?(key)
|
24
|
+
attr_writer key unless method_defined?("#{key}=")
|
25
|
+
end
|
26
|
+
|
27
|
+
self[key] = value
|
28
|
+
end
|
29
|
+
|
30
|
+
def [](key)
|
31
|
+
__send__(key)
|
32
|
+
end
|
33
|
+
|
34
|
+
def []=(key, value)
|
35
|
+
@members << key.to_s.to_sym
|
36
|
+
__send__("#{key}=", value)
|
37
|
+
end
|
38
|
+
|
39
|
+
include Enumerable
|
40
|
+
|
41
|
+
def each
|
42
|
+
@members.each do |member|
|
43
|
+
yield member, self[member]
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
def startup(options)
|
48
|
+
options.each do |key, value|
|
49
|
+
self[key] = value
|
50
|
+
end
|
51
|
+
|
52
|
+
merge!(ARGV)
|
53
|
+
merge!(ENV)
|
54
|
+
|
55
|
+
self.root ||= File.dirname(File.expand_path(runner))
|
56
|
+
[self.load_engines].flatten.compact.each do |engine|
|
57
|
+
Ramaze::Template.const_get(engine)
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
# batch-assignment of key/value from hash, yields self if a block is given.
|
62
|
+
def setup(hash = {})
|
63
|
+
merge!(hash)
|
64
|
+
yield(self) if block_given?
|
65
|
+
end
|
66
|
+
|
67
|
+
# Modified options
|
68
|
+
|
69
|
+
def port=(number)
|
70
|
+
@port = number.to_i
|
71
|
+
end
|
72
|
+
|
73
|
+
def public_root=(pr)
|
74
|
+
@public_root = pr
|
75
|
+
end
|
76
|
+
|
77
|
+
# Find a suitable public_root, if none of these is a directory just use the
|
78
|
+
# currently set one.
|
79
|
+
def public_root
|
80
|
+
[ @public_root,
|
81
|
+
root/@public_root
|
82
|
+
].find{|path| File.directory?(path) } || @public_root
|
83
|
+
end
|
84
|
+
|
85
|
+
def view_root=(vr)
|
86
|
+
@view_root = vr
|
87
|
+
end
|
88
|
+
|
89
|
+
# Find a suitable view_root, if none of these is a directory just use
|
90
|
+
# the currently set one.
|
91
|
+
def view_root
|
92
|
+
[ @view_root,
|
93
|
+
root/@view_root,
|
94
|
+
root/'template',
|
95
|
+
].find{|path| File.directory?(path) } || @view_root
|
96
|
+
end
|
97
|
+
|
98
|
+
def template_root=(tr)
|
99
|
+
Ramaze::deprecated "Global.template_root=", "Global.view_root="
|
100
|
+
self.view_root = tr
|
101
|
+
end
|
102
|
+
|
103
|
+
def template_root
|
104
|
+
Ramaze::deprecated "Global.template_root", "Global.view_root"
|
105
|
+
self.view_root
|
106
|
+
end
|
107
|
+
|
108
|
+
def adapter
|
109
|
+
find_from_aliases(@adapter, :adapter_aliases, Ramaze::Adapter, "ramaze/adapter")
|
110
|
+
end
|
111
|
+
|
112
|
+
def cache
|
113
|
+
find_from_aliases(@cache, :cache_aliases, Ramaze, "ramaze/cache")
|
114
|
+
end
|
115
|
+
|
116
|
+
def sourcereload=(interval)
|
117
|
+
if interval
|
118
|
+
if interval.is_a?(Numeric)
|
119
|
+
@sourcereload = interval
|
120
|
+
Ramaze::SourceReload.restart
|
121
|
+
else
|
122
|
+
Log.warn("sourcereload= %p not Numeric, ignoring." % interval)
|
123
|
+
end
|
124
|
+
else
|
125
|
+
@sourcereload = interval
|
126
|
+
Ramaze::SourceReload.shutdown
|
127
|
+
end
|
128
|
+
end
|
129
|
+
|
130
|
+
private
|
131
|
+
|
132
|
+
def find_from_aliases(name, alias_key, mod, path)
|
133
|
+
case name
|
134
|
+
when String, Symbol
|
135
|
+
name = name.to_s
|
136
|
+
name = self[alias_key][name] || name
|
137
|
+
find_require(name, mod, path)
|
138
|
+
else
|
139
|
+
name
|
140
|
+
end
|
141
|
+
end
|
142
|
+
|
143
|
+
def find_require(name, mod, path)
|
144
|
+
class_name = name.to_s
|
145
|
+
file_path = File.join(path, class_name.downcase)
|
146
|
+
|
147
|
+
require(file_path) unless mod.const_defined?(class_name)
|
148
|
+
|
149
|
+
mod.const_get(class_name)
|
150
|
+
end
|
151
|
+
end
|
152
|
+
end
|
153
|
+
end
|
@@ -0,0 +1,108 @@
|
|
1
|
+
module Ramaze
|
2
|
+
module Option
|
3
|
+
module Merger
|
4
|
+
|
5
|
+
# Pass it anything that may work as option: ENV, hashes, ARGV...
|
6
|
+
# it will figure out how to get config from it and modify Global.
|
7
|
+
def merge!(obj, &block)
|
8
|
+
case obj
|
9
|
+
when ENV
|
10
|
+
merge_prefixed!(obj)
|
11
|
+
else
|
12
|
+
if obj.respond_to?(:each_pair)
|
13
|
+
obj.each_pair do |key, value|
|
14
|
+
self[key] = value
|
15
|
+
end
|
16
|
+
elsif obj.respond_to?(:each)
|
17
|
+
merge_cli!(obj, &block)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
self
|
22
|
+
end
|
23
|
+
|
24
|
+
# Prefixed options, mostly useful for filtering out from ENV.
|
25
|
+
# by default the prefix is case-insensitive and set to ramaze_ - that
|
26
|
+
# works for keys like:
|
27
|
+
# $ RAMAZE_PORT=80 ruby start.rb
|
28
|
+
# $ ramaze_port=80 ruby start.rb
|
29
|
+
# $ Ramaze_Port=80 ruby start.rb
|
30
|
+
def merge_prefixed!(obj, prefix = 'ramaze_')
|
31
|
+
opts = {}
|
32
|
+
obj.each do |key, value|
|
33
|
+
next unless key =~ /^#{prefix}(.*)/i
|
34
|
+
opts[$1.downcase] = value
|
35
|
+
end
|
36
|
+
merge! opts
|
37
|
+
end
|
38
|
+
|
39
|
+
# Only destructive for now, should non-destructive keep both Global and
|
40
|
+
# the obj original?
|
41
|
+
|
42
|
+
def merge_cli!(obj, &block)
|
43
|
+
option_parser(&block).parse!(obj)
|
44
|
+
end
|
45
|
+
|
46
|
+
def option_parser(bin = 'ramaze')
|
47
|
+
require 'optparse'
|
48
|
+
require 'abbrev'
|
49
|
+
|
50
|
+
OptionParser.new{|opt|
|
51
|
+
ruby_version = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
|
52
|
+
ramaze_version = "Ramaze Version #{VERSION}"
|
53
|
+
version = "#{ramaze_version}, on #{ruby_version}"
|
54
|
+
|
55
|
+
opt.banner = "Usage: #{bin} start.rb [OPTIONS]"
|
56
|
+
opt.define_head version
|
57
|
+
|
58
|
+
yield(opt) if block_given?
|
59
|
+
|
60
|
+
opt.separator ''
|
61
|
+
opt.separator 'Global options, value in [] shows default.'
|
62
|
+
|
63
|
+
Global.each do |key, value|
|
64
|
+
long_option = "--#{key}"
|
65
|
+
options = Global.trait.fetch(key, {})
|
66
|
+
doc, cli, short = options.values_at(:doc, :cli, :short)
|
67
|
+
short_option = "-#{short}" if short
|
68
|
+
|
69
|
+
next unless cli or short
|
70
|
+
|
71
|
+
case cli || value
|
72
|
+
when Integer
|
73
|
+
option = [short_option, "#{long_option} NUM", Integer, doc]
|
74
|
+
when String, Symbol
|
75
|
+
option = [short_option, "#{long_option} STRING", String, doc]
|
76
|
+
when Array
|
77
|
+
next unless cli
|
78
|
+
cli = cli.map{|c| c.to_s }
|
79
|
+
list = " " << cli.join(', ')
|
80
|
+
doc = "[#{value}] #{doc}"
|
81
|
+
aliases = cli.abbrev
|
82
|
+
option = [short_option, "#{long_option} CHOICE", cli, doc, list]
|
83
|
+
else
|
84
|
+
option = [short_option, long_option, doc]
|
85
|
+
end
|
86
|
+
|
87
|
+
option.delete(nil)
|
88
|
+
|
89
|
+
opt.on(*option){|o| Ramaze::Global[key] = o }
|
90
|
+
end
|
91
|
+
|
92
|
+
opt.separator ''
|
93
|
+
opt.separator 'Common options:'
|
94
|
+
|
95
|
+
opt.on('-h', '--help', 'Show this message') do
|
96
|
+
puts opt
|
97
|
+
exit
|
98
|
+
end
|
99
|
+
|
100
|
+
opt.on('-v', '--version', "Show version") do
|
101
|
+
puts version
|
102
|
+
exit
|
103
|
+
end
|
104
|
+
}
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
data/lib/ramaze/route.rb
CHANGED
@@ -41,18 +41,22 @@ module Ramaze
|
|
41
41
|
trait[:routes] ||= Dictionary.new
|
42
42
|
|
43
43
|
class << self
|
44
|
+
# Retrieve key from trait
|
44
45
|
def [](key)
|
45
46
|
trait[:routes][key]
|
46
47
|
end
|
47
48
|
|
49
|
+
# Set key to value in trait
|
48
50
|
def []=(key, value)
|
49
51
|
trait[:routes][key] = value
|
50
52
|
end
|
51
53
|
|
54
|
+
# remove all routes
|
52
55
|
def clear
|
53
56
|
trait[:routes].clear
|
54
57
|
end
|
55
58
|
|
59
|
+
# Resolve path according to routes.
|
56
60
|
def resolve(path)
|
57
61
|
trait[:routes].each do |key, val|
|
58
62
|
if key.is_a?(Regexp)
|
@@ -78,7 +82,16 @@ module Ramaze
|
|
78
82
|
end
|
79
83
|
end
|
80
84
|
|
81
|
-
|
82
|
-
|
85
|
+
class Rewrite < Route
|
86
|
+
trait[:routes] ||= Dictionary.new
|
87
|
+
end
|
88
|
+
|
89
|
+
# Shortcut for defining new routes.
|
90
|
+
def self.Route(name, value = nil, &block)
|
91
|
+
Route[name] = value || block
|
92
|
+
end
|
93
|
+
|
94
|
+
def self.Rewrite(name, value = nil, &block)
|
95
|
+
Rewrite[name] = value || block
|
83
96
|
end
|
84
97
|
end
|
data/lib/ramaze/setup.rb
ADDED
@@ -0,0 +1,50 @@
|
|
1
|
+
module Ramaze
|
2
|
+
def self.setup(start = true, &block)
|
3
|
+
SetupEnvironment.new(&block) if block_given?
|
4
|
+
self.start if start
|
5
|
+
end
|
6
|
+
|
7
|
+
class SetupEnvironment
|
8
|
+
# FIXME:
|
9
|
+
# * This is weird, class scope includes Global, yet it's skipped
|
10
|
+
# by Ruby on the lookup only because it's not in the scope of the block
|
11
|
+
# at the point of creation, shouldn't instance_eval take the binding of
|
12
|
+
# the SetupEnvironment instance in acocunt?
|
13
|
+
|
14
|
+
def initialize(&block)
|
15
|
+
instance_eval(&block)
|
16
|
+
end
|
17
|
+
|
18
|
+
# Shortcut for Ramaze::Gems::gem
|
19
|
+
def gem(*args)
|
20
|
+
require 'ramaze/contrib/gems'
|
21
|
+
Ramaze::Gems::gem(*args)
|
22
|
+
Ramaze::Gems::setup
|
23
|
+
end
|
24
|
+
|
25
|
+
# Shortcut if you don't need specific versions but tons of gems
|
26
|
+
def gems(*args)
|
27
|
+
gems.each{|g| gem(g) }
|
28
|
+
end
|
29
|
+
|
30
|
+
def global(hash = nil)
|
31
|
+
if hash
|
32
|
+
Global.merge!(hash)
|
33
|
+
else
|
34
|
+
Global
|
35
|
+
end
|
36
|
+
end
|
37
|
+
alias option global
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
__END__
|
42
|
+
Usage example:
|
43
|
+
|
44
|
+
Ramaze.setup do
|
45
|
+
gem 'json'
|
46
|
+
|
47
|
+
option :middleware => true
|
48
|
+
global.adapter = :thin
|
49
|
+
option.port = 7000
|
50
|
+
end
|
@@ -290,11 +290,11 @@ module Ramaze
|
|
290
290
|
end
|
291
291
|
|
292
292
|
def reject( &block )
|
293
|
-
self.dup.delete_if
|
293
|
+
self.dup.delete_if(&block)
|
294
294
|
end
|
295
295
|
|
296
296
|
def reject!( &block )
|
297
|
-
hsh2 = reject
|
297
|
+
hsh2 = reject(&block)
|
298
298
|
self == hsh2 ? nil : hsh2
|
299
299
|
end
|
300
300
|
|
@@ -319,7 +319,7 @@ module Ramaze
|
|
319
319
|
end
|
320
320
|
|
321
321
|
def <<(kv)
|
322
|
-
push
|
322
|
+
push(*kv)
|
323
323
|
end
|
324
324
|
|
325
325
|
def push( k,v )
|
@@ -1,20 +1,20 @@
|
|
1
1
|
# Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
|
2
2
|
# All files in this distribution are subject to the terms of the Ruby license.
|
3
3
|
|
4
|
-
# A convenient way to do File.join
|
5
|
-
#
|
6
|
-
# Example:
|
7
|
-
# 'a' / 'b' # -> 'a/b'
|
8
|
-
# File.dirname(__FILE__) / 'bar' # -> "ramaze/snippets/string/bar"
|
9
|
-
|
10
4
|
class String
|
5
|
+
# A convenient way to do File.join
|
6
|
+
# Usage:
|
7
|
+
# 'a' / 'b' # => 'a/b'
|
11
8
|
def / obj
|
12
9
|
File.join(self, obj.to_s)
|
13
10
|
end
|
14
11
|
end
|
15
12
|
|
16
13
|
class Symbol
|
14
|
+
# A convenient way to do File.join
|
15
|
+
# Usage:
|
16
|
+
# :dir/:file # => 'dir/file'
|
17
17
|
def / obj
|
18
18
|
self.to_s / obj
|
19
19
|
end
|
20
|
-
end
|
20
|
+
end
|