manveru-ramaze 2009.01 → 2009.04

Sign up to get free protection for your applications and to get access to all the features.
Files changed (540) hide show
  1. data/.mailmap +25 -0
  2. data/CHANGELOG +16750 -0
  3. data/MANIFEST +485 -0
  4. data/README.markdown +0 -5
  5. data/Rakefile +79 -222
  6. data/bin/ramaze +275 -52
  7. data/doc/AUTHORS +36 -28
  8. data/doc/FAQ +1 -1
  9. data/doc/tutorial/todolist.html +1415 -742
  10. data/doc/tutorial/todolist.txt +939 -0
  11. data/examples/app/auth/layout/auth.xhtml +25 -0
  12. data/examples/app/auth/start.rb +23 -0
  13. data/examples/app/auth/view/index.xhtml +4 -0
  14. data/examples/app/auth/view/login.xhtml +20 -0
  15. data/examples/app/auth/view/secret.xhtml +1 -0
  16. data/examples/app/blog/app.rb +69 -0
  17. data/{lib/proto/start.ru → examples/app/blog/config.ru} +8 -7
  18. data/examples/app/blog/controller/comment.rb +45 -0
  19. data/examples/app/blog/controller/entry.rb +85 -0
  20. data/examples/app/blog/controller/init.rb +86 -0
  21. data/examples/app/blog/controller/main.rb +16 -25
  22. data/examples/app/blog/controller/tag.rb +9 -0
  23. data/examples/app/blog/layout/default.nag +31 -0
  24. data/examples/app/blog/model/comment.rb +58 -0
  25. data/examples/app/blog/model/entry.rb +81 -22
  26. data/examples/app/blog/model/init.rb +15 -0
  27. data/examples/app/blog/model/tag.rb +36 -0
  28. data/examples/app/blog/public/css/screen.css +273 -0
  29. data/examples/app/blog/start.rb +3 -5
  30. data/examples/app/blog/view/comment/form.nag +10 -0
  31. data/examples/app/blog/view/comment/show.nag +16 -0
  32. data/examples/app/blog/view/entry/edit.nag +14 -0
  33. data/examples/app/blog/view/entry/feed.atom.nag +8 -0
  34. data/examples/app/blog/view/entry/feed.rss.nag +7 -0
  35. data/examples/app/blog/view/entry/index.nag +7 -0
  36. data/examples/app/blog/view/entry/new.nag +13 -0
  37. data/examples/app/blog/view/entry/show.nag +36 -0
  38. data/examples/app/blog/view/feed.atom.nag +18 -0
  39. data/examples/app/blog/view/feed.rss.nag +25 -0
  40. data/examples/app/blog/view/index.nag +6 -0
  41. data/examples/app/blog/view/tag/index.nag +5 -0
  42. data/examples/app/chat/{view/layout.xhtml → layout/default.nag} +1 -1
  43. data/examples/app/chat/model/history.rb +13 -11
  44. data/examples/app/chat/public/css/chat.css +9 -13
  45. data/examples/app/chat/public/js/chat.js +6 -0
  46. data/examples/app/chat/start.rb +16 -17
  47. data/examples/app/chat/view/{chat.xhtml → chat.nag} +0 -0
  48. data/examples/app/chat/view/{index.xhtml → index.nag} +0 -0
  49. data/examples/app/sourceview/{sourceview.rb → start.rb} +36 -34
  50. data/examples/app/sourceview/{template → view}/index.haml +0 -0
  51. data/examples/app/todolist/controller/init.rb +10 -0
  52. data/examples/app/todolist/controller/task.rb +39 -0
  53. data/examples/app/todolist/layout/default.xhtml +14 -0
  54. data/examples/app/todolist/model/init.rb +14 -0
  55. data/examples/app/todolist/model/task.rb +39 -0
  56. data/examples/app/todolist/public/css/screen.css +63 -0
  57. data/examples/app/todolist/start.rb +6 -6
  58. data/examples/app/todolist/view/index.xhtml +29 -0
  59. data/examples/app/wikore/spec/wikore.rb +4 -6
  60. data/examples/app/wikore/src/controller.rb +9 -11
  61. data/examples/app/wikore/src/model.rb +7 -10
  62. data/examples/app/wikore/start.rb +1 -1
  63. data/examples/app/wikore/{template → view}/index.xhtml +0 -0
  64. data/examples/basic/element.rb +5 -3
  65. data/examples/basic/gestalt.rb +1 -2
  66. data/examples/basic/hello.rb +3 -4
  67. data/examples/basic/layout.rb +2 -2
  68. data/examples/basic/linking.rb +7 -7
  69. data/examples/basic/partial.rb +3 -5
  70. data/examples/basic/simple.rb +1 -5
  71. data/examples/helpers/cache.rb +5 -5
  72. data/examples/helpers/httpdigest.rb +31 -32
  73. data/examples/misc/memleak_detector.rb +17 -12
  74. data/examples/misc/rapp.rb +28 -17
  75. data/examples/misc/serve_directory.rb +6 -0
  76. data/examples/templates/template_erubis.rb +9 -10
  77. data/examples/templates/template_ezamar.rb +8 -7
  78. data/examples/templates/template_haml.rb +6 -7
  79. data/examples/templates/template_liquid.rb +20 -19
  80. data/examples/templates/template_markaby.rb +2 -3
  81. data/examples/templates/template_nagoro.rb +6 -7
  82. data/examples/templates/template_redcloth.rb +8 -9
  83. data/examples/templates/template_remarkably.rb +7 -8
  84. data/examples/templates/template_tenjin.rb +6 -7
  85. data/examples/templates/{template → view}/external.haml +4 -4
  86. data/examples/templates/{template → view}/external.liquid +0 -0
  87. data/examples/templates/{template → view}/external.mab +0 -0
  88. data/examples/templates/{template → view}/external.nag +4 -4
  89. data/examples/templates/{template → view}/external.redcloth +4 -4
  90. data/examples/templates/{template → view}/external.rem +4 -4
  91. data/examples/templates/{template → view}/external.rhtml +6 -6
  92. data/examples/templates/{template → view}/external.tenjin +4 -4
  93. data/examples/templates/{template → view}/external.zmr +6 -6
  94. data/lib/proto/app.rb +15 -0
  95. data/lib/proto/config.ru +16 -0
  96. data/lib/proto/controller/init.rb +2 -2
  97. data/lib/proto/{view/page.xhtml → layout/default.xhtml} +1 -4
  98. data/lib/proto/public/css/screen.css +30 -0
  99. data/lib/proto/public/js/jquery.js +2121 -1294
  100. data/lib/proto/spec/main.rb +11 -15
  101. data/lib/proto/start.rb +6 -10
  102. data/lib/proto/view/index.xhtml +34 -27
  103. data/lib/ramaze/app.rb +124 -0
  104. data/lib/ramaze/cache/localmemcache.rb +56 -0
  105. data/lib/ramaze/cache/memcache.rb +99 -0
  106. data/lib/ramaze/cache/sequel.rb +67 -0
  107. data/lib/ramaze/cache.rb +9 -104
  108. data/lib/ramaze/contrib/app_graph.rb +64 -0
  109. data/lib/ramaze/contrib/email.rb +2 -0
  110. data/lib/ramaze/contrib/gzip_filter.rb +1 -69
  111. data/lib/ramaze/contrib/rest.rb +20 -15
  112. data/lib/ramaze/contrib/sequel/create_join.rb +1 -0
  113. data/lib/ramaze/contrib/sequel/form_field.rb +4 -4
  114. data/lib/ramaze/contrib/sequel/image.rb +9 -11
  115. data/lib/ramaze/contrib/sequel/relation.rb +21 -5
  116. data/lib/ramaze/controller/default.rb +12 -0
  117. data/lib/ramaze/controller.rb +63 -257
  118. data/lib/ramaze/current.rb +3 -106
  119. data/lib/ramaze/files.rb +24 -0
  120. data/lib/ramaze/gestalt.rb +6 -1
  121. data/lib/ramaze/helper/auth.rb +68 -104
  122. data/lib/ramaze/helper/bench.rb +0 -2
  123. data/lib/ramaze/helper/cache.rb +71 -120
  124. data/lib/ramaze/helper/disqus.rb +26 -0
  125. data/lib/ramaze/helper/flash.rb +32 -29
  126. data/lib/ramaze/helper/form.rb +83 -252
  127. data/lib/ramaze/helper/formatting.rb +32 -5
  128. data/lib/ramaze/helper/gestalt.rb +1 -1
  129. data/lib/ramaze/helper/gravatar.rb +66 -19
  130. data/lib/ramaze/helper/httpdigest.rb +75 -66
  131. data/lib/ramaze/helper/link.rb +62 -109
  132. data/lib/ramaze/helper/localize.rb +138 -0
  133. data/lib/ramaze/helper/markaby.rb +1 -1
  134. data/lib/ramaze/helper/maruku.rb +10 -3
  135. data/lib/ramaze/helper/pager.rb +2 -1
  136. data/lib/ramaze/helper/paginate.rb +17 -9
  137. data/lib/ramaze/helper/partial.rb +86 -91
  138. data/lib/ramaze/helper/remarkably.rb +14 -0
  139. data/lib/ramaze/helper/request_accessor.rb +16 -0
  140. data/lib/ramaze/helper/sequel_form.rb +284 -0
  141. data/lib/ramaze/helper/simple_captcha.rb +46 -16
  142. data/lib/ramaze/helper/stack.rb +64 -66
  143. data/lib/ramaze/helper/user.rb +141 -22
  144. data/lib/ramaze/helper/xhtml.rb +27 -16
  145. data/lib/ramaze/helper.rb +6 -81
  146. data/lib/ramaze/log/analogger.rb +1 -2
  147. data/lib/ramaze/log/informer.rb +1 -0
  148. data/lib/ramaze/log/logging.rb +2 -8
  149. data/lib/ramaze/log.rb +19 -7
  150. data/lib/ramaze/middleware_compiler.rb +13 -0
  151. data/lib/ramaze/plugin.rb +69 -0
  152. data/lib/ramaze/reloader.rb +6 -4
  153. data/lib/ramaze/request.rb +118 -0
  154. data/lib/ramaze/{current/response.rb → response.rb} +9 -12
  155. data/lib/ramaze/setup.rb +93 -33
  156. data/lib/ramaze/snippets/ramaze/deprecated.rb +3 -1
  157. data/lib/ramaze/snippets/{dictionary.rb → ramaze/dictionary.rb} +0 -104
  158. data/lib/ramaze/spec/helper/bacon.rb +4 -3
  159. data/lib/ramaze/spec/helper/snippets.rb +3 -1
  160. data/lib/ramaze/spec/helper/template_examples.rb +29 -0
  161. data/lib/ramaze/spec.rb +34 -1
  162. data/lib/ramaze/tool/create.rb +1 -1
  163. data/lib/ramaze/version.rb +1 -4
  164. data/lib/ramaze/view/erubis.rb +23 -0
  165. data/lib/ramaze/view/ezamar.rb +23 -0
  166. data/lib/ramaze/view/haml.rb +16 -0
  167. data/lib/ramaze/view/liquid.rb +100 -0
  168. data/lib/ramaze/view/maruku.rb +14 -0
  169. data/lib/ramaze/view/nagoro/render_partial.rb +32 -0
  170. data/lib/ramaze/view/nagoro.rb +44 -0
  171. data/lib/ramaze/view/redcloth.rb +21 -0
  172. data/lib/ramaze/view/remarkably.rb +21 -0
  173. data/lib/ramaze/view/sass.rb +21 -0
  174. data/lib/ramaze/view/tagz.rb +63 -0
  175. data/lib/ramaze/view/tenjin.rb +29 -0
  176. data/lib/ramaze/view.rb +48 -0
  177. data/lib/ramaze.rb +78 -129
  178. data/lib/vendor/etag.rb +20 -0
  179. data/lib/vendor/route_exceptions.rb +48 -0
  180. data/ramaze.gemspec +38 -605
  181. data/spec/contrib/rest.rb +28 -0
  182. data/spec/examples/caching.rb +1 -2
  183. data/spec/examples/css.rb +1 -2
  184. data/spec/examples/element.rb +1 -2
  185. data/spec/examples/hello.rb +2 -3
  186. data/spec/examples/helpers/httpdigest.rb +64 -0
  187. data/spec/examples/linking.rb +1 -2
  188. data/spec/examples/simple.rb +1 -6
  189. data/spec/examples/templates/template_erubis.rb +3 -17
  190. data/spec/examples/templates/template_ezamar.rb +3 -18
  191. data/spec/examples/templates/template_haml.rb +3 -17
  192. data/spec/examples/templates/template_liquid.rb +3 -23
  193. data/spec/examples/templates/template_markaby.rb +6 -19
  194. data/spec/examples/templates/template_nagoro.rb +9 -0
  195. data/spec/examples/templates/template_redcloth.rb +3 -22
  196. data/spec/examples/templates/template_remarkably.rb +3 -17
  197. data/spec/examples/templates/template_tenjin.rb +3 -22
  198. data/spec/helper.rb +10 -3
  199. data/spec/ramaze/action/render.rb +5 -15
  200. data/spec/ramaze/action/view/other_wrapper.erb +1 -0
  201. data/spec/ramaze/action/view/sub/sub_wrapper.erb +1 -0
  202. data/spec/ramaze/app.rb +47 -0
  203. data/spec/ramaze/cache/localmemcache.rb +49 -0
  204. data/spec/ramaze/cache/memcache.rb +54 -0
  205. data/spec/ramaze/cache/sequel.rb +51 -0
  206. data/spec/ramaze/controller/actionless_templates.rb +14 -10
  207. data/spec/ramaze/controller/mapping.rb +57 -0
  208. data/spec/ramaze/controller/provide_inheritance.rb +47 -0
  209. data/spec/ramaze/controller/resolve.rb +7 -9
  210. data/spec/ramaze/controller/subclass.rb +13 -13
  211. data/spec/ramaze/controller/template_resolving.rb +21 -57
  212. data/spec/ramaze/dispatcher/directory.rb +38 -24
  213. data/spec/ramaze/dispatcher/file.rb +55 -44
  214. data/spec/ramaze/error.rb +56 -62
  215. data/spec/ramaze/files/public_1/plain.txt +1 -0
  216. data/spec/ramaze/files/public_2/rich.txt +1 -0
  217. data/spec/ramaze/files.rb +29 -0
  218. data/spec/ramaze/gestalt.rb +2 -4
  219. data/spec/ramaze/helper/auth.rb +41 -24
  220. data/spec/ramaze/helper/bench.rb +17 -0
  221. data/spec/ramaze/helper/cache.rb +65 -101
  222. data/spec/ramaze/helper/flash.rb +20 -112
  223. data/spec/ramaze/helper/form.rb +336 -98
  224. data/spec/ramaze/helper/formatting.rb +66 -9
  225. data/spec/ramaze/helper/gestalt.rb +15 -0
  226. data/spec/ramaze/helper/gravatar.rb +40 -0
  227. data/spec/ramaze/helper/httpdigest.rb +144 -0
  228. data/spec/ramaze/helper/link.rb +25 -100
  229. data/spec/ramaze/helper/localize.rb +60 -0
  230. data/spec/ramaze/helper/maruku.rb +19 -0
  231. data/spec/ramaze/helper/pager.rb +13 -16
  232. data/spec/ramaze/helper/paginate.rb +68 -0
  233. data/spec/ramaze/helper/request_accessor.rb +19 -0
  234. data/spec/ramaze/helper/sequel_form.rb +89 -0
  235. data/spec/ramaze/helper/simple_captcha.rb +35 -12
  236. data/spec/ramaze/helper/stack.rb +52 -39
  237. data/spec/ramaze/helper/user.rb +39 -10
  238. data/spec/ramaze/helper/xhtml.rb +32 -0
  239. data/spec/ramaze/log/informer.rb +20 -19
  240. data/spec/ramaze/log/logging.rb +63 -0
  241. data/spec/ramaze/params.rb +8 -11
  242. data/spec/ramaze/request.rb +57 -181
  243. data/spec/ramaze/view/erubis/external.rhtml +8 -0
  244. data/spec/ramaze/view/erubis/sum.rhtml +1 -0
  245. data/spec/ramaze/view/erubis.rb +73 -0
  246. data/spec/ramaze/view/ezamar/external.zmr +8 -0
  247. data/spec/ramaze/view/ezamar/sum.zmr +1 -0
  248. data/spec/ramaze/view/ezamar.rb +73 -0
  249. data/spec/ramaze/view/haml/external.haml +5 -0
  250. data/spec/ramaze/view/haml/sum.haml +2 -0
  251. data/spec/ramaze/view/haml.rb +86 -0
  252. data/spec/ramaze/view/liquid/external.liquid +8 -0
  253. data/spec/ramaze/view/liquid/sum.liquid +1 -0
  254. data/spec/ramaze/view/liquid.rb +73 -0
  255. data/spec/ramaze/view/nagoro/external.nag +8 -0
  256. data/spec/ramaze/view/nagoro/sum.nag +1 -0
  257. data/spec/ramaze/view/nagoro.rb +73 -0
  258. data/spec/ramaze/view/redcloth/external.redcloth +8 -0
  259. data/spec/ramaze/view/redcloth.rb +66 -0
  260. data/spec/ramaze/{template → view}/remarkably/external.rem +0 -0
  261. data/spec/ramaze/{template → view}/remarkably/sum.rem +0 -0
  262. data/spec/ramaze/view/remarkably.rb +49 -0
  263. data/spec/ramaze/{template → view}/sass/file.css.sass +0 -0
  264. data/spec/ramaze/view/sass.rb +73 -0
  265. data/spec/ramaze/{template → view}/tagz/external.tagz +0 -0
  266. data/spec/ramaze/{template → view}/tagz/sum.tagz +0 -0
  267. data/spec/ramaze/{template → view}/tagz.rb +18 -29
  268. data/spec/ramaze/view/tenjin/external.rbhtml +8 -0
  269. data/spec/ramaze/view/tenjin/sum.rbhtml +1 -0
  270. data/spec/ramaze/view/tenjin.rb +57 -0
  271. data/spec/ramaze/view.rb +36 -0
  272. data/spec/snippets/ramaze/dictionary.rb +110 -0
  273. data/spec/snippets/ramaze/struct.rb +12 -0
  274. data/spec/snippets/thread/into.rb +3 -14
  275. data/tasks/authors.rake +30 -0
  276. data/tasks/bacon.rake +66 -0
  277. data/tasks/changelog.rake +18 -0
  278. data/tasks/copyright.rake +21 -0
  279. data/tasks/gem.rake +22 -0
  280. data/tasks/gem_installer.rake +76 -0
  281. data/{rake_tasks → tasks}/git.rake +10 -5
  282. data/tasks/grancher.rake +12 -0
  283. data/tasks/install_dependencies.rake +6 -0
  284. data/tasks/jquery.rake +15 -0
  285. data/tasks/manifest.rake +4 -0
  286. data/{rake_tasks/metric.rake → tasks/metric_changes.rake} +6 -6
  287. data/tasks/rcov.rake +23 -0
  288. data/tasks/release.rake +51 -0
  289. data/tasks/reversion.rake +8 -0
  290. data/tasks/setup.rake +24 -0
  291. data/tasks/todo.rake +29 -0
  292. data/tasks/traits.rake +21 -0
  293. data/tasks/yard.rake +4 -0
  294. metadata +188 -285
  295. data/benchmark/suite/template_amrita2.rb +0 -17
  296. data/doc/readme_chunks/appendix.txt +0 -10
  297. data/doc/readme_chunks/examples.txt +0 -38
  298. data/doc/readme_chunks/features.txt +0 -148
  299. data/doc/readme_chunks/getting_help.txt +0 -5
  300. data/doc/readme_chunks/getting_started.txt +0 -18
  301. data/doc/readme_chunks/installing.txt +0 -92
  302. data/doc/readme_chunks/introduction.txt +0 -18
  303. data/doc/readme_chunks/principles.txt +0 -56
  304. data/doc/readme_chunks/thanks.txt +0 -59
  305. data/examples/app/auth/auth.rb +0 -54
  306. data/examples/app/auth/template/layout.haml +0 -20
  307. data/examples/app/auth/template/login.haml +0 -16
  308. data/examples/app/blog/public/styles/blog.css +0 -132
  309. data/examples/app/blog/view/edit.xhtml +0 -17
  310. data/examples/app/blog/view/index.xhtml +0 -17
  311. data/examples/app/blog/view/layout.xhtml +0 -11
  312. data/examples/app/blog/view/new.xhtml +0 -16
  313. data/examples/app/rapaste/Rakefile +0 -34
  314. data/examples/app/rapaste/controller/paste.rb +0 -101
  315. data/examples/app/rapaste/model/paste.rb +0 -58
  316. data/examples/app/rapaste/public/css/active4d.css +0 -114
  317. data/examples/app/rapaste/public/css/all_hallows_eve.css +0 -72
  318. data/examples/app/rapaste/public/css/amy.css +0 -147
  319. data/examples/app/rapaste/public/css/blackboard.css +0 -88
  320. data/examples/app/rapaste/public/css/brilliance_black.css +0 -605
  321. data/examples/app/rapaste/public/css/brilliance_dull.css +0 -599
  322. data/examples/app/rapaste/public/css/cobalt.css +0 -149
  323. data/examples/app/rapaste/public/css/dawn.css +0 -121
  324. data/examples/app/rapaste/public/css/display.css +0 -197
  325. data/examples/app/rapaste/public/css/eiffel.css +0 -121
  326. data/examples/app/rapaste/public/css/espresso_libre.css +0 -109
  327. data/examples/app/rapaste/public/css/idle.css +0 -62
  328. data/examples/app/rapaste/public/css/iplastic.css +0 -80
  329. data/examples/app/rapaste/public/css/lazy.css +0 -73
  330. data/examples/app/rapaste/public/css/mac_classic.css +0 -123
  331. data/examples/app/rapaste/public/css/magicwb_amiga.css +0 -104
  332. data/examples/app/rapaste/public/css/pastels_on_dark.css +0 -188
  333. data/examples/app/rapaste/public/css/slush_poppies.css +0 -85
  334. data/examples/app/rapaste/public/css/spacecadet.css +0 -51
  335. data/examples/app/rapaste/public/css/sunburst.css +0 -180
  336. data/examples/app/rapaste/public/css/twilight.css +0 -137
  337. data/examples/app/rapaste/public/css/zenburnesque.css +0 -91
  338. data/examples/app/rapaste/public/js/jquery.js +0 -11
  339. data/examples/app/rapaste/spec/rapaste.rb +0 -51
  340. data/examples/app/rapaste/start.rb +0 -25
  341. data/examples/app/rapaste/view/copy.xhtml +0 -10
  342. data/examples/app/rapaste/view/index.xhtml +0 -9
  343. data/examples/app/rapaste/view/layout.xhtml +0 -25
  344. data/examples/app/rapaste/view/list.xhtml +0 -29
  345. data/examples/app/rapaste/view/search.xhtml +0 -41
  346. data/examples/app/rapaste/view/view.xhtml +0 -40
  347. data/examples/app/todolist/README +0 -1
  348. data/examples/app/todolist/public/js/jquery.js +0 -1923
  349. data/examples/app/todolist/public/ramaze.png +0 -0
  350. data/examples/app/todolist/spec/todolist.rb +0 -132
  351. data/examples/app/todolist/src/controller/main.rb +0 -70
  352. data/examples/app/todolist/src/element/page.rb +0 -31
  353. data/examples/app/todolist/src/model.rb +0 -14
  354. data/examples/app/todolist/template/index.xhtml +0 -17
  355. data/examples/app/todolist/template/new.xhtml +0 -7
  356. data/examples/helpers/provide.rb +0 -23
  357. data/examples/misc/simple_auth.rb +0 -35
  358. data/examples/templates/template/external.amrita +0 -19
  359. data/examples/templates/template/external.xsl +0 -57
  360. data/examples/templates/template_amrita2.rb +0 -74
  361. data/examples/templates/template_xslt.rb +0 -49
  362. data/lib/proto/public/css/ramaze_error.css +0 -90
  363. data/lib/proto/view/error.xhtml +0 -64
  364. data/lib/ramaze/action/render.rb +0 -192
  365. data/lib/ramaze/action.rb +0 -159
  366. data/lib/ramaze/adapter/base.rb +0 -128
  367. data/lib/ramaze/adapter/cgi.rb +0 -20
  368. data/lib/ramaze/adapter/ebb.rb +0 -18
  369. data/lib/ramaze/adapter/evented_mongrel.rb +0 -7
  370. data/lib/ramaze/adapter/fake.rb +0 -12
  371. data/lib/ramaze/adapter/fcgi.rb +0 -18
  372. data/lib/ramaze/adapter/lsws.rb +0 -19
  373. data/lib/ramaze/adapter/mongrel.rb +0 -21
  374. data/lib/ramaze/adapter/scgi.rb +0 -18
  375. data/lib/ramaze/adapter/swiftiplied_mongrel.rb +0 -7
  376. data/lib/ramaze/adapter/thin.rb +0 -17
  377. data/lib/ramaze/adapter/webrick.rb +0 -43
  378. data/lib/ramaze/adapter.rb +0 -97
  379. data/lib/ramaze/cache/file.rb +0 -71
  380. data/lib/ramaze/cache/memcached.rb +0 -69
  381. data/lib/ramaze/cache/memory.rb +0 -6
  382. data/lib/ramaze/cache/yaml_store.rb +0 -68
  383. data/lib/ramaze/contrib/file_cache.rb +0 -3
  384. data/lib/ramaze/contrib/gems.rb +0 -78
  385. data/lib/ramaze/contrib/sequel/fill.rb +0 -12
  386. data/lib/ramaze/contrib/sequel_cache.rb +0 -92
  387. data/lib/ramaze/contrib.rb +0 -82
  388. data/lib/ramaze/controller/error.rb +0 -46
  389. data/lib/ramaze/controller/main.rb +0 -2
  390. data/lib/ramaze/controller/resolve.rb +0 -278
  391. data/lib/ramaze/current/request.rb +0 -222
  392. data/lib/ramaze/current/session/flash.rb +0 -87
  393. data/lib/ramaze/current/session/hash.rb +0 -62
  394. data/lib/ramaze/current/session.rb +0 -179
  395. data/lib/ramaze/dispatcher/action.rb +0 -50
  396. data/lib/ramaze/dispatcher/directory.rb +0 -119
  397. data/lib/ramaze/dispatcher/error.rb +0 -108
  398. data/lib/ramaze/dispatcher/file.rb +0 -100
  399. data/lib/ramaze/dispatcher.rb +0 -145
  400. data/lib/ramaze/error.rb +0 -24
  401. data/lib/ramaze/helper/aspect.rb +0 -106
  402. data/lib/ramaze/helper/cgi.rb +0 -39
  403. data/lib/ramaze/helper/redirect.rb +0 -100
  404. data/lib/ramaze/helper/rest.rb +0 -43
  405. data/lib/ramaze/helper/sendfile.rb +0 -16
  406. data/lib/ramaze/option/dsl.rb +0 -45
  407. data/lib/ramaze/option/holder.rb +0 -131
  408. data/lib/ramaze/option/merger.rb +0 -108
  409. data/lib/ramaze/option.rb +0 -156
  410. data/lib/ramaze/route.rb +0 -97
  411. data/lib/ramaze/snippets/object/traits.rb +0 -76
  412. data/lib/ramaze/snippets/ramaze/caller_info.rb +0 -30
  413. data/lib/ramaze/snippets/ramaze/caller_lines.rb +0 -51
  414. data/lib/ramaze/snippets/ramaze/state.rb +0 -86
  415. data/lib/ramaze/snippets/string/each.rb +0 -19
  416. data/lib/ramaze/spec/helper/browser.rb +0 -88
  417. data/lib/ramaze/spec/helper/mock_http.rb +0 -64
  418. data/lib/ramaze/spec/helper/requester.rb +0 -63
  419. data/lib/ramaze/spec/helper/simple_http.rb +0 -434
  420. data/lib/ramaze/spec/helper.rb +0 -135
  421. data/lib/ramaze/store/default.rb +0 -109
  422. data/lib/ramaze/template/amrita2.rb +0 -45
  423. data/lib/ramaze/template/builder.rb +0 -28
  424. data/lib/ramaze/template/erubis.rb +0 -41
  425. data/lib/ramaze/template/ezamar/element.rb +0 -169
  426. data/lib/ramaze/template/ezamar/engine.rb +0 -76
  427. data/lib/ramaze/template/ezamar/morpher.rb +0 -135
  428. data/lib/ramaze/template/ezamar/render_partial.rb +0 -39
  429. data/lib/ramaze/template/ezamar/textpow.syntax +0 -34
  430. data/lib/ramaze/template/ezamar.rb +0 -42
  431. data/lib/ramaze/template/haml.rb +0 -37
  432. data/lib/ramaze/template/liquid.rb +0 -36
  433. data/lib/ramaze/template/markaby.rb +0 -52
  434. data/lib/ramaze/template/maruku.rb +0 -34
  435. data/lib/ramaze/template/nagoro.rb +0 -52
  436. data/lib/ramaze/template/none.rb +0 -14
  437. data/lib/ramaze/template/redcloth.rb +0 -25
  438. data/lib/ramaze/template/remarkably.rb +0 -38
  439. data/lib/ramaze/template/sass.rb +0 -37
  440. data/lib/ramaze/template/tagz.rb +0 -79
  441. data/lib/ramaze/template/tenjin.rb +0 -74
  442. data/lib/ramaze/template/xslt.rb +0 -100
  443. data/lib/ramaze/template.rb +0 -87
  444. data/lib/ramaze/tool/daemonize.rb +0 -37
  445. data/lib/ramaze/tool/localize.rb +0 -202
  446. data/lib/ramaze/tool/mime.rb +0 -35
  447. data/lib/ramaze/tool/mime_types.yaml +0 -615
  448. data/lib/ramaze/tool/record.rb +0 -6
  449. data/lib/ramaze/tool.rb +0 -9
  450. data/lib/ramaze/trinity.rb +0 -16
  451. data/lib/vendor/bacon.rb +0 -323
  452. data/rake_tasks/conf.rake +0 -71
  453. data/rake_tasks/coverage.rake +0 -45
  454. data/rake_tasks/gem.rake +0 -74
  455. data/rake_tasks/maintenance.rake +0 -386
  456. data/rake_tasks/release.rake +0 -76
  457. data/rake_tasks/spec.rake +0 -61
  458. data/spec/contrib/profiling.rb +0 -29
  459. data/spec/contrib/sequel/fill.rb +0 -47
  460. data/spec/examples/simple_auth.rb +0 -32
  461. data/spec/examples/templates/template_amrita2.rb +0 -16
  462. data/spec/ramaze/action/basics.rb +0 -36
  463. data/spec/ramaze/action/cache.rb +0 -87
  464. data/spec/ramaze/action/file_cache.rb +0 -70
  465. data/spec/ramaze/action/layout.rb +0 -190
  466. data/spec/ramaze/adapter/ebb.rb +0 -12
  467. data/spec/ramaze/adapter/mongrel.rb +0 -12
  468. data/spec/ramaze/adapter/record.rb +0 -31
  469. data/spec/ramaze/adapter/webrick.rb +0 -12
  470. data/spec/ramaze/adapter.rb +0 -49
  471. data/spec/ramaze/cache.rb +0 -140
  472. data/spec/ramaze/controller.rb +0 -180
  473. data/spec/ramaze/current/request.rb +0 -30
  474. data/spec/ramaze/current/session.rb +0 -97
  475. data/spec/ramaze/dispatcher.rb +0 -31
  476. data/spec/ramaze/element.rb +0 -107
  477. data/spec/ramaze/helper/aspect.rb +0 -101
  478. data/spec/ramaze/helper/cgi.rb +0 -43
  479. data/spec/ramaze/helper/file.rb +0 -18
  480. data/spec/ramaze/helper/partial.rb +0 -88
  481. data/spec/ramaze/helper/redirect.rb +0 -112
  482. data/spec/ramaze/localize.rb +0 -89
  483. data/spec/ramaze/morpher.rb +0 -111
  484. data/spec/ramaze/public/error404.xhtml +0 -1
  485. data/spec/ramaze/request/ebb.rb +0 -9
  486. data/spec/ramaze/request/mongrel.rb +0 -9
  487. data/spec/ramaze/request/thin.rb +0 -9
  488. data/spec/ramaze/request/webrick.rb +0 -5
  489. data/spec/ramaze/rewrite.rb +0 -36
  490. data/spec/ramaze/route.rb +0 -131
  491. data/spec/ramaze/session.rb +0 -94
  492. data/spec/ramaze/store/default.rb +0 -71
  493. data/spec/ramaze/template/amrita2/external.amrita +0 -6
  494. data/spec/ramaze/template/amrita2/sum.amrita +0 -1
  495. data/spec/ramaze/template/amrita2.rb +0 -50
  496. data/spec/ramaze/template/builder/external.rxml +0 -3
  497. data/spec/ramaze/template/builder.rb +0 -51
  498. data/spec/ramaze/template/erubis/sum.rhtml +0 -1
  499. data/spec/ramaze/template/erubis.rb +0 -41
  500. data/spec/ramaze/template/ezamar/another/long/action.zmr +0 -1
  501. data/spec/ramaze/template/ezamar/combined.zmr +0 -1
  502. data/spec/ramaze/template/ezamar/file_only.zmr +0 -1
  503. data/spec/ramaze/template/ezamar/index.zmr +0 -1
  504. data/spec/ramaze/template/ezamar/nested.zmr +0 -1
  505. data/spec/ramaze/template/ezamar/other__index.xhtml +0 -1
  506. data/spec/ramaze/template/ezamar/some__long__action.zmr +0 -1
  507. data/spec/ramaze/template/ezamar/sum.zmr +0 -1
  508. data/spec/ramaze/template/ezamar.rb +0 -63
  509. data/spec/ramaze/template/haml/index.haml +0 -5
  510. data/spec/ramaze/template/haml/locals.haml +0 -2
  511. data/spec/ramaze/template/haml/with_vars.haml +0 -4
  512. data/spec/ramaze/template/haml.rb +0 -66
  513. data/spec/ramaze/template/liquid/index.liquid +0 -1
  514. data/spec/ramaze/template/liquid/products.liquid +0 -45
  515. data/spec/ramaze/template/liquid.rb +0 -99
  516. data/spec/ramaze/template/markaby/external.mab +0 -8
  517. data/spec/ramaze/template/markaby/sum.mab +0 -1
  518. data/spec/ramaze/template/markaby.rb +0 -61
  519. data/spec/ramaze/template/nagoro/another/long/action.nag +0 -1
  520. data/spec/ramaze/template/nagoro/combined.nag +0 -1
  521. data/spec/ramaze/template/nagoro/file_only.nag +0 -1
  522. data/spec/ramaze/template/nagoro/index.nag +0 -1
  523. data/spec/ramaze/template/nagoro/nested.nag +0 -1
  524. data/spec/ramaze/template/nagoro/some__long__action.nag +0 -1
  525. data/spec/ramaze/template/nagoro/sum.nag +0 -1
  526. data/spec/ramaze/template/nagoro.rb +0 -64
  527. data/spec/ramaze/template/redcloth/external.redcloth +0 -1
  528. data/spec/ramaze/template/redcloth.rb +0 -38
  529. data/spec/ramaze/template/remarkably.rb +0 -58
  530. data/spec/ramaze/template/sass.rb +0 -69
  531. data/spec/ramaze/template/tenjin/external.tenjin +0 -1
  532. data/spec/ramaze/template/tenjin.rb +0 -47
  533. data/spec/ramaze/template/xslt/concat_words.xsl +0 -16
  534. data/spec/ramaze/template/xslt/index.xsl +0 -14
  535. data/spec/ramaze/template/xslt/products.xsl +0 -32
  536. data/spec/ramaze/template/xslt/ruby_version.xsl +0 -14
  537. data/spec/ramaze/template/xslt.rb +0 -90
  538. data/spec/ramaze/template.rb +0 -128
  539. data/spec/snippets/ramaze/caller_info.rb +0 -39
  540. data/spec/snippets/ramaze/caller_lines.rb +0 -30
@@ -4,19 +4,11 @@ require 'coderay'
4
4
  require 'ramaze'
5
5
 
6
6
  # where is the source
7
- RAMAZE_SRC = File.expand_path(Ramaze::BASEDIR/'../') unless defined? RAMAZE_SRC
8
-
9
- # delete cached filetree when source changes
10
- module Ramaze::SourceReloadHooks
11
- module_function
12
- def after_safe_load file
13
- Ramaze::Cache.actions.clear
14
- end
15
- end
16
-
17
7
  class MainController < Ramaze::Controller
8
+ SOURCE_PATH = File.expand_path(File.join(Ramaze::ROOT, '../'))
18
9
 
19
10
  include Remarkably::Common
11
+
20
12
  helper :cache, :aspect
21
13
  engine :None
22
14
 
@@ -28,47 +20,57 @@ class MainController < Ramaze::Controller
28
20
  file = args.join('/')
29
21
  return if file.empty? or file =~ /\.{2}/
30
22
 
31
- file[0,0] = RAMAZE_SRC + '/'
32
- CodeRay.scan_file(file).html(:line_numbers => :table) if FileTest.file? file
23
+ file[0,0] = SOURCE_PATH + '/'
24
+ CodeRay.scan_file(file).html(:line_numbers => :table) if File.file?(file)
33
25
  end
34
- before(:source){ %(<link href='/coderay.css' rel='stylesheet' type='text/css' />) unless request.xhr? }
26
+
27
+ before(:source){
28
+ %(<link href='/coderay.css' rel='stylesheet' type='text/css' />) unless request.xhr?
29
+ }
35
30
 
36
31
  def filetree
37
- ul :class => 'filetree treeview' do
38
- Dir.chdir(RAMAZE_SRC) do
39
- Dir['{benchmarks,doc,examples,lib,spec}'].collect do |d|
40
- dir_listing d
41
- end
32
+ ul(:class => 'filetree treeview'){
33
+ Dir.chdir(SOURCE_PATH) do
34
+ Dir['{benchmarks,doc,examples,lib,spec}'].map{|d| dir_listing(d) }
42
35
  end
43
- end.to_s
36
+ }.to_s
44
37
  end
45
38
  cache :filetree
46
39
 
47
40
  private
48
41
 
49
- def dir_listing dir
50
- li do
51
- span dir, :class => 'folder'
42
+ def dir_listing(dir)
43
+ li{
44
+ span(dir, :class => 'folder')
45
+
52
46
  Dir.chdir(dir) do
53
- ul :style => 'display: none;' do
54
- a '', :href => "##{File.expand_path('.').sub(RAMAZE_SRC,'')}"
47
+ ul(:style => 'display: none;'){
48
+ a('', :href => "##{File.expand_path('.').sub(SOURCE_PATH, '')}")
49
+
55
50
  Dir['*'].sort.each do |d|
56
- if FileTest.directory? d
57
- dir_listing d
51
+ if File.directory?(d)
52
+ dir_listing(d)
58
53
  else
59
- file = File.expand_path(d).sub(RAMAZE_SRC,'')
60
- li do
61
- span :class => 'file' do
62
- a d, :href => "##{file}"
63
- end
64
- end
54
+ file = File.expand_path(d).sub(SOURCE_PATH, '')
55
+ li{
56
+ span(:class => 'file'){
57
+ a(d, :href => "##{file}")
58
+ }
59
+ }
65
60
  end
66
61
  end
67
- end if Dir['*'].any?
62
+ } if Dir['*'].any?
68
63
  end
69
- end
64
+ }
70
65
  end
66
+ end
71
67
 
68
+ # delete cached filetree when source changes
69
+ module Ramaze::SourceReloadHooks
70
+ module_function
71
+ def after_safe_load file
72
+ Ramaze::Cache.actions.clear
73
+ end
72
74
  end
73
75
 
74
76
  Ramaze.start :adapter => :mongrel,
@@ -0,0 +1,10 @@
1
+ module TodoList
2
+ class Controller < Ramaze::Controller
3
+ layout :default
4
+ engine :Etanni
5
+ helper :form
6
+ trait :app => :todolist
7
+ end
8
+ end
9
+
10
+ require 'controller/task'
@@ -0,0 +1,39 @@
1
+ module TodoList
2
+ class Tasks < Controller
3
+ map '/'
4
+
5
+ def index
6
+ @tasks = Task.all
7
+ @title = request[:title]
8
+ end
9
+
10
+ def create
11
+ if request.post? and title = request[:title]
12
+ title.strip!
13
+
14
+ unless title.empty?
15
+ Task.create :title => title
16
+ end
17
+ end
18
+
19
+ redirect route('/', :title => title)
20
+ rescue Sequel::DatabaseError => ex
21
+ redirect route('/', :title => title)
22
+ end
23
+
24
+ def open(title)
25
+ Task[:title => title].open!
26
+ redirect r('/')
27
+ end
28
+
29
+ def close(title)
30
+ Task[:title => title].close!
31
+ redirect r('/')
32
+ end
33
+
34
+ def delete(title)
35
+ Task[:title => title].destroy
36
+ redirect r('/')
37
+ end
38
+ end
39
+ end
@@ -0,0 +1,14 @@
1
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
2
+ <html>
3
+ <head>
4
+ <title>TodoList</title>
5
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
6
+ <link rel="stylesheet" type="text/css" href="/css/screen.css" />
7
+ </head>
8
+ <body>
9
+ <h1>TodoList</h1>
10
+ <div class="content">
11
+ #{@content}
12
+ </div>
13
+ </body>
14
+ </html>
@@ -0,0 +1,14 @@
1
+ module TodoList
2
+ # yeah, we're lazy
3
+ Sequel::Model.plugin(:schema)
4
+
5
+ # Uncomment the line for the DB you want to use.
6
+
7
+ # Sqlite In memory, fastest, but cannot persist over restarts.
8
+ DB = Sequel.sqlite
9
+
10
+ # Sqlite on disk
11
+ # DB = Sequel.sqlite(__DIR__('../todolist.sqlite'))
12
+ end
13
+
14
+ require 'model/task'
@@ -0,0 +1,39 @@
1
+ module TodoList
2
+ class Task < Sequel::Model
3
+ set_schema do
4
+ primary_key :id
5
+
6
+ varchar :title, :unique => true, :empty => false
7
+ boolean :done, :default => false
8
+ end
9
+
10
+ create_table unless table_exists?
11
+
12
+ def href(action)
13
+ Tasks.r(action, Ramaze::Helper::CGI.url_encode(title))
14
+ end
15
+
16
+ def toggle_link
17
+ action = done ? 'open' : 'close'
18
+ Tasks.a(action, href(action))
19
+ end
20
+
21
+ def delete_link
22
+ Tasks.a('delete', href('delete'))
23
+ end
24
+
25
+ def status
26
+ done ? 'done' : 'pending'
27
+ end
28
+
29
+ def close!
30
+ self.done = true
31
+ save
32
+ end
33
+
34
+ def open!
35
+ self.done = false
36
+ save
37
+ end
38
+ end
39
+ end
@@ -0,0 +1,63 @@
1
+ h1 {
2
+ text-align: center;
3
+ color: #33f;
4
+ }
5
+
6
+ th {
7
+ color: #33f;
8
+ }
9
+
10
+ fieldset {
11
+ border: 0;
12
+ width: 21em;
13
+ margin: auto;
14
+ padding: 1em;
15
+ margin-bottom: 2em;
16
+ }
17
+
18
+ fieldset legend {
19
+ color: #33f;
20
+ }
21
+
22
+ table {
23
+ width: 50em;
24
+ border: 2px solid #eef;
25
+ margin: auto;
26
+ }
27
+
28
+ table caption {
29
+ color: #33f;
30
+ }
31
+
32
+ tr.done {
33
+ background: #efe;
34
+ }
35
+
36
+ tr.pending {
37
+ background: #fee;
38
+ }
39
+
40
+ tr:hover {
41
+ background: #eef;
42
+ }
43
+
44
+ td {
45
+ width: 5em;
46
+ }
47
+
48
+ td.title {
49
+ font-weight: bold;
50
+ width: auto;
51
+ }
52
+
53
+ td a {
54
+ display: block;
55
+ }
56
+
57
+ td.toggle a {
58
+ color: #3a3;
59
+ }
60
+
61
+ td.delete a {
62
+ color: #f00;
63
+ }
@@ -1,11 +1,11 @@
1
- # Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
2
- # All files in this distribution are subject to the terms of the Ruby license.
3
-
4
1
  require 'rubygems'
5
2
  require 'ramaze'
6
3
 
7
- require 'src/controller/main'
8
- require 'src/element/page'
9
- require 'src/model'
4
+ Ramaze.setup do
5
+ gem 'sequel'
6
+ end
7
+
8
+ require 'controller/init'
9
+ require 'model/init'
10
10
 
11
11
  Ramaze.start
@@ -0,0 +1,29 @@
1
+ <form method="post" action="#{r 'create'}">
2
+ <fieldset>
3
+ <legend>Add a task by entering a title.</legend>
4
+ <label for="form-title">Task title:</label>
5
+ <input id="form-title" name="title" type="text" value="#{@title}" />
6
+ <input type="submit" value="Create" />
7
+ </fieldset>
8
+ </form>
9
+
10
+ #{flashbox}
11
+
12
+ <?r if @tasks.empty? ?>
13
+ No Tasks
14
+ <?r else ?>
15
+ <table summary="tasks in the todolist">
16
+ <caption>
17
+ All pending and closed tasks, in order of creation.
18
+ </caption>
19
+ <tr><th>Title</th><th>Status</th><th>Toggle</th><th>Delete</th></tr>
20
+ <?r @tasks.each do |task| ?>
21
+ <tr class="#{task.status}">
22
+ <td class="title"> #{h task.title} </td>
23
+ <td class="status"> #{task.status.capitalize} </td>
24
+ <td class="toggle"> #{task.toggle_link} </td>
25
+ <td class="delete"> #{task.delete_link} </td>
26
+ </tr>
27
+ <?r end ?>
28
+ </table>
29
+ <?r end ?>
@@ -1,20 +1,18 @@
1
1
  require 'ramaze'
2
- require 'ramaze/spec/helper'
2
+ require 'ramaze/spec'
3
3
 
4
- spec_require 'hpricot', 'sequel'
4
+ spec_requires 'hpricot', 'sequel'
5
5
 
6
6
  $LOAD_PATH.unshift base = __DIR__('..')
7
7
  require 'start'
8
8
 
9
9
  describe 'Wikore' do
10
- behaves_like 'http'
11
- ramaze :public_root => base/:public,
12
- :view_root => base/:template
10
+ behaves_like :mock
13
11
 
14
12
  def check_redirect(to = '/')
15
13
  response = yield
16
14
  response.status.should == 302
17
- response.body.should =~ /<a href="#{to}">/
15
+ response.body.should =~ /<a href='.*#{to}'>/
18
16
  end
19
17
 
20
18
  def page_should_exist(name, *matches)
@@ -18,26 +18,28 @@ class MainController < Ramaze::Controller
18
18
  end
19
19
  end
20
20
 
21
- class PageController < Ramaze::Controller
21
+ class Pages < Ramaze::Controller
22
22
  map '/page'
23
23
 
24
- helper :aspect
25
-
26
24
  def create
25
+ redirect_referer unless request.post?
26
+
27
27
  change "Created Page '%s'" do |title, text|
28
28
  Page.create(:title => title, :text => text, :version => 1)
29
- redirect R(MainController, title)
29
+ redirect MainController.r(:/, title)
30
30
  end
31
31
  end
32
32
 
33
33
  def save
34
+ redirect_referer unless request.post?
35
+
34
36
  change "Updated Page '%s'" do |title, text|
35
37
  page = Page[:title => title]
36
38
  page.backup
37
39
  page.text = text
38
40
  page.version += 1
39
41
  page.save
40
- redirect R(MainController, title)
42
+ redirect MainController.r(:/, title)
41
43
  end
42
44
  end
43
45
 
@@ -60,11 +62,7 @@ class PageController < Ramaze::Controller
60
62
  def revert(title)
61
63
  page = Page[:title => title]
62
64
  page.revert
63
- redirect R(MainController, title)
64
- end
65
-
66
- before :create, :save do
67
- redirect_referer unless request.post?
65
+ redirect MainController.r(:/, title)
68
66
  end
69
67
 
70
68
  private
@@ -75,6 +73,6 @@ class PageController < Ramaze::Controller
75
73
  message % title
76
74
  end
77
75
 
78
- redirect(R(MainController, redirect_to))
76
+ redirect MainController.r(redirect_to)
79
77
  end
80
78
  end
@@ -1,17 +1,14 @@
1
1
  require 'sequel'
2
2
 
3
- begin
4
- case $wikore_db
5
- when :memory
6
- DB = Sequel.sqlite
7
- else
8
- DB_FILE = __DIR__('wikore.db')
9
- DB = Sequel.connect("sqlite://#{DB_FILE}")
10
- end
11
- rescue NoMethodError
12
- raise LoadError, 'Install latest Sequel gem'
3
+ if $wikore_db == :memory
4
+ DB = Sequel.sqlite
5
+ else
6
+ DB_FILE = __DIR__('wikore.db')
7
+ DB = Sequel.connect("sqlite://#{DB_FILE}")
13
8
  end
14
9
 
10
+ Sequel::Model.plugin :schema
11
+
15
12
  module Model
16
13
  PAGE_SCHEMA = lambda{
17
14
  primary_key :id
@@ -6,4 +6,4 @@ $wikore = {}
6
6
  require 'src/model'
7
7
  require 'src/controller'
8
8
 
9
- Ramaze.start
9
+ Ramaze.start :file => __FILE__
File without changes
@@ -1,7 +1,8 @@
1
1
  require 'rubygems'
2
2
  require 'ramaze'
3
+ require 'nagoro'
3
4
 
4
- class Page < Ezamar::Element
5
+ class Page < Nagoro::Element
5
6
  def render
6
7
  %{
7
8
  <html>
@@ -17,7 +18,7 @@ class Page < Ezamar::Element
17
18
  end
18
19
  end
19
20
 
20
- class SideBar < Ezamar::Element
21
+ class SideBar < Nagoro::Element
21
22
  def render
22
23
  %{
23
24
  <div class="sidebar">
@@ -29,6 +30,7 @@ end
29
30
 
30
31
  class MainController < Ramaze::Controller
31
32
  map '/'
33
+ engine :Nagoro
32
34
 
33
35
  def index
34
36
  %{
@@ -42,4 +44,4 @@ class MainController < Ramaze::Controller
42
44
  end
43
45
  end
44
46
 
45
- Ramaze.start
47
+ Ramaze.start
@@ -1,5 +1,4 @@
1
1
  require 'ramaze'
2
- require 'ramaze/gestalt'
3
2
 
4
3
  class MainController < Ramaze::Controller
5
4
  helper :gestalt
@@ -24,4 +23,4 @@ class MainController < Ramaze::Controller
24
23
  end
25
24
  end
26
25
 
27
- Ramaze.start :adapter => :mongrel
26
+ Ramaze.start
@@ -1,10 +1,9 @@
1
1
  require 'rubygems'
2
2
  require 'ramaze'
3
3
 
4
- # you can access it now with http://localhost:7000/
5
- # This should output
6
- # Hello, World!
7
- # in your browser
4
+ # Start this example with `ruby hello.rb`.
5
+ # After startup you will be able to access it at http://localhost:7000/
6
+ # This should output "Hello, World!" in your browser.
8
7
 
9
8
  class MainController < Ramaze::Controller
10
9
  def index
@@ -2,8 +2,8 @@ require 'rubygems'
2
2
  require 'ramaze'
3
3
 
4
4
  class MainController < Ramaze::Controller
5
- map '/'
6
5
  layout :page
6
+ provide :html => :nagoro
7
7
 
8
8
  def index
9
9
  @title = "Test"
@@ -11,7 +11,7 @@ class MainController < Ramaze::Controller
11
11
  end
12
12
 
13
13
  def page
14
- %{
14
+ %q{
15
15
  <html>
16
16
  <head>
17
17
  <title>examples/layout</title>
@@ -5,25 +5,25 @@ class LinkingController < Ramaze::Controller
5
5
  map '/'
6
6
 
7
7
  def index
8
- %{simple link <br/> <a href="#{Rs(:help)}">Help?</a>}
8
+ %{simple link <br/> <a href="#{r(:help)}">Help?</a>}
9
9
  end
10
-
10
+
11
11
  def new
12
12
  "something new!"
13
13
  end
14
-
14
+
15
15
  def help
16
- %{you have help <br/> <a href="#{R(LinkToController, :another)}">A Different Controller</a>}
16
+ %{you have help <br/> <a href="#{LinkToController.r(:another)}">A Different Controller</a>}
17
17
  end
18
18
 
19
19
  end
20
20
 
21
21
  class LinkToController < Ramaze::Controller
22
22
  map '/link_to'
23
-
23
+
24
24
  def another
25
- %{<a href="#{R(LinkingController, :index)}">Back to Original Controller</a>}
25
+ %{<a href="#{LinkingController.r(:index)}">Back to Original Controller</a>}
26
26
  end
27
27
  end
28
28
 
29
- Ramaze.start :adapter => :mongrel
29
+ Ramaze.start
@@ -2,15 +2,13 @@ require 'rubygems'
2
2
  require 'ramaze'
3
3
 
4
4
  # This is a small extension to the hello world example, showing how to use the
5
- # <render> tag of Ezamar.
5
+ # <render> tag of Nagoro.
6
6
  #
7
7
  # Browse to /more and /even_more
8
8
 
9
- pipeline = Ramaze::Template::Ezamar::TRANSFORM_PIPELINE
10
- pipeline.put_after(::Ezamar::Element, ::Ezamar::RenderPartial)
11
- pipeline.uniq!
12
-
13
9
  class MainController < Ramaze::Controller
10
+ provide :html => :nagoro
11
+
14
12
  def index
15
13
  "Hello, World!"
16
14
  end
@@ -24,10 +24,6 @@ class SimpleController < Ramaze::Controller
24
24
  "simple"
25
25
  end
26
26
 
27
- def simple
28
- request.inspect
29
- end
30
-
31
27
  def join(first, second)
32
28
  [first, second].join
33
29
  end
@@ -37,7 +33,7 @@ class SimpleController < Ramaze::Controller
37
33
  end
38
34
 
39
35
  def sum first, second
40
- first.to_i + second.to_i
36
+ "#{first.to_i + second.to_i}"
41
37
  end
42
38
 
43
39
  def post_or_get
@@ -2,10 +2,8 @@ require 'rubygems'
2
2
  require 'ramaze'
3
3
 
4
4
  class MainController < Ramaze::Controller
5
- map :/
6
-
5
+ map '/'
7
6
  helper :cache
8
- cache :index
9
7
 
10
8
  def index
11
9
  %[
@@ -22,10 +20,12 @@ class MainController < Ramaze::Controller
22
20
  ]
23
21
  end
24
22
 
23
+ cache_action :method => :index
24
+
25
25
  def invalidate
26
- action_cache.delete '/index'
26
+ Ramaze::Cache.action.delete(:method => 'index')
27
27
  redirect :/
28
28
  end
29
29
  end
30
30
 
31
- Ramaze.start
31
+ Ramaze.start