typo 4.0.3 → 4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (652) hide show
  1. data/CHANGES-4.1 +83 -0
  2. data/MAINTAINERS +3 -7
  3. data/README +1 -1
  4. data/{components/sidebars/README → README.SIDEBARS} +3 -0
  5. data/Rakefile +1 -1
  6. data/TODO-4.1 +16 -0
  7. data/app/apis/blogger_service.rb +3 -3
  8. data/app/apis/meta_weblog_service.rb +4 -21
  9. data/app/apis/movable_type_service.rb +5 -5
  10. data/app/controllers/accounts_controller.rb +6 -3
  11. data/app/controllers/admin/blacklist_controller.rb +1 -1
  12. data/app/controllers/admin/cache_controller.rb +3 -7
  13. data/app/controllers/admin/content_controller.rb +46 -24
  14. data/app/controllers/admin/feedback_controller.rb +3 -3
  15. data/app/controllers/admin/general_controller.rb +3 -3
  16. data/app/controllers/admin/pages_controller.rb +7 -3
  17. data/app/controllers/admin/sidebar_controller.rb +19 -26
  18. data/app/controllers/admin/textfilters_controller.rb +3 -1
  19. data/app/controllers/admin/themes_controller.rb +1 -1
  20. data/app/controllers/admin/users_controller.rb +1 -1
  21. data/app/controllers/application.rb +25 -27
  22. data/app/controllers/articles_controller.rb +14 -18
  23. data/app/controllers/content_controller.rb +7 -7
  24. data/app/controllers/live_controller.rb +1 -1
  25. data/app/controllers/redirect_controller.rb +2 -0
  26. data/app/controllers/textfilter_controller.rb +0 -3
  27. data/app/controllers/theme_controller.rb +10 -5
  28. data/app/controllers/xml_controller.rb +7 -9
  29. data/app/helpers/admin/base_helper.rb +10 -5
  30. data/app/helpers/admin/content_helper.rb +6 -0
  31. data/app/helpers/admin/feedback_helper.rb +1 -1
  32. data/app/helpers/admin/pages_helper.rb +5 -0
  33. data/app/helpers/application_helper.rb +84 -51
  34. data/app/helpers/articles_helper.rb +29 -29
  35. data/app/helpers/mail_helper.rb +3 -2
  36. data/app/helpers/sidebar_helper.rb +25 -16
  37. data/app/helpers/xml_helper.rb +0 -16
  38. data/app/models/article.rb +90 -32
  39. data/app/models/blog.rb +82 -74
  40. data/app/models/blog_sweeper.rb +33 -8
  41. data/app/models/categorization.rb +4 -0
  42. data/app/models/category.rb +21 -4
  43. data/app/models/comment.rb +23 -21
  44. data/app/models/content.rb +106 -64
  45. data/app/models/content_state/base.rb +12 -3
  46. data/app/models/content_state/draft.rb +2 -3
  47. data/app/models/content_state/factory.rb +1 -1
  48. data/app/models/content_state/ham.rb +0 -1
  49. data/app/models/content_state/just_marked_as_ham.rb +8 -1
  50. data/app/models/content_state/just_marked_as_spam.rb +4 -1
  51. data/app/models/content_state/just_presumed_ham.rb +14 -14
  52. data/app/models/content_state/just_published.rb +11 -18
  53. data/app/models/content_state/just_withdrawn.rb +11 -0
  54. data/app/models/content_state/new.rb +0 -1
  55. data/app/models/content_state/presumed_ham.rb +9 -3
  56. data/app/models/content_state/presumed_spam.rb +4 -1
  57. data/app/models/content_state/publication_pending.rb +4 -4
  58. data/app/models/content_state/published.rb +7 -8
  59. data/app/models/content_state/spam.rb +0 -1
  60. data/app/models/content_state/unclassified.rb +12 -3
  61. data/app/models/content_state/withdrawn.rb +5 -6
  62. data/app/models/email_notifier.rb +1 -1
  63. data/app/models/feedback.rb +31 -11
  64. data/app/models/notification.rb +4 -0
  65. data/app/models/notification_mailer.rb +8 -8
  66. data/app/models/page.rb +19 -5
  67. data/app/models/ping.rb +27 -40
  68. data/app/models/sidebar.rb +241 -11
  69. data/app/models/tag.rb +12 -1
  70. data/app/models/text_filter.rb +33 -39
  71. data/app/models/theme.rb +9 -0
  72. data/app/models/trackback.rb +1 -5
  73. data/app/models/user.rb +7 -5
  74. data/app/views/accounts/login.rhtml +19 -15
  75. data/app/views/accounts/logout.rhtml +4 -4
  76. data/app/views/accounts/signup.rhtml +9 -9
  77. data/app/views/admin/base/_recent_comments.rhtml +2 -2
  78. data/app/views/admin/base/_recent_trackbacks.rhtml +2 -2
  79. data/app/views/admin/blacklist/_blacklist_patterns.rhtml +4 -4
  80. data/app/views/admin/blacklist/_form.rhtml +3 -3
  81. data/app/views/admin/blacklist/_quick_post.rhtml +7 -6
  82. data/app/views/admin/blacklist/destroy.rhtml +5 -5
  83. data/app/views/admin/blacklist/edit.rhtml +7 -7
  84. data/app/views/admin/blacklist/list.rhtml +2 -2
  85. data/app/views/admin/cache/list.rhtml +2 -2
  86. data/app/views/admin/categories/_categories.rhtml +3 -3
  87. data/app/views/admin/categories/_form.rhtml +1 -1
  88. data/app/views/admin/categories/_quick_post.rhtml +5 -5
  89. data/app/views/admin/categories/destroy.rhtml +7 -7
  90. data/app/views/admin/categories/edit.rhtml +6 -6
  91. data/app/views/admin/categories/list.rhtml +7 -4
  92. data/app/views/admin/categories/reorder.rhtml +1 -1
  93. data/app/views/admin/categories/show.rhtml +6 -6
  94. data/app/views/admin/comments/_form.rhtml +4 -4
  95. data/app/views/admin/comments/comments.rhtml +1 -1
  96. data/app/views/admin/comments/destroy.rhtml +6 -6
  97. data/app/views/admin/comments/edit.rhtml +8 -8
  98. data/app/views/admin/comments/list.rhtml +11 -11
  99. data/app/views/admin/comments/new.rhtml +7 -7
  100. data/app/views/admin/comments/show.rhtml +7 -7
  101. data/app/views/admin/content/_articles.rhtml +12 -10
  102. data/app/views/admin/content/_attachment.rhtml +15 -17
  103. data/app/views/admin/content/_form.rhtml +68 -45
  104. data/app/views/admin/content/_pages.rhtml +2 -2
  105. data/app/views/admin/content/_quick_post.rhtml +6 -6
  106. data/app/views/admin/content/_show_categories.rhtml +2 -2
  107. data/app/views/admin/content/_show_resources.rhtml +2 -2
  108. data/app/views/admin/content/destroy.rhtml +8 -8
  109. data/app/views/admin/content/edit.rhtml +8 -26
  110. data/app/views/admin/content/list.rhtml +4 -4
  111. data/app/views/admin/content/new.rhtml +5 -25
  112. data/app/views/admin/content/preview.rhtml +9 -2
  113. data/app/views/admin/content/show.rhtml +10 -9
  114. data/app/views/admin/feedback/_item.rhtml +2 -2
  115. data/app/views/admin/feedback/list.rhtml +21 -20
  116. data/app/views/admin/general/index.rhtml +261 -239
  117. data/app/views/admin/general/update_database.rhtml +15 -15
  118. data/app/views/admin/pages/_form.rhtml +32 -15
  119. data/app/views/admin/pages/_pages.rhtml +9 -8
  120. data/app/views/admin/pages/_quick_post.rhtml +2 -2
  121. data/app/views/admin/pages/destroy.rhtml +7 -7
  122. data/app/views/admin/pages/edit.rhtml +7 -26
  123. data/app/views/admin/pages/list.rhtml +4 -3
  124. data/app/views/admin/pages/new.rhtml +5 -22
  125. data/app/views/admin/pages/preview.rhtml +1 -1
  126. data/app/views/admin/pages/show.rhtml +5 -5
  127. data/app/views/admin/resources/_itunes_category_edit.rhtml +2 -2
  128. data/app/views/admin/resources/_metadata_add.rhtml +13 -13
  129. data/app/views/admin/resources/_metadata_edit.rhtml +14 -14
  130. data/app/views/admin/resources/_mime_edit.rhtml +5 -5
  131. data/app/views/admin/resources/_pages.rhtml +2 -2
  132. data/app/views/admin/resources/_resources.rhtml +8 -8
  133. data/app/views/admin/resources/destroy.rhtml +7 -7
  134. data/app/views/admin/resources/list.rhtml +6 -3
  135. data/app/views/admin/resources/new.rhtml +7 -3
  136. data/app/views/admin/shared/_edit.rhtml +17 -0
  137. data/app/views/admin/sidebar/_active.rhtml +5 -5
  138. data/app/views/admin/sidebar/_availables.rhtml +1 -1
  139. data/app/views/admin/sidebar/_publish.rhtml +1 -1
  140. data/app/views/admin/sidebar/_target.rhtml +1 -1
  141. data/app/views/admin/sidebar/index.rhtml +9 -5
  142. data/app/views/admin/textfilters/_form.rhtml +13 -5
  143. data/app/views/admin/textfilters/_macros.rhtml +4 -4
  144. data/app/views/admin/textfilters/_textfilters.rhtml +6 -6
  145. data/app/views/admin/textfilters/destroy.rhtml +5 -8
  146. data/app/views/admin/textfilters/edit.rhtml +2 -5
  147. data/app/views/admin/textfilters/list.rhtml +4 -2
  148. data/app/views/admin/textfilters/macro_help.rhtml +1 -1
  149. data/app/views/admin/textfilters/new.rhtml +9 -7
  150. data/app/views/admin/textfilters/show.rhtml +5 -5
  151. data/app/views/admin/textfilters/show_help.rhtml +3 -3
  152. data/app/views/admin/themes/index.rhtml +8 -2
  153. data/app/views/admin/trackbacks/_form.rhtml +4 -4
  154. data/app/views/admin/trackbacks/destroy.rhtml +4 -4
  155. data/app/views/admin/trackbacks/edit.rhtml +6 -6
  156. data/app/views/admin/trackbacks/list.rhtml +10 -10
  157. data/app/views/admin/trackbacks/new.rhtml +6 -6
  158. data/app/views/admin/trackbacks/show.rhtml +8 -8
  159. data/app/views/admin/users/_form.rhtml +10 -10
  160. data/app/views/admin/users/_user.rhtml +6 -6
  161. data/app/views/admin/users/destroy.rhtml +7 -7
  162. data/app/views/admin/users/edit.rhtml +9 -5
  163. data/app/views/admin/users/list.rhtml +2 -2
  164. data/app/views/admin/users/new.rhtml +9 -7
  165. data/app/views/admin/users/show.rhtml +10 -10
  166. data/app/views/articles/_article.rhtml +3 -3
  167. data/app/views/articles/_comment.rhtml +3 -3
  168. data/app/views/articles/_comment_box.rhtml +6 -6
  169. data/app/views/articles/_trackback.rhtml +1 -1
  170. data/app/views/articles/archives.rhtml +3 -3
  171. data/app/views/articles/comment_preview.rhtml +2 -2
  172. data/app/views/articles/groupings.rhtml +1 -1
  173. data/app/views/articles/index.rhtml +2 -2
  174. data/app/views/articles/read.rhtml +15 -15
  175. data/app/views/articles/view_page.rhtml +1 -1
  176. data/app/views/layouts/administration.rhtml +11 -17
  177. data/app/views/layouts/minimal.rhtml +13 -0
  178. data/app/views/live/search.rhtml +1 -1
  179. data/app/views/notification_mailer/_mail_footer.rhtml +2 -2
  180. data/app/views/notification_mailer/article.rhtml +1 -1
  181. data/app/views/notification_mailer/comment.rhtml +4 -4
  182. data/app/views/settings/done.rhtml +1 -1
  183. data/app/views/settings/install.rhtml +3 -3
  184. data/app/views/shared/_search.rhtml +4 -4
  185. data/app/views/xml/_atom10_item_article.rxml +9 -7
  186. data/app/views/xml/_atom10_item_comment.rxml +2 -3
  187. data/app/views/xml/_atom10_item_trackback.rxml +1 -1
  188. data/app/views/xml/_googlesitemap_item_article.rxml +2 -2
  189. data/app/views/xml/_googlesitemap_item_category.rxml +1 -1
  190. data/app/views/xml/_googlesitemap_item_page.rxml +2 -2
  191. data/app/views/xml/_googlesitemap_item_tag.rxml +2 -2
  192. data/app/views/xml/_itunes_item_resource.rxml +2 -4
  193. data/app/views/xml/_rss20_item_article.rxml +4 -10
  194. data/app/views/xml/_rss20_item_comment.rxml +2 -2
  195. data/app/views/xml/rsd.rxml +4 -4
  196. data/bin/typo +0 -1
  197. data/config/boot.rb +4 -3
  198. data/config/environment.rb +37 -28
  199. data/config/environments/test.rb +1 -1
  200. data/config/routes.rb +6 -5
  201. data/db/migrate/051_fix_canonical_server_url.rb +17 -0
  202. data/db/migrate/052_remove_cached_html.rb +11 -0
  203. data/db/migrate/053_promote_canonical_server_url.rb +22 -0
  204. data/db/migrate/054_upgrade_sidebar_objects.rb +26 -0
  205. data/db/migrate/055_link_sidebars_to_blog.rb +17 -0
  206. data/db/migrate/056_create_notifications.rb +32 -0
  207. data/db/migrate/057_add_categorization_model.rb +45 -0
  208. data/db/migrate/058_separate_entries_and_feedback.rb +68 -0
  209. data/db/migrate/059_cleanup_feedback_table.rb +25 -0
  210. data/db/migrate/060_cleanup_contents_table.rb +29 -0
  211. data/db/migrate/061_convert_title_prefix_setting.rb +25 -0
  212. data/db/schema.mysql.sql +139 -108
  213. data/db/schema.postgresql.sql +140 -108
  214. data/db/schema.rb +97 -75
  215. data/db/schema.sqlite.sql +140 -108
  216. data/db/schema.sqlserver.sql +144 -109
  217. data/db/schema_version +1 -1
  218. data/lang/fr_FR.rb +469 -0
  219. data/lib/email_notify.rb +4 -4
  220. data/lib/generators/sidebar/sidebar_generator.rb +15 -6
  221. data/lib/generators/sidebar/templates/Rakefile +22 -0
  222. data/lib/generators/sidebar/templates/content.rhtml +10 -0
  223. data/lib/generators/sidebar/templates/init.rb +4 -0
  224. data/lib/generators/sidebar/templates/sidebar.rb +16 -0
  225. data/lib/generators/sidebar/templates/unit_test.rb +8 -0
  226. data/lib/jabber_notify.rb +8 -7
  227. data/lib/memory_profiler.rb +60 -0
  228. data/lib/rails_patch/active_record.rb +0 -27
  229. data/lib/route_cache.rb +15 -0
  230. data/lib/sidebars/component_plugin.rb +3 -0
  231. data/lib/sidebars/consolidated_plugin.rb +26 -0
  232. data/lib/sidebars/plugin.rb +8 -13
  233. data/lib/spam_protection.rb +35 -23
  234. data/lib/tasks/release.rake +7 -7
  235. data/lib/text_filter_plugin.rb +55 -15
  236. data/lib/typo_deprecated.rb +19 -0
  237. data/lib/typo_version.rb +1 -1
  238. data/public/images/bracket.gif +0 -0
  239. data/public/images/cancel.png +0 -0
  240. data/public/images/checked.png +0 -0
  241. data/public/images/delete.png +0 -0
  242. data/public/images/edit.png +0 -0
  243. data/public/images/help.png +0 -0
  244. data/public/images/show.png +0 -0
  245. data/public/javascripts/codecollapse.js +8 -0
  246. data/public/javascripts/controls.js +41 -23
  247. data/public/javascripts/dragdrop.js +105 -76
  248. data/public/javascripts/effects.js +293 -163
  249. data/public/javascripts/prototype.js +900 -391
  250. data/public/stylesheets/administration.css +390 -318
  251. data/public/stylesheets/codecollapse.css +3 -0
  252. data/public/stylesheets/minimal.css +142 -0
  253. data/public/stylesheets/textmate/dawn.css +209 -0
  254. data/public/stylesheets/textmate/iplastic.css +142 -0
  255. data/public/stylesheets/textmate/space_cadet.css +99 -0
  256. data/public/stylesheets/textmate/textmate.css +48 -0
  257. data/public/stylesheets/textmate/twilight.css +227 -0
  258. data/script/process/inspector +3 -0
  259. data/spec/controllers/accounts_controller_spec.rb +184 -0
  260. data/spec/controllers/articles_controller_spec.rb +47 -0
  261. data/spec/fixtures/articles_tags.yml +19 -0
  262. data/spec/fixtures/blacklist_patterns.yml +10 -0
  263. data/spec/fixtures/blogs.yml +77 -0
  264. data/spec/fixtures/categories.yml +35 -0
  265. data/{test/fixtures/articles_categories.yml → spec/fixtures/categorizations.yml} +0 -0
  266. data/spec/fixtures/contents.yml +215 -0
  267. data/spec/fixtures/feedback.yml +159 -0
  268. data/spec/fixtures/notifications.yml +0 -0
  269. data/spec/fixtures/page_caches.yml +7 -0
  270. data/spec/fixtures/redirects.yml +13 -0
  271. data/spec/fixtures/resources.yml +24 -0
  272. data/spec/fixtures/sidebars.yml +12 -0
  273. data/spec/fixtures/tags.yml +13 -0
  274. data/spec/fixtures/text_filters.yml +42 -0
  275. data/spec/fixtures/triggers.yml +1 -0
  276. data/spec/fixtures/users.yml +56 -0
  277. data/spec/fixtures/whiteboards.yml +13 -0
  278. data/spec/helpers/admin_base_helper_spec.rb +13 -0
  279. data/spec/models/amazon_sidebar_spec.rb +40 -0
  280. data/spec/models/audioscrobbler_spec.rb +134 -0
  281. data/spec/models/blog_spec.rb +28 -0
  282. data/spec/models/cache_support_spec.rb +55 -0
  283. data/spec/models/category_spec.rb +48 -0
  284. data/spec/models/configuration_spec.rb +108 -0
  285. data/spec/models/content_state_spec.rb +1010 -0
  286. data/spec/models/delegate_to_content_state_spec.rb +126 -0
  287. data/spec/models/delicious_spec.rb +101 -0
  288. data/spec/models/flickr_spec.rb +128 -0
  289. data/spec/models/metafragment_spec.rb +65 -0
  290. data/spec/models/page_cache_spec.rb +35 -0
  291. data/spec/models/page_spec.rb +88 -0
  292. data/spec/models/ping_spec.rb +133 -0
  293. data/spec/models/redirect_spec.rb +17 -0
  294. data/spec/models/resource_spec.rb +43 -0
  295. data/spec/models/static_sidebar_spec.rb +17 -0
  296. data/spec/models/tag_spec.rb +54 -0
  297. data/spec/models/text_filter_spec.rb +38 -0
  298. data/spec/models/theme_spec.rb +45 -0
  299. data/spec/models/trackback_spec.rb +60 -0
  300. data/spec/models/trigger_spec.rb +41 -0
  301. data/spec/models/user_spec.rb +105 -0
  302. data/test/fixtures/blogs.yml +5 -4
  303. data/test/fixtures/categorizations.yml +31 -0
  304. data/test/fixtures/contents.yml +2 -160
  305. data/test/fixtures/feedback.yml +159 -0
  306. data/test/fixtures/sidebars.yml +11 -4
  307. data/test/functional/accounts_controller_test.rb +6 -10
  308. data/test/functional/admin/article_preview_test.rb +21 -6
  309. data/test/functional/admin/blacklist_controller_test.rb +11 -11
  310. data/test/functional/admin/categories_controller_test.rb +13 -13
  311. data/test/functional/admin/comments_controller_test.rb +21 -21
  312. data/test/functional/admin/content_controller_test.rb +30 -38
  313. data/test/functional/admin/feedback_controller_test.rb +12 -12
  314. data/test/functional/admin/general_controller_test.rb +2 -2
  315. data/test/functional/admin/pages_controller_test.rb +3 -18
  316. data/test/functional/admin/resources_controller_test.rb +7 -7
  317. data/test/functional/admin/textfilters_controller_test.rb +2 -2
  318. data/test/functional/admin/themes_controller_test.rb +1 -1
  319. data/test/functional/admin/trackbacks_controller_test.rb +21 -21
  320. data/test/functional/admin/users_controller_test.rb +21 -18
  321. data/test/functional/articles_controller_test.rb +62 -46
  322. data/test/functional/backend_controller_test.rb +6 -6
  323. data/test/functional/redirect_controller_test.rb +3 -3
  324. data/test/functional/textfilter_controller_test.rb +10 -12
  325. data/test/functional/theme_controller_test.rb +1 -1
  326. data/test/functional/xml_controller_test.rb +7 -5
  327. data/test/mocks/themes/azure/layouts/default.rhtml +2 -2
  328. data/test/test_helper.rb +75 -0
  329. data/test/unit/amazon_sidebar_test.rb +36 -0
  330. data/test/unit/article_test.rb +36 -4
  331. data/test/unit/blog_test.rb +5 -36
  332. data/test/unit/cache_support_test.rb +62 -0
  333. data/test/unit/category_test.rb +6 -1
  334. data/test/unit/comment_test.rb +34 -9
  335. data/test/unit/content_state/factory_test.rb +8 -0
  336. data/test/unit/content_state/feedback_states_test.rb +71 -0
  337. data/test/unit/magnolia_test.rb +1 -1
  338. data/test/unit/notification_test.rb +10 -0
  339. data/test/unit/page_test.rb +20 -0
  340. data/test/unit/ping_test.rb +1 -1
  341. data/test/unit/sidebar_test.rb +2 -7
  342. data/test/unit/static_sidebar_test.rb +19 -0
  343. data/test/unit/tag_test.rb +6 -1
  344. data/test/unit/text_filter_test.rb +21 -21
  345. data/test/unit/theme_test.rb +1 -1
  346. data/test/unit/trackback_test.rb +16 -1
  347. data/themes/azure/layouts/default.rhtml +2 -2
  348. data/themes/scribbish/layouts/default.rhtml +2 -2
  349. data/themes/scribbish/stylesheets/content.css +6 -8
  350. data/themes/scribbish/views/articles/_article.rhtml +10 -10
  351. data/themes/scribbish/views/articles/_comment.rhtml +16 -12
  352. data/themes/scribbish/views/articles/_comment_form.rhtml +25 -22
  353. data/themes/scribbish/views/articles/_search.rhtml +14 -13
  354. data/themes/scribbish/views/articles/comment_preview.rhtml +3 -3
  355. data/themes/scribbish/views/articles/index.rhtml +1 -1
  356. data/themes/scribbish/views/articles/read.rhtml +8 -8
  357. data/vendor/cached_model/History.txt +30 -0
  358. data/vendor/cached_model/LICENSE.txt +30 -0
  359. data/vendor/cached_model/Manifest.txt +7 -0
  360. data/vendor/cached_model/README.txt +96 -0
  361. data/vendor/cached_model/Rakefile +25 -0
  362. data/vendor/cached_model/lib/cached_model.rb +287 -0
  363. data/vendor/cached_model/test/test_cached_model.rb +593 -0
  364. data/vendor/flickr/flickr.rb +1 -1
  365. data/vendor/memcache-client/History.txt +25 -0
  366. data/vendor/memcache-client/LICENSE.txt +30 -0
  367. data/vendor/memcache-client/Manifest.txt +8 -0
  368. data/vendor/memcache-client/README.txt +46 -0
  369. data/vendor/memcache-client/Rakefile +23 -0
  370. data/vendor/memcache-client/lib/memcache.rb +491 -0
  371. data/vendor/memcache-client/lib/memcache_util.rb +71 -0
  372. data/vendor/memcache-client/test/test_mem_cache.rb +284 -0
  373. data/vendor/plugins/action_view_patch/Rakefile +22 -0
  374. data/vendor/plugins/action_view_patch/init.rb +1 -0
  375. data/vendor/plugins/action_view_patch/lib/action_view_patch.rb +18 -0
  376. data/vendor/plugins/action_view_patch/test/action_view_patch_test.rb +56 -0
  377. data/vendor/plugins/aimpresence_sidebar/Rakefile +22 -0
  378. data/vendor/plugins/aimpresence_sidebar/init.rb +4 -0
  379. data/vendor/plugins/aimpresence_sidebar/lib/aimpresence_sidebar.rb +21 -0
  380. data/vendor/plugins/aimpresence_sidebar/test/aimpresence_sidebar_test.rb +33 -0
  381. data/vendor/plugins/aimpresence_sidebar/views/content.rhtml +4 -0
  382. data/vendor/plugins/amazon_sidebar/init.rb +5 -0
  383. data/vendor/plugins/amazon_sidebar/lib/amazon_sidebar.rb +16 -0
  384. data/vendor/plugins/amazon_sidebar/views/content.rhtml +4 -0
  385. data/vendor/plugins/archives_sidebar/Rakefile +22 -0
  386. data/vendor/plugins/archives_sidebar/init.rb +5 -0
  387. data/{components/plugins/sidebars/archives_controller.rb → vendor/plugins/archives_sidebar/lib/archives_sidebar.rb} +7 -6
  388. data/vendor/plugins/archives_sidebar/test/archives_sidebar_test.rb +8 -0
  389. data/{components/plugins/sidebars/archives → vendor/plugins/archives_sidebar/views}/content.rhtml +2 -2
  390. data/vendor/plugins/audioscrobbler_sidebar/Rakefile +22 -0
  391. data/vendor/plugins/audioscrobbler_sidebar/init.rb +5 -0
  392. data/{app/models/aggregations → vendor/plugins/audioscrobbler_sidebar/lib}/audioscrobbler.rb +0 -0
  393. data/{components/plugins/sidebars/audioscrobbler_controller.rb → vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb} +7 -4
  394. data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +8 -0
  395. data/{components/plugins/sidebars/audioscrobbler → vendor/plugins/audioscrobbler_sidebar/views}/content.rhtml +4 -4
  396. data/vendor/plugins/backpack_sidebar/Rakefile +22 -0
  397. data/vendor/plugins/backpack_sidebar/init.rb +5 -0
  398. data/{app/models/aggregations → vendor/plugins/backpack_sidebar/lib}/backpack.rb +0 -0
  399. data/{components/plugins/sidebars/backpack_controller.rb → vendor/plugins/backpack_sidebar/lib/backpack_sidebar.rb} +6 -3
  400. data/vendor/plugins/backpack_sidebar/test/backpack_sidebar_test.rb +8 -0
  401. data/{components/plugins/sidebars/backpack → vendor/plugins/backpack_sidebar/views}/content.rhtml +4 -4
  402. data/vendor/plugins/category_sidebar/Rakefile +22 -0
  403. data/vendor/plugins/category_sidebar/init.rb +5 -0
  404. data/{components/plugins/sidebars/category_controller.rb → vendor/plugins/category_sidebar/lib/category_sidebar.rb} +3 -5
  405. data/vendor/plugins/category_sidebar/test/category_sidebar_test.rb +8 -0
  406. data/vendor/plugins/category_sidebar/views/content.rhtml +10 -0
  407. data/vendor/plugins/delicious_sidebar/Rakefile +22 -0
  408. data/vendor/plugins/delicious_sidebar/init.rb +5 -0
  409. data/{app/models/aggregations → vendor/plugins/delicious_sidebar/lib}/delicious.rb +0 -0
  410. data/{components/plugins/sidebars/delicious_controller.rb → vendor/plugins/delicious_sidebar/lib/delicious_sidebar.rb} +16 -10
  411. data/vendor/plugins/delicious_sidebar/test/delicious_sidebar_test.rb +8 -0
  412. data/vendor/plugins/delicious_sidebar/views/content.rhtml +20 -0
  413. data/vendor/plugins/flickr_sidebar/Rakefile +22 -0
  414. data/vendor/plugins/flickr_sidebar/init.rb +5 -0
  415. data/{app/models/aggregations → vendor/plugins/flickr_sidebar/lib}/flickr.rb +1 -1
  416. data/vendor/plugins/flickr_sidebar/lib/flickr_sidebar.rb +15 -0
  417. data/vendor/plugins/flickr_sidebar/test/flickr_sidebar_test.rb +8 -0
  418. data/{components/plugins/sidebars/flickr → vendor/plugins/flickr_sidebar/views}/content.rhtml +5 -5
  419. data/vendor/plugins/fortythree_sidebar/Rakefile +22 -0
  420. data/vendor/plugins/fortythree_sidebar/init.rb +5 -0
  421. data/{app/models/aggregations → vendor/plugins/fortythree_sidebar/lib}/fortythree.rb +0 -0
  422. data/{components/plugins/sidebars/fortythree_controller.rb → vendor/plugins/fortythree_sidebar/lib/fortythree_sidebar.rb} +5 -4
  423. data/vendor/plugins/fortythree_sidebar/test/fortythree_sidebar_test.rb +8 -0
  424. data/vendor/plugins/fortythree_sidebar/views/content.rhtml +8 -0
  425. data/vendor/plugins/fortythreeplaces_sidebar/Rakefile +22 -0
  426. data/vendor/plugins/fortythreeplaces_sidebar/init.rb +5 -0
  427. data/vendor/plugins/fortythreeplaces_sidebar/lib/fortythree.rb +62 -0
  428. data/{components/plugins/sidebars/fortythreeplaces_controller.rb → vendor/plugins/fortythreeplaces_sidebar/lib/fortythreeplaces_sidebar.rb} +5 -4
  429. data/vendor/plugins/fortythreeplaces_sidebar/test/fortythreeplaces_sidebar_test.rb +8 -0
  430. data/vendor/plugins/fortythreeplaces_sidebar/views/content.rhtml +8 -0
  431. data/vendor/plugins/haml/MIT-LICENSE +20 -0
  432. data/vendor/plugins/haml/REFERENCE +662 -0
  433. data/vendor/plugins/haml/Rakefile +171 -0
  434. data/vendor/plugins/haml/VERSION +1 -0
  435. data/vendor/plugins/haml/bin/haml +18 -0
  436. data/vendor/plugins/haml/init.rb +3 -0
  437. data/vendor/plugins/haml/lib/haml/buffer.rb +224 -0
  438. data/vendor/plugins/haml/lib/haml/engine.rb +557 -0
  439. data/vendor/plugins/haml/lib/haml/helpers.rb +220 -0
  440. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +54 -0
  441. data/vendor/plugins/haml/lib/haml/template.rb +138 -0
  442. data/vendor/plugins/haml/test/benchmark.rb +62 -0
  443. data/vendor/plugins/haml/test/engine_test.rb +93 -0
  444. data/vendor/plugins/haml/test/helper_test.rb +105 -0
  445. data/vendor/plugins/haml/test/mocks/article.rb +6 -0
  446. data/vendor/plugins/haml/test/profile.rb +45 -0
  447. data/vendor/plugins/haml/test/results/content_for_layout.xhtml +16 -0
  448. data/vendor/plugins/haml/test/results/eval_suppressed.xhtml +2 -0
  449. data/vendor/plugins/haml/test/results/helpers.xhtml +50 -0
  450. data/vendor/plugins/haml/test/results/helpful.xhtml +5 -0
  451. data/vendor/plugins/haml/test/results/just_stuff.xhtml +38 -0
  452. data/vendor/plugins/haml/test/results/list.xhtml +12 -0
  453. data/vendor/plugins/haml/test/results/original_engine.xhtml +24 -0
  454. data/vendor/plugins/haml/test/results/partials.xhtml +20 -0
  455. data/vendor/plugins/haml/test/results/silent_script.xhtml +74 -0
  456. data/vendor/plugins/haml/test/results/standard.xhtml +42 -0
  457. data/vendor/plugins/haml/test/results/tag_parsing.xhtml +28 -0
  458. data/vendor/plugins/haml/test/results/very_basic.xhtml +7 -0
  459. data/vendor/plugins/haml/test/results/whitespace_handling.xhtml +51 -0
  460. data/vendor/plugins/haml/test/rhtml/standard.rhtml +51 -0
  461. data/vendor/plugins/haml/test/runner.rb +15 -0
  462. data/vendor/plugins/haml/test/template_test.rb +137 -0
  463. data/vendor/plugins/haml/test/templates/_partial.haml +7 -0
  464. data/vendor/plugins/haml/test/templates/_text_area.haml +3 -0
  465. data/vendor/plugins/haml/test/templates/content_for_layout.haml +10 -0
  466. data/vendor/plugins/haml/test/templates/eval_suppressed.haml +5 -0
  467. data/vendor/plugins/haml/test/templates/helpers.haml +39 -0
  468. data/vendor/plugins/haml/test/templates/helpful.haml +6 -0
  469. data/vendor/plugins/haml/test/templates/just_stuff.haml +34 -0
  470. data/vendor/plugins/haml/test/templates/list.haml +12 -0
  471. data/vendor/plugins/haml/test/templates/original_engine.haml +17 -0
  472. data/vendor/plugins/haml/test/templates/partialize.haml +1 -0
  473. data/vendor/plugins/haml/test/templates/partials.haml +12 -0
  474. data/vendor/plugins/haml/test/templates/silent_script.haml +40 -0
  475. data/vendor/plugins/haml/test/templates/standard.haml +40 -0
  476. data/vendor/plugins/haml/test/templates/tag_parsing.haml +24 -0
  477. data/vendor/plugins/haml/test/templates/very_basic.haml +4 -0
  478. data/vendor/plugins/haml/test/templates/whitespace_handling.haml +66 -0
  479. data/vendor/plugins/localization/CHANGELOG +1 -0
  480. data/vendor/plugins/localization/README +85 -0
  481. data/vendor/plugins/localization/init.rb +3 -0
  482. data/vendor/plugins/localization/lib/localization.rb +46 -0
  483. data/vendor/plugins/magnolia_sidebar/Rakefile +22 -0
  484. data/vendor/plugins/magnolia_sidebar/init.rb +5 -0
  485. data/{app/models/aggregations/magnolia.rb → vendor/plugins/magnolia_sidebar/lib/magnolia_aggregation.rb} +0 -0
  486. data/vendor/plugins/magnolia_sidebar/lib/magnolia_sidebar.rb +16 -0
  487. data/vendor/plugins/magnolia_sidebar/test/magnolia_sidebar_test.rb +8 -0
  488. data/vendor/plugins/magnolia_sidebar/views/content.rhtml +12 -0
  489. data/vendor/plugins/recent_comments_sidebar/Rakefile +22 -0
  490. data/vendor/plugins/recent_comments_sidebar/init.rb +5 -0
  491. data/vendor/plugins/recent_comments_sidebar/lib/recent_comments_sidebar.rb +16 -0
  492. data/vendor/plugins/recent_comments_sidebar/test/recent_comments_sidebar_test.rb +8 -0
  493. data/{components/plugins/sidebars/recent_comments → vendor/plugins/recent_comments_sidebar/views}/content.rhtml +2 -2
  494. data/vendor/plugins/static_sidebar/init.rb +4 -0
  495. data/{components/plugins/sidebars/static_controller.rb → vendor/plugins/static_sidebar/lib/static_sidebar.rb} +4 -7
  496. data/vendor/plugins/static_sidebar/views/content.rhtml +2 -0
  497. data/vendor/plugins/tada_sidebar/Rakefile +22 -0
  498. data/vendor/plugins/tada_sidebar/init.rb +5 -0
  499. data/{app/models/aggregations → vendor/plugins/tada_sidebar/lib}/tada.rb +0 -0
  500. data/{components/plugins/sidebars/tada_controller.rb → vendor/plugins/tada_sidebar/lib/tada_sidebar.rb} +8 -4
  501. data/vendor/plugins/tada_sidebar/test/tada_sidebar_test.rb +8 -0
  502. data/{components/plugins/sidebars/tada → vendor/plugins/tada_sidebar/views}/content.rhtml +4 -4
  503. data/vendor/plugins/tag_sidebar/Rakefile +22 -0
  504. data/vendor/plugins/tag_sidebar/init.rb +5 -0
  505. data/vendor/plugins/tag_sidebar/lib/tag_sidebar.rb +24 -0
  506. data/vendor/plugins/tag_sidebar/test/tag_sidebar_test.rb +8 -0
  507. data/vendor/plugins/tag_sidebar/views/content.rhtml +8 -0
  508. data/vendor/plugins/technorati_sidebar/Rakefile +22 -0
  509. data/vendor/plugins/technorati_sidebar/init.rb +5 -0
  510. data/{app/models/aggregations → vendor/plugins/technorati_sidebar/lib}/technorati.rb +0 -0
  511. data/{components/plugins/sidebars/technorati_controller.rb → vendor/plugins/technorati_sidebar/lib/technorati_sidebar.rb} +8 -4
  512. data/vendor/plugins/technorati_sidebar/test/technorati_sidebar_test.rb +8 -0
  513. data/vendor/plugins/technorati_sidebar/views/content.rhtml +8 -0
  514. data/vendor/plugins/typo_textfilter_amazon/README +5 -0
  515. data/vendor/plugins/typo_textfilter_amazon/Rakefile +22 -0
  516. data/vendor/plugins/typo_textfilter_amazon/init.rb +4 -0
  517. data/vendor/plugins/typo_textfilter_amazon/install.rb +1 -0
  518. data/vendor/plugins/typo_textfilter_amazon/lib/typo_textfilter_amazon.rb +45 -0
  519. data/vendor/plugins/typo_textfilter_amazon/tasks/typo_textfilter_amazon_tasks.rake +4 -0
  520. data/vendor/plugins/typo_textfilter_amazon/test/typo_textfilter_amazon_test.rb +8 -0
  521. data/vendor/plugins/typo_textfilter_code/README +4 -0
  522. data/vendor/plugins/typo_textfilter_code/Rakefile +22 -0
  523. data/vendor/plugins/typo_textfilter_code/init.rb +4 -0
  524. data/vendor/plugins/typo_textfilter_code/install.rb +1 -0
  525. data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb +62 -0
  526. data/vendor/plugins/typo_textfilter_code/tasks/typo_textfilter_code_tasks.rake +4 -0
  527. data/vendor/plugins/typo_textfilter_code/test/typo_textfilter_code_test.rb +8 -0
  528. data/vendor/plugins/typo_textfilter_flickr/README +4 -0
  529. data/vendor/plugins/typo_textfilter_flickr/Rakefile +22 -0
  530. data/vendor/plugins/typo_textfilter_flickr/init.rb +4 -0
  531. data/vendor/plugins/typo_textfilter_flickr/install.rb +1 -0
  532. data/vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb +79 -0
  533. data/vendor/plugins/typo_textfilter_flickr/tasks/typo_textfilter_flickr_tasks.rake +4 -0
  534. data/vendor/plugins/typo_textfilter_flickr/test/typo_textfilter_flickr_test.rb +8 -0
  535. data/vendor/plugins/typo_textfilter_htmlfilter/README +4 -0
  536. data/vendor/plugins/typo_textfilter_htmlfilter/Rakefile +22 -0
  537. data/vendor/plugins/typo_textfilter_htmlfilter/init.rb +2 -0
  538. data/vendor/plugins/typo_textfilter_htmlfilter/install.rb +1 -0
  539. data/vendor/plugins/typo_textfilter_htmlfilter/lib/typo_textfilter_htmlfilter.rb +12 -0
  540. data/vendor/plugins/typo_textfilter_htmlfilter/tasks/typo_textfilter_htmlfilter_tasks.rake +4 -0
  541. data/vendor/plugins/typo_textfilter_htmlfilter/test/typo_textfilter_htmlfilter_test.rb +8 -0
  542. data/vendor/plugins/typo_textfilter_lightbox/README +4 -0
  543. data/vendor/plugins/typo_textfilter_lightbox/Rakefile +22 -0
  544. data/vendor/plugins/typo_textfilter_lightbox/init.rb +2 -0
  545. data/vendor/plugins/typo_textfilter_lightbox/install.rb +1 -0
  546. data/{components/plugins/textfilters/lightbox_controller.rb → vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb} +64 -61
  547. data/vendor/plugins/typo_textfilter_lightbox/tasks/typo_textfilter_lightbox_tasks.rake +4 -0
  548. data/vendor/plugins/typo_textfilter_lightbox/test/typo_textfilter_lightbox_test.rb +8 -0
  549. data/vendor/plugins/typo_textfilter_markdown/README +4 -0
  550. data/vendor/plugins/typo_textfilter_markdown/Rakefile +22 -0
  551. data/vendor/plugins/typo_textfilter_markdown/init.rb +2 -0
  552. data/vendor/plugins/typo_textfilter_markdown/install.rb +1 -0
  553. data/{components/plugins/textfilters/markdown_controller.rb → vendor/plugins/typo_textfilter_markdown/lib/typo_textfilter_markdown.rb} +13 -9
  554. data/vendor/plugins/typo_textfilter_markdown/tasks/typo_textfilter_markdown_tasks.rake +4 -0
  555. data/vendor/plugins/typo_textfilter_markdown/test/typo_textfilter_markdown_test.rb +8 -0
  556. data/vendor/plugins/typo_textfilter_none/README +4 -0
  557. data/vendor/plugins/typo_textfilter_none/Rakefile +22 -0
  558. data/vendor/plugins/typo_textfilter_none/init.rb +2 -0
  559. data/vendor/plugins/typo_textfilter_none/install.rb +1 -0
  560. data/vendor/plugins/typo_textfilter_none/lib/typo_textfilter_none.rb +12 -0
  561. data/vendor/plugins/typo_textfilter_none/tasks/typo_textfilter_none_tasks.rake +4 -0
  562. data/vendor/plugins/typo_textfilter_none/test/typo_textfilter_none_test.rb +8 -0
  563. data/vendor/plugins/typo_textfilter_smartypants/README +4 -0
  564. data/vendor/plugins/typo_textfilter_smartypants/Rakefile +22 -0
  565. data/vendor/plugins/typo_textfilter_smartypants/init.rb +2 -0
  566. data/vendor/plugins/typo_textfilter_smartypants/install.rb +1 -0
  567. data/vendor/plugins/typo_textfilter_smartypants/lib/typo_textfilter_smartypants.rb +12 -0
  568. data/vendor/plugins/typo_textfilter_smartypants/tasks/typo_textfilter_smartypants_tasks.rake +4 -0
  569. data/vendor/plugins/typo_textfilter_smartypants/test/typo_textfilter_smartypants_test.rb +8 -0
  570. data/vendor/plugins/typo_textfilter_sparkline/README +4 -0
  571. data/vendor/plugins/typo_textfilter_sparkline/Rakefile +22 -0
  572. data/vendor/plugins/typo_textfilter_sparkline/init.rb +2 -0
  573. data/vendor/plugins/typo_textfilter_sparkline/install.rb +1 -0
  574. data/vendor/plugins/typo_textfilter_sparkline/lib/typo_textfilter_sparkline.rb +92 -0
  575. data/vendor/plugins/typo_textfilter_sparkline/tasks/typo_textfilter_sparkline_tasks.rake +4 -0
  576. data/vendor/plugins/typo_textfilter_sparkline/test/typo_textfilter_sparkline_test.rb +8 -0
  577. data/vendor/plugins/typo_textfilter_textile/README +4 -0
  578. data/vendor/plugins/typo_textfilter_textile/Rakefile +22 -0
  579. data/vendor/plugins/typo_textfilter_textile/init.rb +2 -0
  580. data/vendor/plugins/typo_textfilter_textile/install.rb +1 -0
  581. data/vendor/plugins/typo_textfilter_textile/lib/typo_textfilter_textile.rb +18 -0
  582. data/vendor/plugins/typo_textfilter_textile/tasks/typo_textfilter_textile_tasks.rake +4 -0
  583. data/vendor/plugins/typo_textfilter_textile/test/typo_textfilter_textile_test.rb +8 -0
  584. data/vendor/plugins/typo_textfilter_textile_and_markdown/README +4 -0
  585. data/vendor/plugins/typo_textfilter_textile_and_markdown/Rakefile +22 -0
  586. data/vendor/plugins/typo_textfilter_textile_and_markdown/init.rb +2 -0
  587. data/vendor/plugins/typo_textfilter_textile_and_markdown/install.rb +1 -0
  588. data/vendor/plugins/typo_textfilter_textile_and_markdown/lib/typo_textfilter_textile_and_markdown.rb +12 -0
  589. data/vendor/plugins/typo_textfilter_textile_and_markdown/tasks/typo_textfilter_textile_and_markdown_tasks.rake +4 -0
  590. data/vendor/plugins/typo_textfilter_textile_and_markdown/test/typo_textfilter_textile_and_markdown_test.rb +8 -0
  591. data/vendor/plugins/typo_textfilter_tmcode/README +4 -0
  592. data/vendor/plugins/typo_textfilter_tmcode/Rakefile +22 -0
  593. data/vendor/plugins/typo_textfilter_tmcode/init.rb +3 -0
  594. data/vendor/plugins/typo_textfilter_tmcode/install.rb +1 -0
  595. data/vendor/plugins/typo_textfilter_tmcode/lib/typo_textfilter_tmcode.rb +86 -0
  596. data/vendor/plugins/typo_textfilter_tmcode/tasks/typo_textfilter_tmcode_tasks.rake +4 -0
  597. data/vendor/plugins/typo_textfilter_tmcode/test/typo_textfilter_tmcode_test.rb +8 -0
  598. data/vendor/plugins/upcoming_sidebar/Rakefile +22 -0
  599. data/vendor/plugins/upcoming_sidebar/init.rb +5 -0
  600. data/{app/models/aggregations → vendor/plugins/upcoming_sidebar/lib}/upcoming.rb +0 -0
  601. data/vendor/plugins/upcoming_sidebar/lib/upcoming_sidebar.rb +15 -0
  602. data/vendor/plugins/upcoming_sidebar/test/upcoming_sidebar_test.rb +8 -0
  603. data/{components/plugins/sidebars/upcoming → vendor/plugins/upcoming_sidebar/views}/content.rhtml +3 -3
  604. data/vendor/plugins/xbox_sidebar/Rakefile +22 -0
  605. data/vendor/plugins/xbox_sidebar/init.rb +5 -0
  606. data/{components/plugins/sidebars/xbox_controller.rb → vendor/plugins/xbox_sidebar/lib/xbox_sidebar.rb} +1 -1
  607. data/vendor/plugins/xbox_sidebar/test/xbox_sidebar_test.rb +8 -0
  608. data/vendor/plugins/xbox_sidebar/views/content.rhtml +2 -0
  609. data/vendor/plugins/xml_sidebar/Rakefile +22 -0
  610. data/vendor/plugins/xml_sidebar/init.rb +5 -0
  611. data/{components/plugins/sidebars/xml_controller.rb → vendor/plugins/xml_sidebar/lib/xml_sidebar.rb} +1 -1
  612. data/vendor/plugins/xml_sidebar/test/xml_sidebar_test.rb +8 -0
  613. data/vendor/plugins/xml_sidebar/views/content.rhtml +12 -0
  614. metadata +505 -101
  615. data/app/controllers/sidebar_controller.rb +0 -50
  616. data/app/models/content_observer.rb +0 -5
  617. data/components/plugins/sidebars/aimpresence/content.rhtml +0 -4
  618. data/components/plugins/sidebars/aimpresence_controller.rb +0 -10
  619. data/components/plugins/sidebars/amazon/content.rhtml +0 -4
  620. data/components/plugins/sidebars/amazon_controller.rb +0 -17
  621. data/components/plugins/sidebars/category/content.rhtml +0 -10
  622. data/components/plugins/sidebars/delicious/content.rhtml +0 -20
  623. data/components/plugins/sidebars/flickr_controller.rb +0 -16
  624. data/components/plugins/sidebars/fortythree/content.rhtml +0 -8
  625. data/components/plugins/sidebars/fortythreeplaces/content.rhtml +0 -8
  626. data/components/plugins/sidebars/magnolia/content.rhtml +0 -12
  627. data/components/plugins/sidebars/magnolia_controller.rb +0 -17
  628. data/components/plugins/sidebars/recent_comments_controller.rb +0 -23
  629. data/components/plugins/sidebars/static/content.rhtml +0 -2
  630. data/components/plugins/sidebars/tag/content.rhtml +0 -8
  631. data/components/plugins/sidebars/tag_controller.rb +0 -18
  632. data/components/plugins/sidebars/technorati/content.rhtml +0 -8
  633. data/components/plugins/sidebars/upcoming_controller.rb +0 -11
  634. data/components/plugins/sidebars/xbox/content.rhtml +0 -2
  635. data/components/plugins/sidebars/xml/content.rhtml +0 -12
  636. data/components/plugins/textfilters/amazon_controller.rb +0 -39
  637. data/components/plugins/textfilters/code_controller.rb +0 -59
  638. data/components/plugins/textfilters/flickr_controller.rb +0 -75
  639. data/components/plugins/textfilters/htmlfilter_controller.rb +0 -8
  640. data/components/plugins/textfilters/macropost_controller.rb +0 -14
  641. data/components/plugins/textfilters/macropre_controller.rb +0 -14
  642. data/components/plugins/textfilters/none_controller.rb +0 -8
  643. data/components/plugins/textfilters/smartypants_controller.rb +0 -8
  644. data/components/plugins/textfilters/sparkline_controller.rb +0 -88
  645. data/components/plugins/textfilters/textile_and_markdown_controller.rb +0 -8
  646. data/components/plugins/textfilters/textile_controller.rb +0 -14
  647. data/db/schema.mysql-v3.sql +0 -218
  648. data/lib/generators/sidebar/templates/components/plugins/sidebars/controller_template.rb +0 -20
  649. data/lib/generators/sidebar/templates/components/plugins/sidebars/views/content_template.rhtml +0 -4
  650. data/lib/rails_patch/components.rb +0 -14
  651. data/public/images/checked.gif +0 -0
  652. data/test/unit/observer_test.rb +0 -40
@@ -0,0 +1,5 @@
1
+ require 'sidebar'
2
+ require 'delicious_sidebar'
3
+
4
+ DeliciousSidebar.view_root = File.dirname(__FILE__) + '/views'
5
+
@@ -1,4 +1,4 @@
1
- class Plugins::Sidebars::DeliciousController < Sidebars::ComponentPlugin
1
+ class DeliciousSidebar < Sidebar
2
2
  display_name "Del.icio.us"
3
3
  description 'Bookmarks from <a href="http://del.icio.us">del.icio.us</a>'
4
4
 
@@ -8,22 +8,28 @@ class Plugins::Sidebars::DeliciousController < Sidebars::ComponentPlugin
8
8
  setting :description, false, :input_type => :checkbox, :label => 'Show description'
9
9
  setting :desclink, false, :input_type => :checkbox, :label => 'Allow links in description'
10
10
 
11
- def content
12
- response.lifetime = 1.hour
13
- @delicious = check_cache(Delicious, @sb_config['feed']) rescue nil
11
+ lifetime 1.hour
14
12
 
15
- return unless @delicious
13
+ def delicious
14
+ @delicious ||= Delicious.new(feed) rescue nil
15
+ end
16
+
17
+ def parse_request(contents, params)
18
+ return unless delicious
16
19
 
17
- if @sb_config['groupdate']
20
+ if groupdate
18
21
  @delicious.days = {}
19
22
  @delicious.items.each_with_index do |d,i|
20
- break if i >= @sb_config['count'].to_i
23
+ break if i >= count.to_i
21
24
  index = d.date.strftime("%Y-%m-%d").to_sym
22
- (@delicious.days[index] ||= Array.new) << d
25
+ (@delicious.days[index] ||= []) << d
26
+ end
27
+ @delicious.days =
28
+ @delicious.days.sort_by { |d| d.to_s }.reverse.collect do |d|
29
+ {:container => d.last, :date => d.first}
23
30
  end
24
- @delicious.days = @delicious.days.sort_by { |d| d.to_s }.reverse.collect { |d| {:container => d.last, :date => d.first} }
25
31
  else
26
- @delicious.items = @delicious.items.slice(0, @sb_config['count'].to_i)
32
+ @delicious.items = @delicious.items.slice(0, count.to_i)
27
33
  end
28
34
  end
29
35
  end
@@ -0,0 +1,8 @@
1
+ require 'test/unit'
2
+ require File.dirname(__FILE__) + '/../../../../test/test_helper'
3
+
4
+ class DeliciousSidebarTest < Test::Unit::TestCase
5
+ def test_sidebar_is_available
6
+ assert Sidebar.available_sidebars.include?(DeliciousSidebar)
7
+ end
8
+ end
@@ -0,0 +1,20 @@
1
+ <% if sidebar.delicious -%>
2
+ <div id="delicious">
3
+ <h3><a href="http://<%=h sidebar.delicious.title %>"><%=h sidebar.delicious.title %></a></h3>
4
+ <% (groupdate ? sidebar.delicious.days : [{ :container => sidebar.delicious.items }]).each do |group| -%>
5
+ <% if groupdate -%>
6
+ <span class="date"><%=h group[:date].to_s.to_date.strftime("%b %d") %></span>
7
+ <% end -%>
8
+ <ul>
9
+ <% for item in group[:container] %>
10
+ <li>
11
+ <a href="<%=h item.link %>" title="<%=h item.description%>"><%=h item.title %></a>
12
+ <% if item.description -%>
13
+ <br /><span class="desc"><%=h desclink ? item.description_link : item.description %></span>
14
+ <% end -%>
15
+ </li>
16
+ <% end -%>
17
+ </ul>
18
+ <% end -%>
19
+ </div>
20
+ <% end -%>
@@ -0,0 +1,22 @@
1
+ require 'rake'
2
+ require 'rake/testtask'
3
+ require 'rake/rdoctask'
4
+
5
+ desc 'Default: run unit tests.'
6
+ task :default => :test
7
+
8
+ desc 'Test the flickr_sidebar plugin.'
9
+ Rake::TestTask.new(:test) do |t|
10
+ t.libs << 'lib'
11
+ t.pattern = 'test/**/*_test.rb'
12
+ t.verbose = true
13
+ end
14
+
15
+ desc 'Generate documentation for the flickr_sidebar plugin.'
16
+ Rake::RDocTask.new(:rdoc) do |rdoc|
17
+ rdoc.rdoc_dir = 'rdoc'
18
+ rdoc.title = 'FlickrSidebar'
19
+ rdoc.options << '--line-numbers' << '--inline-source'
20
+ rdoc.rdoc_files.include('README')
21
+ rdoc.rdoc_files.include('lib/**/*.rb')
22
+ end
@@ -0,0 +1,5 @@
1
+ require 'sidebar'
2
+ require 'flickr_sidebar'
3
+
4
+ FlickrSidebar.view_root = File.dirname(__FILE__) + '/views'
5
+
@@ -35,7 +35,7 @@ class FlickrAggregation
35
35
  end
36
36
 
37
37
  def image
38
- description.scan( /(http:\/\/(static|photos).*?\.jpg)/ ).first.first
38
+ description.scan( /(http:\/\/(farm1|farm2|static|photos).*?\.jpg)/ ).first.first
39
39
  end
40
40
  def thumb
41
41
  image.gsub( /\_m\./, '_t.' )
@@ -0,0 +1,15 @@
1
+ class FlickrSidebar < Sidebar
2
+ description 'Pictures from <a href="http://www.flickr.com">flickr.com</a>'
3
+ setting :feed_url, nil
4
+ setting :count, 4
5
+ setting :format, 'rectangle', :choices => %w{rectangle square}
6
+
7
+ lifetime 1.hour
8
+
9
+ def flickr
10
+ @flickr ||= FlickrAggregation.new(feed_url)
11
+ rescue Exception => e
12
+ logger.info e
13
+ nil
14
+ end
15
+ end
@@ -0,0 +1,8 @@
1
+ require 'test/unit'
2
+ require File.dirname(__FILE__) + '/../../../../test/test_helper'
3
+
4
+ class FlickrSidebarTest < Test::Unit::TestCase
5
+ def test_sidebar_is_available
6
+ assert Sidebar.available_sidebars.include?(FlickrSidebar)
7
+ end
8
+ end
@@ -1,8 +1,8 @@
1
- <% if @flickr -%>
1
+ <% if sidebar.flickr -%>
2
2
  <div id="flickr">
3
- <h3><%= @flickr.title %> (<%= link_to "flickr", @flickr.link %>)</h3>
4
- <% for pic in @flickr.choose(@sb_config['count'].to_i) -%>
5
- <div class="flickr<%= @sb_config['format']%>"><%= case @sb_config['format']
3
+ <h3><%= sidebar.flickr.title %> (<%= link_to "flickr", sidebar.flickr.link %>)</h3>
4
+ <% for pic in sidebar.flickr.choose(count.to_i) -%>
5
+ <div class="flickr<%= format %>"><%= case format
6
6
  when 'square':
7
7
  link_to image_tag(pic.square, :alt => pic.title, :title => pic.title),pic.link
8
8
  when 'rectangle':
@@ -12,4 +12,4 @@
12
12
  </div>
13
13
  <% end -%>
14
14
  </div>
15
- <% end -%>
15
+ <% end -%>
@@ -0,0 +1,22 @@
1
+ require 'rake'
2
+ require 'rake/testtask'
3
+ require 'rake/rdoctask'
4
+
5
+ desc 'Default: run unit tests.'
6
+ task :default => :test
7
+
8
+ desc 'Test the fortythree_sidebar plugin.'
9
+ Rake::TestTask.new(:test) do |t|
10
+ t.libs << 'lib'
11
+ t.pattern = 'test/**/*_test.rb'
12
+ t.verbose = true
13
+ end
14
+
15
+ desc 'Generate documentation for the fortythree_sidebar plugin.'
16
+ Rake::RDocTask.new(:rdoc) do |rdoc|
17
+ rdoc.rdoc_dir = 'rdoc'
18
+ rdoc.title = 'FortythreeSidebar'
19
+ rdoc.options << '--line-numbers' << '--inline-source'
20
+ rdoc.rdoc_files.include('README')
21
+ rdoc.rdoc_files.include('lib/**/*.rb')
22
+ end
@@ -0,0 +1,5 @@
1
+ require 'sidebar'
2
+ require 'fortythree_sidebar'
3
+
4
+ FortythreeSidebar.view_root = File.dirname(__FILE__) + '/views'
5
+
@@ -1,12 +1,13 @@
1
- class Plugins::Sidebars::FortythreeController < Sidebars::ComponentPlugin
1
+ class FortythreeSidebar < Sidebar
2
2
  display_name "43things"
3
3
  description 'Goals from <a href="http://www.43things.com/">43things.com</a>.'
4
4
 
5
5
  setting :feed, 'http://www.43things.com/rss/uber/author?username=USER', :label => 'Feed URL'
6
6
  setting :count, 43, :label => 'Items limit'
7
7
 
8
- def content
9
- response.lifetime = 1.day
10
- @fortythree=check_cache(Fortythree, @sb_config['feed']) rescue nil
8
+ lifetime 1.day
9
+
10
+ def fortythree
11
+ @fortythree ||= Fortythree.new(feed) rescue nil
11
12
  end
12
13
  end
@@ -0,0 +1,8 @@
1
+ require 'test/unit'
2
+ require File.dirname(__FILE__) + '/../../../../test/test_helper'
3
+
4
+ class FortythreeSidebarTest < Test::Unit::TestCase
5
+ def test_sidebar_is_available
6
+ assert Sidebar.available_sidebars.include?(FortythreeSidebar)
7
+ end
8
+ end
@@ -0,0 +1,8 @@
1
+ <% if sidebar.fortythree -%>
2
+ <h3><%= link_to "43 Things", sidebar.fortythree.link %></h3>
3
+ <ul>
4
+ <% for thing in sidebar.fortythree.things.to_a.slice(0,count.to_i) -%>
5
+ <li><a href="<%= thing.link %>" title="<%=h thing.title %>"><%=h thing.title %> </a></li>
6
+ <% end -%>
7
+ </ul>
8
+ <% end -%>
@@ -0,0 +1,22 @@
1
+ require 'rake'
2
+ require 'rake/testtask'
3
+ require 'rake/rdoctask'
4
+
5
+ desc 'Default: run unit tests.'
6
+ task :default => :test
7
+
8
+ desc 'Test the fortythreeplaces_sidebar plugin.'
9
+ Rake::TestTask.new(:test) do |t|
10
+ t.libs << 'lib'
11
+ t.pattern = 'test/**/*_test.rb'
12
+ t.verbose = true
13
+ end
14
+
15
+ desc 'Generate documentation for the fortythreeplaces_sidebar plugin.'
16
+ Rake::RDocTask.new(:rdoc) do |rdoc|
17
+ rdoc.rdoc_dir = 'rdoc'
18
+ rdoc.title = 'FortythreeplacesSidebar'
19
+ rdoc.options << '--line-numbers' << '--inline-source'
20
+ rdoc.rdoc_files.include('README')
21
+ rdoc.rdoc_files.include('lib/**/*.rb')
22
+ end
@@ -0,0 +1,5 @@
1
+ require 'sidebar'
2
+ require 'fortythreeplaces_sidebar'
3
+
4
+ FortythreeplacesSidebar.view_root = File.dirname(__FILE__) + '/views'
5
+
@@ -0,0 +1,62 @@
1
+ require 'open-uri'
2
+ require 'time'
3
+ require 'rexml/document'
4
+
5
+ # Example:
6
+ #
7
+ # fortythree = Fortythree.new('http://www.43things.com/rss/uber/author?username=<user>')
8
+ # fortythree.things.each do |thing|
9
+ # puts "#{thing.title} @ #{thing.link} updated at #{thing.date}"
10
+ # end
11
+ #
12
+ class Fortythree
13
+ include REXML
14
+
15
+ attr_accessor :url, :things, :link, :title, :description
16
+
17
+ # This object holds given information of a thing
18
+ class ThingItem < Struct.new(:link, :title, :date)
19
+ def to_s; title end
20
+ def date=(value); super(Time.parse(value)) end
21
+ end
22
+
23
+ # Pass the url to the RSS feed you would like to keep tabs on
24
+ # by default this will request the rss from the server right away and
25
+ # fill the tasks array def initialize(url, refresh = true)
26
+ def initialize(url, refresh = true)
27
+ self.things = []
28
+ self.url = url
29
+ self.refresh if refresh
30
+ end
31
+
32
+ # This method lets you refresh the things into the things array
33
+ # useful if you keep the object cached in memory and
34
+ def refresh
35
+ open(@url) do |http|
36
+ parse(http.read)
37
+ end
38
+ end
39
+
40
+ private
41
+
42
+ def parse(body)
43
+
44
+ xml = Document.new(body)
45
+
46
+ self.things = []
47
+ self.link = XPath.match(xml, "//channel/link/text()").to_s
48
+ self.title = XPath.match(xml, "//channel/title/text()").to_s
49
+ self.description = XPath.match(xml, "//channel/description/text()").to_s
50
+
51
+ XPath.each(xml, "//item/") do |elem|
52
+
53
+ thing = ThingItem.new
54
+ thing.title = XPath.match(elem, "title/text()").to_s
55
+
56
+ thing.date = XPath.match(elem, "pubDate/text()").to_s
57
+ thing.link = XPath.match(elem, "link/text()").to_s
58
+
59
+ things << thing
60
+ end
61
+ end
62
+ end
@@ -1,12 +1,13 @@
1
- class Plugins::Sidebars::FortythreeplacesController < Sidebars::ComponentPlugin
1
+ class FortythreeplacesSidebar < Sidebar
2
2
  display_name "43places"
3
3
  description 'List of your <a href="http://www.43places.com/">43places.com</a>.'
4
4
 
5
5
  setting :feed, 'http://www.43places.com/rss/uber/author?username=USER', :label => 'Feed URL'
6
6
  setting :count, 43, :label => 'Items limit'
7
7
 
8
- def content
9
- response.lifetime = 1.day
10
- @fortythreeplaces=check_cache(Fortythree, @sb_config['feed']) rescue nil
8
+ lifetime 1.day
9
+
10
+ def fortythreeplaces
11
+ @fortythreeplaces ||= Fortythree.new(feed) rescue nil
11
12
  end
12
13
  end
@@ -0,0 +1,8 @@
1
+ require 'test/unit'
2
+ require File.dirname(__FILE__) + '/../../../../test/test_helper'
3
+
4
+ class FortythreeplacesSidebarTest < Test::Unit::TestCase
5
+ def test_sidebar_is_available
6
+ assert Sidebar.available_sidebars.include?(FortythreeplacesSidebar)
7
+ end
8
+ end
@@ -0,0 +1,8 @@
1
+ <% if sidebar.fortythreeplaces -%>
2
+ <h3><%= link_to "43 Places", sidebar.fortythreeplaces.link %></h3>
3
+ <ul>
4
+ <% for thing in sidebar.fortythreeplaces.things.to_a.slice(0,count.to_i) -%>
5
+ <li><a href="<%= thing.link %>" title="<%=h thing.title %>"><%=h thing.title %> </a></li>
6
+ <% end -%>
7
+ </ul>
8
+ <% end -%>
@@ -0,0 +1,20 @@
1
+ Copyright (c) 2006 Hampton Catlin
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,662 @@
1
+ = Haml (XHTML Abstraction Markup Language)
2
+
3
+ Haml is a markup language
4
+ that's used to cleanly and simply describe the XHTML of any web document,
5
+ without the use of inline code.
6
+ Haml functions as a replacement
7
+ for inline page templating systems such as PHP, RHTML, and ASP.
8
+ However, Haml avoids the need for explicitly coding XHTML into the template,
9
+ because it is actually an abstract description of the XHTML,
10
+ with some code to generate dynamic content.
11
+
12
+ == Features
13
+
14
+ * Whitespace active
15
+ * Well-formatted markup
16
+ * DRY
17
+ * Follows CSS conventions
18
+ * Interpolates Ruby code
19
+ * Implements Rails templates with the .haml extension
20
+
21
+ == Authors
22
+
23
+ Haml was originally created by Hampton Catlin (hcatlin).
24
+ Help with the Ruby On Rails implementation and much of the documentation
25
+ by Jeff Hardy (packagethief).
26
+
27
+ Nathan Weizenbaum (Nex3) contributed the buffered-engine code,
28
+ along with many other enhancements
29
+ (including the silent-line syntax: "-").
30
+
31
+ If you use this software, you must pay Hampton a compliment.
32
+ Say something nice about it.
33
+ Beyond that, the implementation is licensed under the MIT License.
34
+ Ok, fine, I guess that means compliments aren't *required*.
35
+
36
+ == Formatting
37
+
38
+ Haml is sensitive to spacing and indentation;
39
+ it uses nesting to convey structure.
40
+ When you want an element to have children,
41
+ indent the lines below it using two spaces.
42
+ Remember, spaces are not the same as tabs.
43
+ For example:
44
+
45
+ #contact
46
+ %h1 Eugene Mumbai
47
+ %ul.info
48
+ %li.login eugene
49
+ %li.email eugene@example.com
50
+
51
+ is compiled to:
52
+
53
+ <div id='contact'>
54
+ <h1>Eugene Mumbai</h1>
55
+ <ul class='info'>
56
+ <li class='login'>eugene</li>
57
+ <li class='email'>eugene@example.com</li>
58
+ </ul>
59
+ </div>
60
+
61
+ == Characters with meaning to Haml
62
+
63
+ Various characters, when placed at a certain point in a line,
64
+ instruct Haml to render different types of things.
65
+
66
+ === XHTML Tags
67
+
68
+ These characters render XHTML tags.
69
+
70
+ ==== %
71
+
72
+
73
+ This element is placed at the beginning of a line.
74
+ It's followed immediately by the name of an element,
75
+ then optionally by modifiers (see below), a space,
76
+ and text to be rendered inside the element.
77
+ It creates an element in the form of <tt><element></element></tt>.
78
+ For example:
79
+
80
+ %one
81
+ %two
82
+ %three Hey there
83
+
84
+ is compiled to:
85
+
86
+ <one>
87
+ <two>
88
+ <three>Hey there</three>
89
+ </two>
90
+ </one>
91
+
92
+ Any string is a valid element name;
93
+ Haml will automatically generate opening and closing tags for any element.
94
+
95
+ ==== {}
96
+
97
+ Brackets represent a Ruby hash
98
+ that is used for specifying the attributes of an element.
99
+ It is literally evaluated as a Ruby hash,
100
+ so logic will work in it and local variables may be used.
101
+ Quote characters within the attribute
102
+ will be replaced by appropriate escape sequences.
103
+ The hash is placed after the tag is defined.
104
+ For example:
105
+
106
+ %head{ :name => "doc_head" }
107
+ %script{ 'type' => "text/" + "javascript",
108
+ :src => "javascripts/script_#{2 + 7}" }
109
+
110
+ is compiled to:
111
+
112
+ <head name="doc_head">
113
+ <script src='javascripts/script_9' type='text/javascript'>
114
+ </script>
115
+ </head>
116
+
117
+ ==== []
118
+
119
+ Square brackets follow a tag definition and contain a Ruby object
120
+ that is used to set the class and id of that tag.
121
+ The class is set to the object's class
122
+ (transformed to use underlines rather than camel case)
123
+ and the id is set to the object's class, followed by its id.
124
+ Because the id of an object is normally an obscure implementation detail,
125
+ this is most useful for elements that represent instances of Models.
126
+ For example:
127
+
128
+ # file: app/controllers/users_controller.rb
129
+
130
+ def show
131
+ @user = CrazyUser.find(15)
132
+ end
133
+
134
+ # file: app/views/users/show.haml
135
+
136
+ %div[@user]
137
+ %bar[290]/
138
+ Hello!
139
+
140
+ is compiled to:
141
+
142
+ <div class="crazy_user" id="crazy_user_15">
143
+ <bar class="fixnum" id="fixnum_581" />
144
+ Hello!
145
+ </div>
146
+
147
+ This is based off of DHH's SimplyHelpful syntax,
148
+ as presented at RailsConf Europe 2006.
149
+
150
+ ==== /
151
+
152
+ The forward slash character, when placed at the end of a tag definition,
153
+ causes the tag to be self-closed.
154
+ For example:
155
+
156
+ %br/
157
+ %meta{:http-equiv => 'Content-Type', :content => 'text/html'}/
158
+
159
+ is compiled to:
160
+
161
+ <br />
162
+ <meta http-equiv='Content-Type' content='text/html' />
163
+
164
+ ==== . and #
165
+
166
+ The period and pound sign are borrowed from CSS.
167
+ They are used as shortcuts to specify the <tt>class</tt>
168
+ and <tt>id</tt> attributes of an element, respectively.
169
+ Multiple class names can be specified in a similar way to CSS,
170
+ by chaining the class names together with periods.
171
+ They are placed immediately after the tag and before an attributes hash.
172
+ For example:
173
+
174
+ div#things
175
+ %span#rice Chicken Fried
176
+ %p.beans{ :food => 'true' } The magical fruit
177
+ %h1.class.otherclass#id La La La
178
+
179
+ is compiled to:
180
+
181
+ <div id='things'>
182
+ <span id='rice'>Chicken Fried</span>
183
+ <p class='beans' food='true'>The magical fruit</p>
184
+ <h1 class='class' id='id'>La La La</h1>
185
+ </div>
186
+
187
+ And,
188
+
189
+ #content
190
+ .articles
191
+ .article.title
192
+ Doogie Howser Comes Out
193
+ .article.date
194
+ 2006-11-05
195
+ .article.entry
196
+ Neil Patrick Harris would like to dispel any rumors that he is straight
197
+
198
+ is compiled to:
199
+
200
+ <div id="content">
201
+ <div class="articles">
202
+ <div class="article title">Doogie Howser Comes Out</div>
203
+ <div class="article date">2006-11-05</div>
204
+ <div class="article entry">
205
+ Neil Patrick Harris would like to dispel any rumors that he is straight
206
+ </div>
207
+ </div>
208
+ </div>
209
+
210
+ ==== Implicit Div Elements
211
+
212
+ Because the div element is used so often, it is the default element.
213
+ If you only define a class and/or id using the <tt>.</tt> or <tt>#</tt> syntax,
214
+ a div element is automatically used.
215
+ For example:
216
+
217
+ #collection
218
+ .item
219
+ .description What a cool item!
220
+
221
+ is the same as:
222
+
223
+ %div{:id => collection}
224
+ %div{:class => 'item'}
225
+ %div{:class => 'description'} What a cool item!
226
+
227
+ and is compiled to:
228
+
229
+ <div id='collection'>
230
+ <div class='item'>Broken record album</div>
231
+ <div class='description'>What a cool item!</div>
232
+ </div>
233
+
234
+ ==== = and ~
235
+
236
+ <tt>=</tt> and <tt>~</tt> are placed at the end of a tag definition,
237
+ after class, id, and attribute declarations.
238
+ They're just shortcuts for inserting Ruby code into an element.
239
+ They work the same as <tt>=</tt> and <tt>~</tt> without a tag;
240
+ see below for documentation of those.
241
+ However, if the result is short enough,
242
+ it is displayed entirely on one line.
243
+ For example:
244
+
245
+ %p= "hello"
246
+ %h1~ 1 + 2
247
+
248
+ is not quite the same as:
249
+
250
+ %p
251
+ = "hello"
252
+ %h1
253
+ ~ 1 + 2
254
+
255
+ It's compiled to:
256
+
257
+ <p>hello</p>
258
+ <h1>3</h1>
259
+
260
+ === XHTML Helpers
261
+
262
+ ==== No Special Character
263
+
264
+ If no special character appears at the beginning of a line,
265
+ the line is rendered as plain text.
266
+ For example:
267
+
268
+ %gee
269
+ %whiz
270
+ Wow this is cool!
271
+
272
+ is compiled to:
273
+
274
+ <gee>
275
+ <whiz>
276
+ Wow this is cool!
277
+ </whiz>
278
+ </gee>
279
+
280
+ ==== !!!
281
+
282
+ When describing XHTML documents with Haml,
283
+ you can have a document type or XML prolog generated automatically
284
+ by including the characters <tt>!!!</tt>.
285
+ For example:
286
+
287
+ !!! XML
288
+ !!!
289
+ %html
290
+ %head
291
+ %title Myspace
292
+ %body
293
+ %h1 I am the international space station
294
+ %p Sign my guestbook
295
+
296
+ is compiled to:
297
+
298
+ <?xml version="1.0" encoding="utf-8" ?>
299
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
300
+ <html>
301
+ <head>
302
+ <title>Myspace</title>
303
+ </head>
304
+ <body>
305
+ <h1>I am the international space station</h1>
306
+ <p>Sign my guestbook</p>
307
+ </body>
308
+ </html>
309
+
310
+ You can also specify the version and type of XHTML after the <tt>!!!</tt>.
311
+ XHTML 1.0 Strict, Transitional, and Frameset and XHTML 1.1 are supported.
312
+ The default version is 1.0 and the default type is Transitional.
313
+ For example:
314
+
315
+ !!! 1.1
316
+
317
+ is compiled to:
318
+
319
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
320
+
321
+ and
322
+
323
+ !!! Strict
324
+
325
+ is compiled to:
326
+
327
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
328
+
329
+ If you're not using the UTF-8 characterset for your document,
330
+ you can specify which encoding should appear
331
+ in the XML prolog in a similar way.
332
+ For example:
333
+
334
+ !!! XML iso-8859-1
335
+
336
+ is compiled to:
337
+
338
+ <?xml version="1.0" encoding="iso-8859-1" ?>
339
+
340
+ ==== /
341
+
342
+ The forward slash character, when placed at the beginning of a line,
343
+ wraps all text after it in an HTML comment.
344
+ For example:
345
+
346
+ %billabong
347
+ / This is the billabong element
348
+ I like billabongs!
349
+
350
+ is compiled to:
351
+
352
+ <billabong>
353
+ <!-- This is the billabong element -->
354
+ I like billabongs!
355
+ </billabong>
356
+
357
+ The forward slash can also wrap indented sections of code. For example:
358
+
359
+ /
360
+ %p This doesn't render...
361
+ %div
362
+ %h1 Because it's commented out!
363
+
364
+ is compiled to:
365
+
366
+ <!--
367
+ <p>This doesn't render...</p>
368
+ <div>
369
+ <h1>Because it's commented out!</h1>
370
+ </div>
371
+ -->
372
+
373
+ You can also use Internet Explorer conditional comments
374
+ (about)[http://www.quirksmode.org/css/condcom.html]
375
+ by enclosing the condition in square brackets after the <tt>/</tt>.
376
+ For example:
377
+
378
+ /[if IE]
379
+ %a{ :href => 'http://www.mozilla.com/en-US/firefox/' }
380
+ %h1 Get Firefox
381
+
382
+ is compiled to:
383
+
384
+ <!--[if IE]>
385
+ <a href='http://www.mozilla.com/en-US/firefox/'>
386
+ <h1>Get Firefox</h1>
387
+ </a>
388
+ <![endif]-->
389
+
390
+ ==== \
391
+
392
+ The backslash character escapes the first character of a line,
393
+ allowing use of otherwise interpreted characters as plain text.
394
+ For example:
395
+
396
+ %title
397
+ = @title
398
+ \- MySite
399
+
400
+ is compiled to:
401
+
402
+ <title>
403
+ MyPage
404
+ - MySite
405
+ </title>
406
+
407
+ ==== |
408
+
409
+ The pipe character designates a multiline string.
410
+ It's placed at the end of a line
411
+ and means that all following lines that end with <tt>|</tt>
412
+ will be evaluated as though they were on the same line.
413
+ For example:
414
+
415
+ %whoo
416
+ %hoo I think this might get |
417
+ pretty long so I should |
418
+ probably make it |
419
+ multiline so it doesn't |
420
+ look awful. |
421
+ %p This is short.
422
+
423
+ is compiled to:
424
+
425
+ %hoo I think this might get |
426
+ pretty long so I should |
427
+ probably make it |
428
+ multiline so it doesn't |
429
+ look awful. |
430
+
431
+ === Ruby evaluators
432
+
433
+ ==== =
434
+
435
+ The equals character is followed by Ruby code,
436
+ which is evaluated and the output inserted into the document as plain text.
437
+ For example:
438
+
439
+ %p
440
+ = ['hi', 'there', 'reader!'].join " "
441
+ = "yo"
442
+
443
+ is compiled to:
444
+
445
+ <p>
446
+ hi there reader!
447
+ yo
448
+ </p>
449
+
450
+ ==== ~
451
+
452
+ The tilde character works the same as the equals character,
453
+ but the output is modified in such a way
454
+ that newlines in whitespace-sensitive elements work properly.
455
+ For example:
456
+
457
+ %foo
458
+ = "Woah <pre> this is \n</pre> crazy"
459
+ %foo2
460
+ ~ "Woah <pre> this is \n</pre> crazy"
461
+
462
+ is compiled to:
463
+
464
+ <foo>
465
+ Woah <pre> this is
466
+ </pre> crazy
467
+ </foo>
468
+ <foo2>
469
+ Woah <pre> this is &#x000A;</pre> crazy
470
+ </foo2>
471
+
472
+ If the ~ character isn't followed by text,
473
+ it doesn't evaluate Ruby at all.
474
+ Instead, an indented section following it will be rendered
475
+ in a whitespace-sensitive manner,
476
+ using HTML encodings for newlines.
477
+ For example:
478
+
479
+ For example:
480
+
481
+ .house
482
+ %pre
483
+ ~
484
+ /^^^\
485
+ |[] []|
486
+ |_____|
487
+
488
+ is compiled to:
489
+
490
+ <div class="house">
491
+ <pre>
492
+ &#x000A; /^^^\&#x000A;|[] []|&#x000A;|_____|&#x000A;
493
+ </pre>
494
+ </div>
495
+
496
+ ==== -
497
+
498
+ The hyphen character makes the text following it into "silent script":
499
+ Ruby script that is evaluated, but not output.
500
+
501
+ <b>It is not recommended that you use this widely;
502
+ almost all processing code and logic should be restricted
503
+ to the Controller, the Helper, or partials.</b>
504
+
505
+ For example:
506
+
507
+ - foo = "hello"
508
+ - foo << " there"
509
+ - foo << " you!"
510
+ %p= foo
511
+
512
+ is compiled to:
513
+
514
+ <p>
515
+ hello there you!
516
+ </p>
517
+
518
+ ===== Blocks
519
+
520
+ Ruby blocks, like XHTML tags, don't need to be explicitly closed in Haml.
521
+ Rather, they're automatically closed, based on indentation.
522
+ A block begins whenever the indentation is increased
523
+ after a silent script command.
524
+ It ends when the indentation decreases
525
+ (as long as it's not an +else+ clause or something similar).
526
+ For example:
527
+
528
+ - (42...47).each do |i|
529
+ %p= i
530
+ %p See, I can count!
531
+
532
+ is compiled to:
533
+
534
+ <p>
535
+ 42
536
+ </p>
537
+ <p>
538
+ 43
539
+ </p>
540
+ <p>
541
+ 44
542
+ </p>
543
+ <p>
544
+ 45
545
+ </p>
546
+ <p>
547
+ 46
548
+ </p>
549
+
550
+ Another example:
551
+
552
+ %p
553
+ - case 2
554
+ - when 1
555
+ = "1!"
556
+ - when 2
557
+ = "2?"
558
+ - when 3
559
+ = "3."
560
+
561
+ is compiled to:
562
+
563
+ <p>
564
+ 2?
565
+ </p>
566
+
567
+ == Using Haml as a Rails plugin
568
+
569
+ Write Rails templates with the .haml extension.
570
+ For example:
571
+
572
+ # file: app/views/movies/teen_wolf.haml
573
+
574
+ %html
575
+ %head
576
+ %title= "Teen Wolf (1985)"
577
+ %body
578
+ #contents
579
+ %h1 "A highschooler discovers that he is a werewolf"
580
+ %ul.cast
581
+ %li "Scott Howard"
582
+ %li "Rupert 'Stiles' Stilinski"
583
+ %li "Lisa 'Boof' Marconi"
584
+ %li "Lewis"
585
+
586
+ is compiled to:
587
+
588
+ <html>
589
+ <head>
590
+ <title>Teen Wolf (1985)</title>
591
+ </head>
592
+ <body>
593
+ <div id='contents'>
594
+ <h1>A highschooler discovers that he is a werewolf</h1>
595
+ <ul class='cast'>
596
+ <li>Scott Howard</li>
597
+ <li>Rupert 'Stiles' Stilinski</li>
598
+ <li>Lisa 'Boof' Marconi</li>
599
+ <li>Lewis</li>
600
+ </ul>
601
+ </div>
602
+ </body>
603
+ </html>
604
+
605
+ You can access instance variables in Haml templates
606
+ the same way you do in ERb templates.
607
+ Helper methods are also available in Haml templates.
608
+ For example:
609
+
610
+ # file: app/controllers/movies_controller.rb
611
+
612
+ class MoviesController < ApplicationController
613
+ def index
614
+ @title = "Teen Wolf"
615
+ end
616
+ end
617
+
618
+ # file: app/views/movies/index.haml
619
+
620
+ #content
621
+ .title
622
+ %h1= @title
623
+ = link_to 'Home', home_url
624
+
625
+ may be compiled to:
626
+
627
+ <div id='content'>
628
+ <div class='title'>
629
+ <h1>Teen Wolf</h1>
630
+ <a href='/'>Home</a>
631
+ </div>
632
+ </div>
633
+
634
+ === Setting Options
635
+
636
+ Options can be set by setting the hash <tt>Haml::Template.options</tt>
637
+ from <tt>environment.rb</tt>.
638
+ Available options are:
639
+
640
+ [<tt>:suppress_eval</tt>] Whether or not attribute hashes and Ruby scripts
641
+ designated by <tt>=</tt> or <tt>~</tt> should be
642
+ evaluated. If this is true, said scripts are
643
+ rendered as empty strings. Defaults to false.
644
+
645
+ [<tt>:precompiled</tt>] A string containing a precompiled Haml template.
646
+ If this is passed, <tt>template</tt> is ignored
647
+ and no precompilation is done.
648
+
649
+ [<tt>:attr_wrapper</tt>] The character that should wrap element attributes.
650
+ This defaults to <tt>'</tt> (an apostrophe). Characters
651
+ of this type within the attributes will be escaped
652
+ (e.g. by replacing them with <tt>&apos;</tt>) if
653
+ the character is an apostrophe or a quotation mark.
654
+
655
+ [<tt>:locals</tt>] The local variables that will be available within the
656
+ template. For instance, if <tt>:locals</tt> is
657
+ <tt>{ :foo => "bar" }</tt>, then within the template,
658
+ <tt>= foo</tt> will produce <tt>bar</tt>.
659
+
660
+ ---
661
+ Copyright (c) 2006 Hampton Catlin
662
+ Licensed under the MIT License