Pistos-ramaze 2009.02 → 2009.04.08

Sign up to get free protection for your applications and to get access to all the features.
Files changed (530) hide show
  1. data/.mailmap +25 -0
  2. data/CHANGELOG +16546 -0
  3. data/MANIFEST +487 -0
  4. data/{README.md → README.markdown} +0 -5
  5. data/Rakefile +75 -242
  6. data/bin/ramaze +142 -55
  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.nag +25 -0
  12. data/examples/app/auth/start.rb +23 -0
  13. data/examples/app/auth/view/index.nag +4 -0
  14. data/examples/app/auth/view/login.nag +20 -0
  15. data/examples/app/auth/view/secret.nag +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 +76 -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 +80 -28
  26. data/examples/app/blog/model/init.rb +10 -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/basic/element.rb +5 -3
  60. data/examples/basic/gestalt.rb +1 -2
  61. data/examples/basic/hello.rb +3 -4
  62. data/examples/basic/layout.rb +2 -2
  63. data/examples/basic/linking.rb +7 -7
  64. data/examples/basic/partial.rb +3 -5
  65. data/examples/basic/simple.rb +1 -5
  66. data/examples/helpers/cache.rb +5 -5
  67. data/examples/helpers/httpdigest.rb +31 -32
  68. data/examples/misc/memleak_detector.rb +17 -12
  69. data/examples/misc/serve_directory.rb +6 -0
  70. data/examples/templates/template_erubis.rb +9 -10
  71. data/examples/templates/template_ezamar.rb +8 -7
  72. data/examples/templates/template_haml.rb +6 -7
  73. data/examples/templates/template_liquid.rb +20 -19
  74. data/examples/templates/template_markaby.rb +2 -3
  75. data/examples/templates/template_nagoro.rb +6 -7
  76. data/examples/templates/template_redcloth.rb +8 -9
  77. data/examples/templates/template_remarkably.rb +7 -8
  78. data/examples/templates/template_tenjin.rb +6 -7
  79. data/examples/templates/{template → view}/external.haml +4 -4
  80. data/examples/templates/{template → view}/external.liquid +0 -0
  81. data/examples/templates/{template → view}/external.mab +0 -0
  82. data/examples/templates/{template → view}/external.nag +4 -4
  83. data/examples/templates/{template → view}/external.redcloth +4 -4
  84. data/examples/templates/{template → view}/external.rem +4 -4
  85. data/examples/templates/{template → view}/external.rhtml +6 -6
  86. data/examples/templates/{template → view}/external.tenjin +4 -4
  87. data/examples/templates/{template → view}/external.zmr +6 -6
  88. data/lib/proto/config.ru +17 -0
  89. data/lib/proto/controller/init.rb +2 -2
  90. data/lib/proto/layout/default.xhtml +24 -0
  91. data/lib/proto/public/css/screen.css +30 -0
  92. data/lib/proto/public/js/jquery.js +2121 -1294
  93. data/lib/proto/spec/main.rb +8 -11
  94. data/lib/proto/start.rb +3 -3
  95. data/lib/proto/view/index.xhtml +34 -27
  96. data/lib/ramaze/app.rb +124 -0
  97. data/lib/ramaze/cache/localmemcache.rb +56 -0
  98. data/lib/ramaze/cache/memcache.rb +99 -0
  99. data/lib/ramaze/cache/sequel.rb +67 -0
  100. data/lib/ramaze/cache.rb +9 -104
  101. data/lib/ramaze/contrib/app_graph.rb +64 -0
  102. data/lib/ramaze/contrib/gettext/po.rb +23 -23
  103. data/lib/ramaze/contrib/gzip_filter.rb +1 -69
  104. data/lib/ramaze/contrib/rest.rb +20 -15
  105. data/lib/ramaze/contrib/sequel/relation.rb +4 -2
  106. data/lib/ramaze/controller/default.rb +12 -0
  107. data/lib/ramaze/controller.rb +63 -257
  108. data/lib/ramaze/current.rb +3 -47
  109. data/lib/ramaze/files.rb +24 -0
  110. data/lib/ramaze/gestalt.rb +6 -1
  111. data/lib/ramaze/helper/auth.rb +68 -104
  112. data/lib/ramaze/helper/bench.rb +0 -2
  113. data/lib/ramaze/helper/cache.rb +59 -122
  114. data/lib/ramaze/helper/disqus.rb +26 -0
  115. data/lib/ramaze/helper/flash.rb +32 -44
  116. data/lib/ramaze/helper/form.rb +83 -252
  117. data/lib/ramaze/helper/formatting.rb +30 -5
  118. data/lib/ramaze/helper/gestalt.rb +1 -1
  119. data/lib/ramaze/helper/gravatar.rb +66 -19
  120. data/lib/ramaze/helper/httpdigest.rb +75 -66
  121. data/lib/ramaze/helper/link.rb +62 -109
  122. data/lib/ramaze/helper/localize.rb +128 -0
  123. data/lib/ramaze/helper/markaby.rb +1 -1
  124. data/lib/ramaze/helper/maruku.rb +10 -3
  125. data/lib/ramaze/helper/pager.rb +2 -1
  126. data/lib/ramaze/helper/paginate.rb +16 -9
  127. data/lib/ramaze/helper/partial.rb +86 -91
  128. data/lib/ramaze/helper/remarkably.rb +14 -0
  129. data/lib/ramaze/helper/request_accessor.rb +16 -0
  130. data/lib/ramaze/helper/sequel_form.rb +284 -0
  131. data/lib/ramaze/helper/simple_captcha.rb +46 -16
  132. data/lib/ramaze/helper/stack.rb +64 -66
  133. data/lib/ramaze/helper/user.rb +141 -22
  134. data/lib/ramaze/helper/xhtml.rb +27 -16
  135. data/lib/ramaze/helper.rb +6 -81
  136. data/lib/ramaze/log/analogger.rb +1 -2
  137. data/lib/ramaze/log/informer.rb +1 -0
  138. data/lib/ramaze/log/logging.rb +2 -8
  139. data/lib/ramaze/log/syslog.rb +36 -36
  140. data/lib/ramaze/log.rb +19 -7
  141. data/lib/ramaze/middleware_compiler.rb +13 -0
  142. data/lib/ramaze/plugin.rb +69 -0
  143. data/lib/ramaze/reloader.rb +8 -6
  144. data/lib/ramaze/request.rb +117 -0
  145. data/lib/ramaze/{current/response.rb → response.rb} +9 -10
  146. data/lib/ramaze/setup.rb +93 -33
  147. data/lib/ramaze/snippets/ramaze/deprecated.rb +3 -1
  148. data/lib/ramaze/snippets/{dictionary.rb → ramaze/dictionary.rb} +0 -104
  149. data/lib/ramaze/snippets/ramaze/fiber.rb +5 -5
  150. data/lib/ramaze/spec/helper/bacon.rb +4 -3
  151. data/lib/ramaze/spec/helper/snippets.rb +3 -1
  152. data/lib/ramaze/spec/helper/template_examples.rb +29 -0
  153. data/lib/ramaze/spec.rb +37 -1
  154. data/lib/ramaze/tool/create.rb +1 -1
  155. data/lib/ramaze/version.rb +1 -4
  156. data/lib/ramaze/view/erubis.rb +23 -0
  157. data/lib/ramaze/view/ezamar.rb +23 -0
  158. data/lib/ramaze/view/haml.rb +15 -0
  159. data/lib/ramaze/view/liquid.rb +66 -0
  160. data/lib/ramaze/view/maruku.rb +14 -0
  161. data/lib/ramaze/view/nagoro/render_partial.rb +32 -0
  162. data/lib/ramaze/view/nagoro.rb +44 -0
  163. data/lib/ramaze/view/redcloth.rb +21 -0
  164. data/lib/ramaze/view/remarkably.rb +21 -0
  165. data/lib/ramaze/view/sass.rb +21 -0
  166. data/lib/ramaze/view/tagz.rb +63 -0
  167. data/lib/ramaze/view/tenjin.rb +29 -0
  168. data/lib/ramaze/view.rb +44 -0
  169. data/lib/ramaze.rb +76 -129
  170. data/lib/vendor/etag.rb +20 -0
  171. data/lib/vendor/route_exceptions.rb +48 -0
  172. data/ramaze.gemspec +28 -612
  173. data/spec/contrib/rest.rb +28 -0
  174. data/spec/examples/caching.rb +1 -2
  175. data/spec/examples/css.rb +1 -2
  176. data/spec/examples/element.rb +1 -2
  177. data/spec/examples/hello.rb +2 -3
  178. data/spec/examples/helpers/httpdigest.rb +89 -0
  179. data/spec/examples/linking.rb +1 -2
  180. data/spec/examples/simple.rb +1 -6
  181. data/spec/examples/templates/template_erubis.rb +3 -17
  182. data/spec/examples/templates/template_ezamar.rb +3 -18
  183. data/spec/examples/templates/template_haml.rb +3 -17
  184. data/spec/examples/templates/template_liquid.rb +3 -23
  185. data/spec/examples/templates/template_markaby.rb +6 -19
  186. data/spec/examples/templates/template_nagoro.rb +9 -0
  187. data/spec/examples/templates/template_redcloth.rb +3 -22
  188. data/spec/examples/templates/template_remarkably.rb +3 -17
  189. data/spec/examples/templates/template_tenjin.rb +3 -22
  190. data/spec/helper.rb +10 -3
  191. data/spec/ramaze/action/render.rb +5 -15
  192. data/spec/ramaze/action/view/other_wrapper.erb +1 -0
  193. data/spec/ramaze/action/view/sub/sub_wrapper.erb +1 -0
  194. data/spec/ramaze/app.rb +47 -0
  195. data/spec/ramaze/cache/localmemcache.rb +49 -0
  196. data/spec/ramaze/cache/memcache.rb +54 -0
  197. data/spec/ramaze/cache/sequel.rb +51 -0
  198. data/spec/ramaze/controller/actionless_templates.rb +14 -10
  199. data/spec/ramaze/controller/mapping.rb +57 -0
  200. data/spec/ramaze/controller/provide_inheritance.rb +47 -0
  201. data/spec/ramaze/controller/resolve.rb +7 -9
  202. data/spec/ramaze/controller/subclass.rb +13 -13
  203. data/spec/ramaze/controller/template_resolving.rb +21 -57
  204. data/spec/ramaze/dispatcher/directory.rb +38 -24
  205. data/spec/ramaze/dispatcher/file.rb +53 -44
  206. data/spec/ramaze/error.rb +56 -62
  207. data/spec/ramaze/files/public_1/plain.txt +1 -0
  208. data/spec/ramaze/files/public_2/rich.txt +1 -0
  209. data/spec/ramaze/files.rb +29 -0
  210. data/spec/ramaze/gestalt.rb +2 -4
  211. data/spec/ramaze/helper/auth.rb +53 -25
  212. data/spec/ramaze/helper/bench.rb +17 -0
  213. data/spec/ramaze/helper/cache.rb +38 -114
  214. data/spec/ramaze/helper/flash.rb +22 -110
  215. data/spec/ramaze/helper/form.rb +336 -98
  216. data/spec/ramaze/helper/formatting.rb +66 -9
  217. data/spec/ramaze/helper/gestalt.rb +15 -0
  218. data/spec/ramaze/helper/gravatar.rb +40 -0
  219. data/spec/ramaze/helper/httpdigest.rb +162 -0
  220. data/spec/ramaze/helper/link.rb +25 -100
  221. data/spec/ramaze/helper/localize.rb +60 -0
  222. data/spec/ramaze/helper/maruku.rb +19 -0
  223. data/spec/ramaze/helper/pager.rb +13 -16
  224. data/spec/ramaze/helper/paginate.rb +68 -0
  225. data/spec/ramaze/helper/partial.rb +23 -71
  226. data/spec/ramaze/helper/request_accessor.rb +19 -0
  227. data/spec/ramaze/helper/sequel_form.rb +89 -0
  228. data/spec/ramaze/helper/simple_captcha.rb +40 -13
  229. data/spec/ramaze/helper/stack.rb +56 -35
  230. data/spec/ramaze/helper/user.rb +36 -9
  231. data/spec/ramaze/helper/xhtml.rb +32 -0
  232. data/spec/ramaze/log/informer.rb +20 -19
  233. data/spec/ramaze/log/logging.rb +63 -0
  234. data/spec/ramaze/log/syslog.rb +59 -62
  235. data/spec/ramaze/params.rb +8 -11
  236. data/spec/ramaze/request.rb +45 -181
  237. data/spec/ramaze/view/erubis/external.rhtml +8 -0
  238. data/spec/ramaze/view/erubis/sum.rhtml +1 -0
  239. data/spec/ramaze/view/erubis.rb +73 -0
  240. data/spec/ramaze/view/ezamar/external.zmr +8 -0
  241. data/spec/ramaze/view/ezamar/sum.zmr +1 -0
  242. data/spec/ramaze/view/ezamar.rb +73 -0
  243. data/spec/ramaze/view/haml/external.haml +5 -0
  244. data/spec/ramaze/view/haml/sum.haml +2 -0
  245. data/spec/ramaze/view/haml.rb +86 -0
  246. data/spec/ramaze/view/liquid/external.liquid +8 -0
  247. data/spec/ramaze/view/liquid/sum.liquid +1 -0
  248. data/spec/ramaze/view/liquid.rb +73 -0
  249. data/spec/ramaze/view/nagoro/external.nag +8 -0
  250. data/spec/ramaze/view/nagoro/sum.nag +1 -0
  251. data/spec/ramaze/view/nagoro.rb +73 -0
  252. data/spec/ramaze/view/redcloth/external.redcloth +8 -0
  253. data/spec/ramaze/view/redcloth.rb +66 -0
  254. data/spec/ramaze/{template → view}/remarkably/external.rem +0 -0
  255. data/spec/ramaze/{template → view}/remarkably/sum.rem +0 -0
  256. data/spec/ramaze/view/remarkably.rb +49 -0
  257. data/spec/ramaze/{template → view}/sass/file.css.sass +0 -0
  258. data/spec/ramaze/view/sass.rb +73 -0
  259. data/spec/ramaze/{template → view}/tagz/external.tagz +0 -0
  260. data/spec/ramaze/{template → view}/tagz/sum.tagz +0 -0
  261. data/spec/ramaze/{template → view}/tagz.rb +18 -29
  262. data/spec/ramaze/view/tenjin/external.rbhtml +8 -0
  263. data/spec/ramaze/view/tenjin/sum.rbhtml +1 -0
  264. data/spec/ramaze/view/tenjin.rb +57 -0
  265. data/spec/ramaze/view.rb +36 -0
  266. data/spec/snippets/ramaze/dictionary.rb +110 -0
  267. data/spec/snippets/ramaze/struct.rb +12 -0
  268. data/spec/snippets/thread/into.rb +3 -14
  269. data/tasks/authors.rake +30 -0
  270. data/tasks/bacon.rake +66 -0
  271. data/tasks/changelog.rake +18 -0
  272. data/tasks/copyright.rake +21 -0
  273. data/tasks/gem.rake +22 -0
  274. data/tasks/gem_installer.rake +76 -0
  275. data/{rake_tasks → tasks}/git.rake +10 -5
  276. data/tasks/grancher.rake +12 -0
  277. data/tasks/install_dependencies.rake +6 -0
  278. data/tasks/jquery.rake +15 -0
  279. data/tasks/manifest.rake +4 -0
  280. data/{rake_tasks/metric.rake → tasks/metric_changes.rake} +7 -7
  281. data/tasks/rcov.rake +23 -0
  282. data/tasks/release.rake +69 -0
  283. data/tasks/reversion.rake +8 -0
  284. data/tasks/todo.rake +29 -0
  285. data/tasks/traits.rake +21 -0
  286. data/tasks/yard.rake +4 -0
  287. metadata +173 -290
  288. data/benchmark/suite/template_amrita2.rb +0 -17
  289. data/doc/readme_chunks/appendix.txt +0 -10
  290. data/doc/readme_chunks/examples.txt +0 -38
  291. data/doc/readme_chunks/features.txt +0 -148
  292. data/doc/readme_chunks/getting_help.txt +0 -5
  293. data/doc/readme_chunks/getting_started.txt +0 -18
  294. data/doc/readme_chunks/installing.txt +0 -92
  295. data/doc/readme_chunks/introduction.txt +0 -18
  296. data/doc/readme_chunks/principles.txt +0 -56
  297. data/doc/readme_chunks/thanks.txt +0 -59
  298. data/examples/app/auth/auth.rb +0 -54
  299. data/examples/app/auth/template/layout.haml +0 -20
  300. data/examples/app/auth/template/login.haml +0 -16
  301. data/examples/app/blog/public/styles/blog.css +0 -132
  302. data/examples/app/blog/view/edit.xhtml +0 -17
  303. data/examples/app/blog/view/index.xhtml +0 -17
  304. data/examples/app/blog/view/layout.xhtml +0 -11
  305. data/examples/app/blog/view/new.xhtml +0 -16
  306. data/examples/app/rapaste/Rakefile +0 -34
  307. data/examples/app/rapaste/controller/paste.rb +0 -101
  308. data/examples/app/rapaste/model/paste.rb +0 -58
  309. data/examples/app/rapaste/public/css/active4d.css +0 -114
  310. data/examples/app/rapaste/public/css/all_hallows_eve.css +0 -72
  311. data/examples/app/rapaste/public/css/amy.css +0 -147
  312. data/examples/app/rapaste/public/css/blackboard.css +0 -88
  313. data/examples/app/rapaste/public/css/brilliance_black.css +0 -605
  314. data/examples/app/rapaste/public/css/brilliance_dull.css +0 -599
  315. data/examples/app/rapaste/public/css/cobalt.css +0 -149
  316. data/examples/app/rapaste/public/css/dawn.css +0 -121
  317. data/examples/app/rapaste/public/css/display.css +0 -197
  318. data/examples/app/rapaste/public/css/eiffel.css +0 -121
  319. data/examples/app/rapaste/public/css/espresso_libre.css +0 -109
  320. data/examples/app/rapaste/public/css/idle.css +0 -62
  321. data/examples/app/rapaste/public/css/iplastic.css +0 -80
  322. data/examples/app/rapaste/public/css/lazy.css +0 -73
  323. data/examples/app/rapaste/public/css/mac_classic.css +0 -123
  324. data/examples/app/rapaste/public/css/magicwb_amiga.css +0 -104
  325. data/examples/app/rapaste/public/css/pastels_on_dark.css +0 -188
  326. data/examples/app/rapaste/public/css/slush_poppies.css +0 -85
  327. data/examples/app/rapaste/public/css/spacecadet.css +0 -51
  328. data/examples/app/rapaste/public/css/sunburst.css +0 -180
  329. data/examples/app/rapaste/public/css/twilight.css +0 -137
  330. data/examples/app/rapaste/public/css/zenburnesque.css +0 -91
  331. data/examples/app/rapaste/public/js/jquery.js +0 -11
  332. data/examples/app/rapaste/spec/rapaste.rb +0 -51
  333. data/examples/app/rapaste/start.rb +0 -25
  334. data/examples/app/rapaste/view/copy.xhtml +0 -10
  335. data/examples/app/rapaste/view/index.xhtml +0 -9
  336. data/examples/app/rapaste/view/layout.xhtml +0 -25
  337. data/examples/app/rapaste/view/list.xhtml +0 -29
  338. data/examples/app/rapaste/view/search.xhtml +0 -41
  339. data/examples/app/rapaste/view/view.xhtml +0 -40
  340. data/examples/app/todolist/README +0 -1
  341. data/examples/app/todolist/public/js/jquery.js +0 -1923
  342. data/examples/app/todolist/public/ramaze.png +0 -0
  343. data/examples/app/todolist/spec/todolist.rb +0 -132
  344. data/examples/app/todolist/src/controller/main.rb +0 -70
  345. data/examples/app/todolist/src/element/page.rb +0 -31
  346. data/examples/app/todolist/src/model.rb +0 -14
  347. data/examples/app/todolist/template/index.xhtml +0 -17
  348. data/examples/app/todolist/template/new.xhtml +0 -7
  349. data/examples/misc/simple_auth.rb +0 -35
  350. data/examples/templates/template/external.amrita +0 -19
  351. data/examples/templates/template/external.xsl +0 -57
  352. data/examples/templates/template_amrita2.rb +0 -74
  353. data/examples/templates/template_xslt.rb +0 -49
  354. data/lib/proto/public/css/ramaze_error.css +0 -90
  355. data/lib/proto/view/error.xhtml +0 -64
  356. data/lib/ramaze/action/render.rb +0 -192
  357. data/lib/ramaze/action.rb +0 -159
  358. data/lib/ramaze/adapter/base.rb +0 -128
  359. data/lib/ramaze/adapter/cgi.rb +0 -20
  360. data/lib/ramaze/adapter/ebb.rb +0 -18
  361. data/lib/ramaze/adapter/evented_mongrel.rb +0 -7
  362. data/lib/ramaze/adapter/fake.rb +0 -12
  363. data/lib/ramaze/adapter/fcgi.rb +0 -18
  364. data/lib/ramaze/adapter/lsws.rb +0 -19
  365. data/lib/ramaze/adapter/mongrel.rb +0 -21
  366. data/lib/ramaze/adapter/scgi.rb +0 -18
  367. data/lib/ramaze/adapter/swiftiplied_mongrel.rb +0 -7
  368. data/lib/ramaze/adapter/thin.rb +0 -17
  369. data/lib/ramaze/adapter/webrick.rb +0 -43
  370. data/lib/ramaze/adapter.rb +0 -97
  371. data/lib/ramaze/cache/file.rb +0 -71
  372. data/lib/ramaze/cache/memcached.rb +0 -69
  373. data/lib/ramaze/cache/memory.rb +0 -6
  374. data/lib/ramaze/cache/yaml_store.rb +0 -68
  375. data/lib/ramaze/contrib/file_cache.rb +0 -3
  376. data/lib/ramaze/contrib/gems.rb +0 -78
  377. data/lib/ramaze/contrib/sequel/fill.rb +0 -12
  378. data/lib/ramaze/contrib/sequel_cache.rb +0 -92
  379. data/lib/ramaze/contrib.rb +0 -82
  380. data/lib/ramaze/controller/error.rb +0 -46
  381. data/lib/ramaze/controller/main.rb +0 -2
  382. data/lib/ramaze/controller/resolve.rb +0 -278
  383. data/lib/ramaze/current/request.rb +0 -231
  384. data/lib/ramaze/current/session/flash.rb +0 -88
  385. data/lib/ramaze/current/session/hash.rb +0 -62
  386. data/lib/ramaze/current/session.rb +0 -179
  387. data/lib/ramaze/dispatcher/action.rb +0 -50
  388. data/lib/ramaze/dispatcher/directory.rb +0 -119
  389. data/lib/ramaze/dispatcher/error.rb +0 -108
  390. data/lib/ramaze/dispatcher/file.rb +0 -100
  391. data/lib/ramaze/dispatcher.rb +0 -145
  392. data/lib/ramaze/error.rb +0 -24
  393. data/lib/ramaze/helper/aspect.rb +0 -106
  394. data/lib/ramaze/helper/cgi.rb +0 -39
  395. data/lib/ramaze/helper/redirect.rb +0 -100
  396. data/lib/ramaze/helper/rest.rb +0 -43
  397. data/lib/ramaze/helper/sendfile.rb +0 -16
  398. data/lib/ramaze/option/dsl.rb +0 -45
  399. data/lib/ramaze/option/holder.rb +0 -131
  400. data/lib/ramaze/option/merger.rb +0 -108
  401. data/lib/ramaze/option.rb +0 -156
  402. data/lib/ramaze/route.rb +0 -97
  403. data/lib/ramaze/snippets/object/traits.rb +0 -76
  404. data/lib/ramaze/snippets/ramaze/caller_info.rb +0 -30
  405. data/lib/ramaze/snippets/ramaze/caller_lines.rb +0 -51
  406. data/lib/ramaze/snippets/ramaze/state.rb +0 -86
  407. data/lib/ramaze/spec/helper/browser.rb +0 -88
  408. data/lib/ramaze/spec/helper/mock_http.rb +0 -64
  409. data/lib/ramaze/spec/helper/requester.rb +0 -63
  410. data/lib/ramaze/spec/helper/simple_http.rb +0 -434
  411. data/lib/ramaze/spec/helper.rb +0 -135
  412. data/lib/ramaze/store/default.rb +0 -109
  413. data/lib/ramaze/template/amrita2.rb +0 -49
  414. data/lib/ramaze/template/builder.rb +0 -28
  415. data/lib/ramaze/template/erubis.rb +0 -41
  416. data/lib/ramaze/template/ezamar/element.rb +0 -169
  417. data/lib/ramaze/template/ezamar/engine.rb +0 -76
  418. data/lib/ramaze/template/ezamar/morpher.rb +0 -135
  419. data/lib/ramaze/template/ezamar/render_partial.rb +0 -39
  420. data/lib/ramaze/template/ezamar/textpow.syntax +0 -34
  421. data/lib/ramaze/template/ezamar.rb +0 -42
  422. data/lib/ramaze/template/haml.rb +0 -37
  423. data/lib/ramaze/template/liquid.rb +0 -36
  424. data/lib/ramaze/template/markaby.rb +0 -52
  425. data/lib/ramaze/template/maruku.rb +0 -34
  426. data/lib/ramaze/template/nagoro.rb +0 -52
  427. data/lib/ramaze/template/none.rb +0 -14
  428. data/lib/ramaze/template/redcloth.rb +0 -25
  429. data/lib/ramaze/template/remarkably.rb +0 -38
  430. data/lib/ramaze/template/sass.rb +0 -37
  431. data/lib/ramaze/template/tagz.rb +0 -79
  432. data/lib/ramaze/template/tenjin.rb +0 -74
  433. data/lib/ramaze/template/xslt.rb +0 -100
  434. data/lib/ramaze/template.rb +0 -87
  435. data/lib/ramaze/tool/daemonize.rb +0 -37
  436. data/lib/ramaze/tool/localize.rb +0 -202
  437. data/lib/ramaze/tool/mime.rb +0 -35
  438. data/lib/ramaze/tool/mime_types.yaml +0 -615
  439. data/lib/ramaze/tool/record.rb +0 -6
  440. data/lib/ramaze/tool.rb +0 -9
  441. data/lib/ramaze/trinity.rb +0 -16
  442. data/lib/vendor/bacon.rb +0 -323
  443. data/rake_tasks/conf.rake +0 -85
  444. data/rake_tasks/coverage.rake +0 -45
  445. data/rake_tasks/gem.rake +0 -74
  446. data/rake_tasks/maintenance.rake +0 -386
  447. data/rake_tasks/release.rake +0 -76
  448. data/rake_tasks/spec.rake +0 -61
  449. data/spec/contrib/profiling.rb +0 -29
  450. data/spec/contrib/sequel/fill.rb +0 -47
  451. data/spec/examples/simple_auth.rb +0 -32
  452. data/spec/examples/templates/template_amrita2.rb +0 -16
  453. data/spec/ramaze/action/basics.rb +0 -36
  454. data/spec/ramaze/action/cache.rb +0 -87
  455. data/spec/ramaze/action/file_cache.rb +0 -70
  456. data/spec/ramaze/action/layout.rb +0 -190
  457. data/spec/ramaze/adapter/ebb.rb +0 -12
  458. data/spec/ramaze/adapter/mongrel.rb +0 -12
  459. data/spec/ramaze/adapter/record.rb +0 -31
  460. data/spec/ramaze/adapter/webrick.rb +0 -12
  461. data/spec/ramaze/adapter.rb +0 -49
  462. data/spec/ramaze/cache.rb +0 -140
  463. data/spec/ramaze/controller.rb +0 -180
  464. data/spec/ramaze/current/request.rb +0 -30
  465. data/spec/ramaze/current/session.rb +0 -97
  466. data/spec/ramaze/dispatcher.rb +0 -31
  467. data/spec/ramaze/element.rb +0 -107
  468. data/spec/ramaze/helper/aspect.rb +0 -101
  469. data/spec/ramaze/helper/cgi.rb +0 -43
  470. data/spec/ramaze/helper/file.rb +0 -18
  471. data/spec/ramaze/helper/redirect.rb +0 -112
  472. data/spec/ramaze/localize.rb +0 -89
  473. data/spec/ramaze/morpher.rb +0 -111
  474. data/spec/ramaze/public/error404.xhtml +0 -1
  475. data/spec/ramaze/request/ebb.rb +0 -9
  476. data/spec/ramaze/request/mongrel.rb +0 -9
  477. data/spec/ramaze/request/thin.rb +0 -9
  478. data/spec/ramaze/request/webrick.rb +0 -5
  479. data/spec/ramaze/rewrite.rb +0 -36
  480. data/spec/ramaze/route.rb +0 -131
  481. data/spec/ramaze/session.rb +0 -94
  482. data/spec/ramaze/store/default.rb +0 -71
  483. data/spec/ramaze/template/amrita2/external.amrita +0 -6
  484. data/spec/ramaze/template/amrita2/sum.amrita +0 -1
  485. data/spec/ramaze/template/amrita2.rb +0 -50
  486. data/spec/ramaze/template/builder/external.rxml +0 -3
  487. data/spec/ramaze/template/builder.rb +0 -51
  488. data/spec/ramaze/template/erubis/sum.rhtml +0 -1
  489. data/spec/ramaze/template/erubis.rb +0 -41
  490. data/spec/ramaze/template/ezamar/another/long/action.zmr +0 -1
  491. data/spec/ramaze/template/ezamar/combined.zmr +0 -1
  492. data/spec/ramaze/template/ezamar/file_only.zmr +0 -1
  493. data/spec/ramaze/template/ezamar/index.zmr +0 -1
  494. data/spec/ramaze/template/ezamar/nested.zmr +0 -1
  495. data/spec/ramaze/template/ezamar/other__index.xhtml +0 -1
  496. data/spec/ramaze/template/ezamar/some__long__action.zmr +0 -1
  497. data/spec/ramaze/template/ezamar/sum.zmr +0 -1
  498. data/spec/ramaze/template/ezamar.rb +0 -63
  499. data/spec/ramaze/template/haml/index.haml +0 -5
  500. data/spec/ramaze/template/haml/locals.haml +0 -2
  501. data/spec/ramaze/template/haml/with_vars.haml +0 -4
  502. data/spec/ramaze/template/haml.rb +0 -66
  503. data/spec/ramaze/template/liquid/index.liquid +0 -1
  504. data/spec/ramaze/template/liquid/products.liquid +0 -45
  505. data/spec/ramaze/template/liquid.rb +0 -99
  506. data/spec/ramaze/template/markaby/external.mab +0 -8
  507. data/spec/ramaze/template/markaby/sum.mab +0 -1
  508. data/spec/ramaze/template/markaby.rb +0 -61
  509. data/spec/ramaze/template/nagoro/another/long/action.nag +0 -1
  510. data/spec/ramaze/template/nagoro/combined.nag +0 -1
  511. data/spec/ramaze/template/nagoro/file_only.nag +0 -1
  512. data/spec/ramaze/template/nagoro/index.nag +0 -1
  513. data/spec/ramaze/template/nagoro/nested.nag +0 -1
  514. data/spec/ramaze/template/nagoro/some__long__action.nag +0 -1
  515. data/spec/ramaze/template/nagoro/sum.nag +0 -1
  516. data/spec/ramaze/template/nagoro.rb +0 -64
  517. data/spec/ramaze/template/redcloth/external.redcloth +0 -1
  518. data/spec/ramaze/template/redcloth.rb +0 -38
  519. data/spec/ramaze/template/remarkably.rb +0 -58
  520. data/spec/ramaze/template/sass.rb +0 -69
  521. data/spec/ramaze/template/tenjin/external.tenjin +0 -1
  522. data/spec/ramaze/template/tenjin.rb +0 -47
  523. data/spec/ramaze/template/xslt/concat_words.xsl +0 -16
  524. data/spec/ramaze/template/xslt/index.xsl +0 -14
  525. data/spec/ramaze/template/xslt/products.xsl +0 -32
  526. data/spec/ramaze/template/xslt/ruby_version.xsl +0 -14
  527. data/spec/ramaze/template/xslt.rb +0 -90
  528. data/spec/ramaze/template.rb +0 -128
  529. data/spec/snippets/ramaze/caller_info.rb +0 -39
  530. data/spec/snippets/ramaze/caller_lines.rb +0 -30
@@ -1,105 +1,100 @@
1
- # Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
1
+ # Copyright (c) 2009 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
4
  module Ramaze
5
+ module Helper
5
6
 
6
- # = Helper::Partial
7
- #
8
- # === Example Usage
9
- #
10
- # class MyController
11
- # def index
12
- # end
13
- # def list
14
- # plain = request['plain']
15
- # "Hello World from List! Plain List == #{plain}"
16
- # end
17
- # end
18
- #
19
- #
20
- # <html>
21
- # <head><title>Partial Render Index</title></head>
22
- # <body>
23
- # #{render_partial(Rs(:list), 'plain' => true)}
24
- # </body>
25
- # </html>
26
-
27
- module Helper::Partial
28
- module_function
29
-
30
- # Renders a url 'inline'.
7
+ # = Helper::Partial
31
8
  #
32
- # url: normal URL, like you'd use for redirecting.
33
- # options: optional, will be used as request parameters.
34
-
35
- def render_partial(url, options = {})
36
- # Save any request params that clash with the ones we're about to add in.
37
- saved = {}
38
- options.keys.each {|x| saved[x] = Request.current.params[x] }
39
-
40
- # Add/overwrite with the specified params. Ensure keys are strings since
41
- # request[:foo] converts key to string when performing lookup.
42
- options.each do |key, value|
43
- Request.current.params[key.to_s] = value
44
- end
45
-
46
- Controller.handle(url)
47
- ensure
48
- # Always reinstate the original
49
- options.keys.each {|x| Request.current.params[x] = saved[x] }
50
- end
51
-
52
- # Render the template file in view_root of the
53
- # current controller.
54
-
55
- def render_template(file, vars = {})
56
- current = Action.current
57
- options = { :controller => current.controller,
58
- :instance => current.instance.dup }
59
-
60
- file = file.to_s
61
-
62
- if Pathname(file).absolute?
63
- file = file.squeeze '/'
64
- unless File.exist?(file)
65
- Log.warn "render_template: #{file} does not exist."
66
- return ''
9
+ # Please note that this helper is deprecated in favor of # Helper::Render,
10
+ # it has been removed from Innate and remains in Ramaze until 2009.05.
11
+ #
12
+ # === Example Usage
13
+ #
14
+ # class MyController
15
+ # def index
16
+ # end
17
+ #
18
+ # def list
19
+ # plain = request['plain']
20
+ # "Hello World from List! Plain List == #{plain}"
21
+ # end
22
+ # end
23
+ #
24
+ #
25
+ # <html>
26
+ # <head><title>Partial Render Index</title></head>
27
+ # <body>
28
+ # #{render_partial(Rs(:list), 'plain' => true)}
29
+ # </body>
30
+ # </html>
31
+ module Partial
32
+ module_function
33
+
34
+ # Renders a url 'inline'.
35
+ #
36
+ # +url+ normal URL, like you'd use for redirecting.
37
+ # +options+ optional, will be used as request parameters.
38
+ #
39
+ # Issues a mock request to the given +url+ with +options+ turned into
40
+ # query arguments.
41
+ def render_partial(url, options = {})
42
+ Ramaze.deprecated('Helper::Partial#render_partial', 'Helper::Render#render_full')
43
+
44
+ uri = URI(url)
45
+ query = options # Innate::Current.request.params.merge(options)
46
+ uri.query = Rack::Utils.build_query(query)
47
+
48
+ body = nil
49
+
50
+ Innate::Mock.session do |session|
51
+ cookie = Innate::Current.session.cookie
52
+ session.cookie = cookie
53
+ body = session.get(uri.to_s, options).body
67
54
  end
68
- options[:template] = file
69
- else
70
- roots = [options[:controller].template_paths].flatten
71
55
 
72
- if (files = Dir[File.join("{#{roots.join(',')}}","{#{file},#{file}.*}")]).any?
73
- options[:template] = files.first.squeeze '/'
74
- else
75
- Log.warn "render_template: #{file} does not exist in the following directories: #{roots.join(',')}."
76
- return ''
77
- end
56
+ body
78
57
  end
79
58
 
80
- binding = options[:instance].scope
81
-
82
- # For Ruby 1.9/1.8.7
83
- binding = binding.binding if binding.respond_to?(:binding)
84
-
85
- vars.each do |name, value|
86
- options[:instance].instance_variable_set("@#{name}", value)
87
-
88
- value = "ObjectSpace._id2ref(#{ value.object_id })"
89
- eval "#{ name } = #{ value }", binding
59
+ # Render the template file in view_root of the
60
+ # current controller.
61
+ #
62
+ # TODO:
63
+ # * Doesn't work for absolute paths, but there are no specs for that yet.
64
+ # * the local variable hack isn't working because innate allocates a new
65
+ # binding.
66
+ # For now one can simply use instance variables, which I prefer anyway.
67
+ #
68
+ # the local binding hack:
69
+ #
70
+ # variables.each do |key, value|
71
+ # value = "ObjectSpace._id2ref(#{value.object_id})"
72
+ # eval "#{key} = #{value}", action.binding
73
+ # end
74
+
75
+ def render_template(path, variables = {})
76
+ Ramaze.deprecated('Helper::Partial#render_template')
77
+ path = path.to_s
78
+
79
+ ext = File.extname(path)
80
+ basename = File.basename(path, ext)
81
+
82
+ action = Innate::Current.action.dup
83
+ action.layout = nil
84
+ action.view = action.node.find_view(basename, 'html')
85
+ action.method = action.node.find_method(basename, action.params)
86
+
87
+ action.variables = action.variables.merge(variables)
88
+ action.sync_variables(action)
89
+
90
+ return action.call if action.valid?
91
+ raise(ArgumentError, "cannot render %p" % path)
90
92
  end
91
93
 
92
- options[:binding] = binding
93
-
94
- Ramaze::Action(options).render
95
- end
96
-
97
- # shortcut to render_partial, accepts a method and contructs a link to the
98
- # current controller, then calls render_partial on that
99
-
100
- def render_action method, *params
101
- render_partial(Rs(method), *params)
94
+ def render_action(method, *params)
95
+ Ramaze.deprecated('Helper::Partial#render_action', 'Helper::Render#render_full')
96
+ render_partial(r(method), *params)
97
+ end
102
98
  end
103
-
104
99
  end
105
100
  end
@@ -0,0 +1,14 @@
1
+ require 'remarkably'
2
+
3
+ module Ramaze
4
+ module Helper
5
+ module Remarkably
6
+ include ::Remarkably::Common
7
+
8
+ # Avoid calling the Helper::Link#a method
9
+ def a(*args, &block)
10
+ method_missing(:a, *args, &block)
11
+ end
12
+ end
13
+ end
14
+ end
@@ -0,0 +1,16 @@
1
+ module Ramaze
2
+ module Helper
3
+ module RequestAccessor
4
+ classes = [Rack::Request, Innate::Request, Ramaze::Request]
5
+ methods = classes.map{|klass| klass.instance_methods(false) }.flatten.uniq
6
+
7
+ methods.each do |method|
8
+ if method =~ /=/
9
+ eval("def %s(a) request.%s a; end" % [method, method])
10
+ else
11
+ eval("def %s(*a) request.%s(*a); end" % [method, method])
12
+ end
13
+ end
14
+ end
15
+ end
16
+ end
@@ -0,0 +1,284 @@
1
+ module Ramaze
2
+ module Helper
3
+ module SequelForm
4
+ # Pass it an object for your ORM and options for the <form> tag
5
+ # Usage:
6
+ # sequel_form(User, :action => '/create')
7
+ # sequel_form(Tag, :action => '/find', :method => 'post')
8
+ def sequel_form(object, options = {})
9
+ Ramaze::Form.pick(object, options)
10
+ end
11
+ end
12
+ end
13
+
14
+ class Form
15
+ attr_accessor :object, :options
16
+
17
+ YEARS, MONTHS, DAYS, HOURS, MINUTES, SECONDS =
18
+ (1900..2100), (1..12), (1..31), (0..23), (0..59), (0..59)
19
+
20
+ DATE_GENERIC = [
21
+ [ :day, DAYS ],
22
+ [ :month, MONTHS ],
23
+ [ :year, YEARS ] ]
24
+
25
+ TIME_GENERIC = [
26
+ [ :day, DAYS ],
27
+ [ :month, MONTHS ],
28
+ [ :year, YEARS ],
29
+ [ :hour, HOURS ],
30
+ [ :min, MINUTES ],
31
+ [ :sec, SECONDS ] ]
32
+
33
+ # TODO:
34
+ # How _elegant_ ...
35
+ # Tries to find the right module for extending the Form instance.
36
+ # It's problematic since the boundaries of what an model instance or model
37
+ # class looks like is very fuzzy, also a problem is that the ORM may not be
38
+ # available/required.
39
+ #
40
+ # Maybe we can abstract that a bit by going through an array of procs for
41
+ # testing?
42
+ def self.pick(object, options = {})
43
+ if defined?(Sequel::Model)
44
+ if object.is_a?(Sequel::Model)
45
+ options[:layer] ||= Layer::Sequel
46
+ InstanceForm.new(object, options)
47
+ elsif object.ancestors.include?(Sequel::Model)
48
+ options[:layer] ||= Layer::Sequel
49
+ ClassForm.new(object, options)
50
+ end
51
+ else
52
+ raise "Unknown ORM for: %p" % object
53
+ end
54
+ end
55
+
56
+ # Create new instance of Form plus the layer for the ORM
57
+ def initialize(object, options = {})
58
+ @object, @options = object, options
59
+ if layer = options.delete(:layer)
60
+ extend layer
61
+ end
62
+ end
63
+
64
+ # Generate and return the final form
65
+ def to_s
66
+ out = "<form #{form_attributes}>"
67
+ out << "<fieldset>"
68
+ out << generate
69
+ out << "</fieldset>"
70
+ out << '<input type="submit" />'
71
+ out << '<input type="reset" />'
72
+ out << "</form>"
73
+ end
74
+
75
+ # Decide on the strucuture of the tag based on the hash
76
+ def field_for(hash)
77
+ return if hash[:primary_key]
78
+ args = args_for(hash)
79
+
80
+ inner =
81
+ case type = hash[:type]
82
+ when :integer
83
+ field_integer(*args)
84
+ when :boolean
85
+ field_boolean(*args)
86
+ when :text
87
+ field_textarea(*args)
88
+ when :varchar
89
+ field_input(*args)
90
+ when :date
91
+ field_date(*args)
92
+ when :time
93
+ field_time(*args)
94
+ else
95
+ Log.warn "Unknown field: %p" % hash
96
+ field_input(*args)
97
+ end
98
+
99
+ "<label>#{args.first}: </label>\n#{inner}"
100
+ end
101
+
102
+ private
103
+
104
+ # inject to attributes for the <form>
105
+ def form_attributes
106
+ options.inject([]){|s,(k,v)| s << "#{k}='#{v}'" }.join(' ')
107
+ end
108
+
109
+ # Start tag with name and attributes
110
+ def start_tag(name, hash)
111
+ hash.inject("<#{name}"){|s,(k,v)| s << " #{k}='#{v}'" }
112
+ end
113
+
114
+ # Make a closed tag with name and attributes
115
+ def closed_tag(name, hash)
116
+ start_tag(name, hash) << ' />'
117
+ end
118
+
119
+ # Textarea with attributes from hash and the value from @object
120
+ def textarea(value, hash = {})
121
+ start_tag(:textarea, hash) << ">#{value}</textarea>"
122
+ end
123
+
124
+ # <input> with optional attributes from hash
125
+ def input(hash = {})
126
+ closed_tag(:input, hash)
127
+ end
128
+
129
+ # <input type="checkbox" with optional attributes from hash.
130
+ def checkbox(hash = {})
131
+ hash[:type] = :checkbox
132
+ input(hash)
133
+ end
134
+
135
+ # <option value="value"> with optional attributes from hash
136
+ def option(value, hash = {})
137
+ start_tag(:option, hash) << ">#{value}</option>"
138
+ end
139
+
140
+ # Yield method names and values for the Date instance
141
+ def field_date_generic
142
+ DATE_GENERIC.map{|(sel, range)|
143
+ yield(sel, range).join
144
+ }.join("\n")
145
+ end
146
+
147
+ # Yield method names and values for the Time/DateTime instance
148
+ def field_time_generic
149
+ TIME_GENERIC.map{|(sel, range)|
150
+ yield(sel, range).join
151
+ }.join("\n")
152
+ end
153
+
154
+ # Here go all the layers that are extended for specific ORMs
155
+ module Layer
156
+ # Layer for Sequel, only generate needs to be implemented, may change in
157
+ # future if we abstract more for different ORMs
158
+ module Sequel
159
+ # A bit nasty, get the @columns of the object and generate its
160
+ # field_for
161
+ def generate
162
+ columns = object_class.schema.instance_variable_get('@columns')
163
+ columns.map{|hash| field_for(hash) }.flatten.join("<br />\n")
164
+ end
165
+ end
166
+ end
167
+ end
168
+
169
+ # Form for the model class itself, very similar to an empty instance.
170
+ class ClassForm < Form
171
+ # <input name="name" />
172
+ def field_input(name)
173
+ input :name => name
174
+ end
175
+
176
+ # <textarea name="name"></textarea>
177
+ def field_textarea(name)
178
+ textarea '', :name => name
179
+ end
180
+
181
+ # <input name="name" />
182
+ def field_integer(name)
183
+ input :name => name
184
+ end
185
+
186
+ # <input type="checkbox" name="name" />
187
+ def field_boolean(name)
188
+ checkbox :name => name
189
+ end
190
+
191
+ # <select> with lots of <option>s
192
+ def field_date(name)
193
+ field_date_generic{|sel, range|
194
+ [ "<select name='#{name}[#{sel}]'>",
195
+ range.map{|d| option(d, :value => d) },
196
+ "</select>" ]
197
+ }
198
+ end
199
+
200
+ # <select> with lots of <option>s
201
+ def field_time(name)
202
+ field_time_generic{|sel, range|
203
+ [ "<select name='#{name}[#{sel}]'>",
204
+ range.map{|d| option(d, :value => d) },
205
+ "</select>" ]
206
+ }
207
+ end
208
+
209
+ # picks the :name
210
+ def args_for(hash)
211
+ [ hash[:name] ]
212
+ end
213
+
214
+ # Should be that way, at least for Sequel
215
+ def object_class
216
+ @object
217
+ end
218
+ end
219
+
220
+ # Form for instances of the model class
221
+ class InstanceForm < Form
222
+ # returns <input type='text' name='name' value='value' />
223
+ def field_input(name, value)
224
+ "<input type='text' name='#{name}' value='#{value}'/>"
225
+ end
226
+
227
+ # returns <textarea name='name'>#{value}</textarea>
228
+
229
+ def field_textarea(name, value)
230
+ "<textarea name='#{name}'>#{value}</textarea>"
231
+ end
232
+
233
+ # returns <input type="text" name="name" value="value" />
234
+
235
+ def field_integer(name, value)
236
+ field_input(name, value)
237
+ end
238
+
239
+ # <input type="checkbox" ...
240
+ def field_boolean(name, value)
241
+ if value
242
+ checkbox :name => name, :value => value, :checked => :checked
243
+ else
244
+ checkbox :name => name, :value => value
245
+ end
246
+ end
247
+
248
+ def field_date(name, value)
249
+ field_date_generic do |sel, range|
250
+ [ "<select name='#{name}[#{sel}]'>",
251
+ option_range_selected(range, value.send(sel)),
252
+ "</select>" ]
253
+ end
254
+ end
255
+
256
+ def field_time(name, value)
257
+ field_time_generic do |sel, range|
258
+ [ "<select name='#{name}[#{sel}]'>",
259
+ option_range_selected(range, value.send(sel)),
260
+ "</select>" ]
261
+ end
262
+ end
263
+
264
+ def option_range_selected(range, value)
265
+ range.map do |r|
266
+ if r == value
267
+ option(r, :value => r, :selected => :selected)
268
+ else
269
+ option(r, :value => r)
270
+ end
271
+ end
272
+ end
273
+
274
+ def args_for(hash)
275
+ name = hash[:name]
276
+ [ name, @object.send(name) ]
277
+ end
278
+
279
+ # Class for @object, atm Sequel specific?
280
+ def object_class
281
+ @object.class
282
+ end
283
+ end
284
+ end
@@ -1,30 +1,60 @@
1
1
  module Ramaze
2
2
  module Helper
3
+ # Produce very simple question/answer pairs.
4
+ #
5
+ # The default is a trivial mathematical problem.
6
+ #
7
+ # Usage (trait is optional):
8
+ #
9
+ # class RegisterController < Ramaze::Controller
10
+ # trait :captcha => lambda{
11
+ # ["the answer to everything", "42"]
12
+ # }
13
+ #
14
+ # def index
15
+ # %(
16
+ # <form action="#{r(:answer}">
17
+ # What is #{simple_captcha}?
18
+ # <input type="text" name="answer" />"
19
+ # <input type="submit" />
20
+ # </form>
21
+ # ).strip
22
+ # end
23
+ #
24
+ # def answer
25
+ # check_captcha(request[:answer])
26
+ # end
27
+ # end
3
28
  module SimpleCaptcha
4
- def simple_captcha
5
- question, answer = generate_captcha
6
- session[:CAPTCHA] = {
7
- :question => question, :answer => answer.to_s
8
- }
9
- question
10
- end
29
+ include Ramaze::Traited
11
30
 
12
- def check_captcha(answer)
13
- if captcha = session[:CAPTCHA]
14
- should = captcha[:answer].to_s
15
- should == answer.to_s.strip
16
- end
17
- end
31
+ NUMBERS = [5, 10, 15, 20]
18
32
 
19
- def generate_captcha
20
- n = [5, 10, 15, 20]
21
- ns = Array.new(2){ n.sort_by{rand}.first }.sort
33
+ # lambda should return question and answer in [question, answer] form
34
+ trait :captcha => lambda{
35
+ ns = Array.new(2){ NUMBERS.sort_by{rand}.first }.sort
22
36
  op = rand > 0.42 ? [ns[0], :+, ns[1]] : [ns[1], :-, ns[0]]
23
37
 
24
38
  question = op.join(' ')
25
39
  answer = op[0].send(op[1], op[2])
26
40
 
27
41
  [question, answer]
42
+ }
43
+
44
+ # Call the trait[:captcha] and store question/answer in session
45
+ def simple_captcha
46
+ question, answer = ancestral_trait[:captcha].call
47
+
48
+ session[:CAPTCHA] = { :question => question, :answer => answer.to_s }
49
+
50
+ question
51
+ end
52
+
53
+ # check the given +answer+ against the answer stored in the session.
54
+ def check_captcha(answer)
55
+ return false unless captcha = session[:CAPTCHA]
56
+
57
+ answer.to_s.strip == captcha[:answer].to_s
28
58
  end
29
59
  end
30
60
  end