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,11 @@
1
+ class RemoveCachedHtml < ActiveRecord::Migration
2
+ def self.up
3
+ remove_column :contents, :body_html
4
+ remove_column :contents, :extended_html
5
+ end
6
+
7
+ def self.down
8
+ add_column :contents, :body_html, :text
9
+ add_column :contents, :extended_html, :text
10
+ end
11
+ end
@@ -0,0 +1,22 @@
1
+ class PromoteCanonicalServerUrl < ActiveRecord::Migration
2
+ class Blog < ActiveRecord::Base
3
+ include BareMigration
4
+ serialize :settings, Hash
5
+ end
6
+
7
+ def self.up
8
+ add_column :blogs, :base_url, :string
9
+ Blog.find(:all).each do |blog|
10
+ begin
11
+ blog.base_url = blog.settings['canonical_server_url']
12
+ blog.save
13
+ rescue
14
+ # if base_url doesn't exist, then we don't really care.
15
+ end
16
+ end
17
+ end
18
+
19
+ def self.down
20
+ remove_column :blogs, :base_url
21
+ end
22
+ end
@@ -0,0 +1,26 @@
1
+ class UpgradeSidebarObjects < ActiveRecord::Migration
2
+ class Sidebar < ActiveRecord::Base
3
+ include BareMigration
4
+ end
5
+
6
+ def self.up
7
+ modify_tables_and_update(:add_column, Sidebar, :type, :string) do |sb|
8
+ next if $schema_generator
9
+ if sb.controller.nil?
10
+ raise "Found a sidebar, \"#{sb.id}\", which doesn't know its controller so can't convert it. Settings are:\n #{sb.settings}. Please either correct the controller or delete the sidebar."
11
+ end
12
+ sb.type = sb.controller.camelcase + 'Sidebar'
13
+ sb.save!
14
+ end
15
+ remove_column :sidebars, :controller
16
+ end
17
+
18
+ def self.down
19
+ modify_tables_and_update(:add_column, Sidebar, :controller, :string) do |sb|
20
+ next if $schema_generator
21
+ sb.controller = sb[:type].underscore.sub(/_sidebar$/, '')
22
+ sb.save!
23
+ end
24
+ remove_column :sidebars, :type
25
+ end
26
+ end
@@ -0,0 +1,17 @@
1
+ class LinkSidebarsToBlog < ActiveRecord::Migration
2
+ class Sidebar < ActiveRecord::Base
3
+ include BareMigration
4
+ end
5
+
6
+ def self.up
7
+ modify_tables_and_update(:add_column, Sidebar, :blog_id, :integer) do |sb|
8
+ next if $schema_generator
9
+ sb.blog_id = 1
10
+ sb.save!
11
+ end
12
+ end
13
+
14
+ def self.down
15
+ remove_column :sidebars, :blog_id
16
+ end
17
+ end
@@ -0,0 +1,32 @@
1
+ class CreateNotifications < ActiveRecord::Migration
2
+ class OldNotification < ActiveRecord::Base
3
+ end
4
+
5
+ class Notification < ActiveRecord::Base
6
+ end
7
+
8
+ def self.up
9
+ rename_table :notifications, :old_notifications
10
+ create_table :notifications do |t|
11
+ t.column :content_id, :integer
12
+ t.column :user_id, :integer
13
+ t.column :created_at, :datetime
14
+ t.column :updated_at, :datetime
15
+ end
16
+
17
+ OldNotification.reset_column_information
18
+ Notification.reset_column_information
19
+ if $schema_generator
20
+ OldNotification.find(:all).each do |on|
21
+ Notification.create!(on.attributes)
22
+ end
23
+ end
24
+ drop_table :old_notifications
25
+ end
26
+
27
+ def self.down
28
+ remove_column :notifications, :id
29
+ rename_column :notifications, :user_id, :notify_user_id
30
+ rename_column :notifications, :content_id, :notify_content_id
31
+ end
32
+ end
@@ -0,0 +1,45 @@
1
+ class AddCategorizationModel < ActiveRecord::Migration
2
+ class ArticlesCategory < ActiveRecord::Base
3
+ include BareMigration
4
+ end
5
+
6
+ class Categorization < ActiveRecord::Base
7
+ include BareMigration
8
+ end
9
+
10
+ def self.up
11
+ create_table :categorizations do |t|
12
+ t.column :article_id, :integer
13
+ t.column :category_id, :integer
14
+ t.column :is_primary, :boolean
15
+ end
16
+
17
+ unless $schema_generator
18
+ ArticlesCategory.find(:all).each do |ac|
19
+ Categorization.create!(:article_id => ac.article_id,
20
+ :category_id => ac.category_id,
21
+ :is_primary => (ac.is_primary == 1))
22
+ end
23
+ end
24
+
25
+ drop_table :articles_categories
26
+ end
27
+
28
+ def self.down
29
+ create_table :articles_categories, :id => false do |t|
30
+ t.column :article_id, :integer
31
+ t.column :category_id, :integer
32
+ t.column :is_primary, :integer
33
+ end
34
+
35
+ unless $schema_generator
36
+ Categorization.find(:all).each do |c|
37
+ ArticlesCategory.create!(:article_id => c.article_id,
38
+ :category_id => c.category_id,
39
+ :is_primary => c.is_primary ? 1 : 0)
40
+ end
41
+ end
42
+
43
+ drop_table :categorizations
44
+ end
45
+ end
@@ -0,0 +1,68 @@
1
+ class SeparateEntriesAndFeedback < ActiveRecord::Migration
2
+ class Content < ActiveRecord::Base
3
+ end
4
+
5
+ class Feedback < ActiveRecord::Base
6
+ end
7
+
8
+ def self.up
9
+ # Comment this out once you've made a backup
10
+
11
+ create_table :feedback, :force => true do |t|
12
+ t.column "type", :string
13
+ t.column "title", :string
14
+ t.column "author", :string
15
+ t.column "body", :text
16
+ t.column "extended", :text
17
+ t.column "excerpt", :text
18
+ t.column "keywords", :string
19
+ t.column "created_at", :datetime
20
+ t.column "updated_at", :datetime
21
+ t.column "user_id", :integer
22
+ t.column "permalink", :string
23
+ t.column "guid", :string
24
+ t.column "text_filter_id", :integer
25
+ t.column "whiteboard", :text
26
+ t.column "article_id", :integer
27
+ t.column "email", :string
28
+ t.column "url", :string
29
+ t.column "ip", :string, :limit => 40
30
+ t.column "blog_name", :string
31
+ t.column "name", :string
32
+ t.column "published", :boolean, :default => false
33
+ t.column "allow_pings", :boolean
34
+ t.column "allow_comments", :boolean
35
+ t.column "blog_id", :integer, :null => false
36
+ t.column "published_at", :datetime
37
+ t.column "state", :text
38
+ t.column "status_confirmed", :boolean
39
+ end
40
+
41
+ Content.transaction do
42
+ Feedback.transaction do
43
+ Content.find(:all, :conditions => {:type => %w{ Comment Trackback }}).each do |content|
44
+ Feedback.new(content.attributes) do |fb|
45
+ fb[:type] = content[:type]
46
+ fb.save!
47
+ end
48
+ end
49
+ Content.delete_all(:type => %w{ Comment Trackback })
50
+ end
51
+ end
52
+ end
53
+
54
+ def self.down
55
+ Content.transaction do
56
+ Feedback.transaction do
57
+ Feedback.find(:all).each do |fb|
58
+ Content.new(fb.attributes) do |cnt|
59
+ cnt[:type] = fb[:type]
60
+ cnt.save!
61
+ end
62
+ end
63
+ end
64
+ end
65
+
66
+ drop_table :feedback
67
+ end
68
+ end
@@ -0,0 +1,25 @@
1
+ class CleanupFeedbackTable < ActiveRecord::Migration
2
+ def self.up
3
+ remove_column :feedback, :extended
4
+ remove_column :feedback, :keywords
5
+ remove_column :feedback, :permalink
6
+ remove_column :feedback, :allow_pings
7
+ remove_column :feedback, :allow_comments
8
+ remove_column :feedback, :name
9
+
10
+ add_index :feedback, :article_id
11
+ add_index :feedback, :text_filter_id
12
+ end
13
+
14
+ def self.down
15
+ add_column :feedback, :extended, :text
16
+ add_column :feedback, :keywords, :string
17
+ add_column :feedback, :permalink, :string
18
+ add_column :feedback, :allow_pings, :boolean
19
+ add_column :feedback, :allow_comments, :boolean
20
+ add_column :feedback, :name, :string
21
+
22
+ remove_index :feedback, :article_id
23
+ remove_index :feedback, :text_filter_id
24
+ end
25
+ end
@@ -0,0 +1,29 @@
1
+ class CleanupContentsTable < ActiveRecord::Migration
2
+ def self.up
3
+ remove_index(:contents, :article_id) rescue nil
4
+
5
+ remove_column :contents, :article_id
6
+ remove_column :contents, :email
7
+ remove_column :contents, :url
8
+ remove_column :contents, :ip
9
+ remove_column :contents, :blog_name
10
+ remove_column :contents, :status_confirmed
11
+
12
+ add_index :contents, :published
13
+ add_index :contents, :text_filter_id
14
+ end
15
+
16
+ def self.down
17
+ remove_index :contents, :published
18
+ remove_index :contents, :text_filter_id
19
+
20
+ add_column :contents, :article_id, :integer
21
+ add_column :contents, :email, :string
22
+ add_column :contents, :url, :string
23
+ add_column :contents, :ip, :string, :limit => 40
24
+ add_column :contents, :blog_name, :string
25
+ add_column :contents, :status_confirmed, :boolean
26
+
27
+ add_index :contents, :article_id
28
+ end
29
+ end
@@ -0,0 +1,25 @@
1
+ class ConvertTitlePrefixSetting < ActiveRecord::Migration
2
+ class BareBlog < ActiveRecord::Base
3
+ include BareMigration
4
+
5
+ serialize :settings, Hash
6
+ end
7
+
8
+ def self.up
9
+ BareBlog.find(:all).each do |b|
10
+ if b.settings.has_key? "title_prefix"
11
+ b.settings["title_prefix"] = (b.settings["title_prefix"] ? 1 : 0)
12
+ b.save!
13
+ end
14
+ end
15
+ end
16
+
17
+ def self.down
18
+ BareBlog.find(:all).each do |b|
19
+ if b.settings.has_key? "title_prefix"
20
+ b.settings["title_prefix"] = (b.settings["title_prefix"] == 1)
21
+ b.save!
22
+ end
23
+ end
24
+ end
25
+ end
@@ -7,182 +7,209 @@
7
7
 
8
8
  -- tables
9
9
 
10
- CREATE TABLE articles_categories (
11
- `article_id` int(11),
12
- `category_id` int(11),
13
- `is_primary` int(11)
14
- ) ENGINE=InnoDB;
15
-
16
10
  CREATE TABLE articles_tags (
17
- `article_id` int(11),
18
- `tag_id` int(11)
11
+ `article_id` int(11) DEFAULT NULL,
12
+ `tag_id` int(11) DEFAULT NULL
19
13
  ) ENGINE=InnoDB;
20
14
 
21
15
  CREATE TABLE blacklist_patterns (
22
16
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
23
- `type` varchar(255),
24
- `pattern` varchar(255)
17
+ `type` varchar(255) DEFAULT NULL,
18
+ `pattern` varchar(255) DEFAULT NULL
25
19
  ) ENGINE=InnoDB;
26
20
 
27
21
  CREATE TABLE blogs (
28
22
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
29
- `settings` text
23
+ `settings` text DEFAULT NULL,
24
+ `base_url` varchar(255) DEFAULT NULL
30
25
  ) ENGINE=InnoDB;
31
26
 
32
27
  CREATE TABLE categories (
33
28
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
34
- `name` varchar(255),
35
- `position` int(11),
36
- `permalink` varchar(255)
29
+ `name` varchar(255) DEFAULT NULL,
30
+ `position` int(11) DEFAULT NULL,
31
+ `permalink` varchar(255) DEFAULT NULL
32
+ ) ENGINE=InnoDB;
33
+
34
+ CREATE TABLE categorizations (
35
+ `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
36
+ `article_id` int(11) DEFAULT NULL,
37
+ `category_id` int(11) DEFAULT NULL,
38
+ `is_primary` tinyint(1) DEFAULT NULL
37
39
  ) ENGINE=InnoDB;
38
40
 
39
41
  CREATE TABLE contents (
40
42
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
41
- `type` varchar(255),
42
- `title` varchar(255),
43
- `author` varchar(255),
44
- `body` text,
45
- `body_html` text,
46
- `extended` text,
47
- `excerpt` text,
48
- `keywords` varchar(255),
49
- `created_at` datetime,
50
- `updated_at` datetime,
51
- `extended_html` text,
52
- `user_id` int(11),
53
- `permalink` varchar(255),
54
- `guid` varchar(255),
55
- `text_filter_id` int(11),
56
- `whiteboard` text,
57
- `article_id` int(11),
58
- `email` varchar(255),
59
- `url` varchar(255),
60
- `ip` varchar(40),
61
- `blog_name` varchar(255),
62
- `name` varchar(255),
43
+ `type` varchar(255) DEFAULT NULL,
44
+ `title` varchar(255) DEFAULT NULL,
45
+ `author` varchar(255) DEFAULT NULL,
46
+ `body` text DEFAULT NULL,
47
+ `extended` text DEFAULT NULL,
48
+ `excerpt` text DEFAULT NULL,
49
+ `keywords` varchar(255) DEFAULT NULL,
50
+ `created_at` datetime DEFAULT NULL,
51
+ `updated_at` datetime DEFAULT NULL,
52
+ `user_id` int(11) DEFAULT NULL,
53
+ `permalink` varchar(255) DEFAULT NULL,
54
+ `guid` varchar(255) DEFAULT NULL,
55
+ `text_filter_id` int(11) DEFAULT NULL,
56
+ `whiteboard` text DEFAULT NULL,
57
+ `name` varchar(255) DEFAULT NULL,
58
+ `published` tinyint(1) DEFAULT 0,
59
+ `allow_pings` tinyint(1) DEFAULT NULL,
60
+ `allow_comments` tinyint(1) DEFAULT NULL,
61
+ `blog_id` int(11) NOT NULL,
62
+ `published_at` datetime DEFAULT NULL,
63
+ `state` text DEFAULT NULL
64
+ ) ENGINE=InnoDB;
65
+
66
+ CREATE TABLE feedback (
67
+ `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
68
+ `type` varchar(255) DEFAULT NULL,
69
+ `title` varchar(255) DEFAULT NULL,
70
+ `author` varchar(255) DEFAULT NULL,
71
+ `body` text DEFAULT NULL,
72
+ `extended` text DEFAULT NULL,
73
+ `excerpt` text DEFAULT NULL,
74
+ `keywords` varchar(255) DEFAULT NULL,
75
+ `created_at` datetime DEFAULT NULL,
76
+ `updated_at` datetime DEFAULT NULL,
77
+ `user_id` int(11) DEFAULT NULL,
78
+ `permalink` varchar(255) DEFAULT NULL,
79
+ `guid` varchar(255) DEFAULT NULL,
80
+ `text_filter_id` int(11) DEFAULT NULL,
81
+ `whiteboard` text DEFAULT NULL,
82
+ `article_id` int(11) DEFAULT NULL,
83
+ `email` varchar(255) DEFAULT NULL,
84
+ `url` varchar(255) DEFAULT NULL,
85
+ `ip` varchar(40) DEFAULT NULL,
86
+ `blog_name` varchar(255) DEFAULT NULL,
87
+ `name` varchar(255) DEFAULT NULL,
63
88
  `published` tinyint(1) DEFAULT 0,
64
- `allow_pings` tinyint(1),
65
- `allow_comments` tinyint(1),
89
+ `allow_pings` tinyint(1) DEFAULT NULL,
90
+ `allow_comments` tinyint(1) DEFAULT NULL,
66
91
  `blog_id` int(11) NOT NULL,
67
- `published_at` datetime,
68
- `state` text,
69
- `status_confirmed` tinyint(1)
92
+ `published_at` datetime DEFAULT NULL,
93
+ `state` text DEFAULT NULL,
94
+ `status_confirmed` tinyint(1) DEFAULT NULL
70
95
  ) ENGINE=InnoDB;
71
96
 
72
97
  CREATE TABLE notifications (
73
- `notify_user_id` int(11),
74
- `notify_content_id` int(11),
75
- `created_at` datetime,
76
- `updated_at` datetime
98
+ `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
99
+ `content_id` int(11) DEFAULT NULL,
100
+ `user_id` int(11) DEFAULT NULL,
101
+ `created_at` datetime DEFAULT NULL,
102
+ `updated_at` datetime DEFAULT NULL
77
103
  ) ENGINE=InnoDB;
78
104
 
79
105
  CREATE TABLE page_caches (
80
106
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
81
- `name` varchar(255)
107
+ `name` varchar(255) DEFAULT NULL
82
108
  ) ENGINE=InnoDB;
83
109
 
84
110
  CREATE TABLE pings (
85
111
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
86
- `article_id` int(11),
87
- `url` varchar(255),
88
- `created_at` datetime
112
+ `article_id` int(11) DEFAULT NULL,
113
+ `url` varchar(255) DEFAULT NULL,
114
+ `created_at` datetime DEFAULT NULL
89
115
  ) ENGINE=InnoDB;
90
116
 
91
117
  CREATE TABLE redirects (
92
118
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
93
- `from_path` varchar(255),
94
- `to_path` varchar(255)
119
+ `from_path` varchar(255) DEFAULT NULL,
120
+ `to_path` varchar(255) DEFAULT NULL
95
121
  ) ENGINE=InnoDB;
96
122
 
97
123
  CREATE TABLE resources (
98
124
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
99
- `size` int(11),
100
- `filename` varchar(255),
101
- `mime` varchar(255),
102
- `created_at` datetime,
103
- `updated_at` datetime,
104
- `article_id` int(11),
105
- `itunes_metadata` tinyint(1),
106
- `itunes_author` varchar(255),
107
- `itunes_subtitle` varchar(255),
108
- `itunes_duration` int(11),
109
- `itunes_summary` text,
110
- `itunes_keywords` varchar(255),
111
- `itunes_category` varchar(255),
112
- `itunes_explicit` tinyint(1)
125
+ `size` int(11) DEFAULT NULL,
126
+ `filename` varchar(255) DEFAULT NULL,
127
+ `mime` varchar(255) DEFAULT NULL,
128
+ `created_at` datetime DEFAULT NULL,
129
+ `updated_at` datetime DEFAULT NULL,
130
+ `article_id` int(11) DEFAULT NULL,
131
+ `itunes_metadata` tinyint(1) DEFAULT NULL,
132
+ `itunes_author` varchar(255) DEFAULT NULL,
133
+ `itunes_subtitle` varchar(255) DEFAULT NULL,
134
+ `itunes_duration` int(11) DEFAULT NULL,
135
+ `itunes_summary` text DEFAULT NULL,
136
+ `itunes_keywords` varchar(255) DEFAULT NULL,
137
+ `itunes_category` varchar(255) DEFAULT NULL,
138
+ `itunes_explicit` tinyint(1) DEFAULT NULL
113
139
  ) ENGINE=InnoDB;
114
140
 
115
141
  CREATE TABLE sessions (
116
142
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
117
- `sessid` varchar(255),
118
- `data` text,
119
- `created_at` datetime,
120
- `updated_at` datetime
143
+ `sessid` varchar(255) DEFAULT NULL,
144
+ `data` text DEFAULT NULL,
145
+ `created_at` datetime DEFAULT NULL,
146
+ `updated_at` datetime DEFAULT NULL
121
147
  ) ENGINE=InnoDB;
122
148
 
123
149
  CREATE TABLE sidebars (
124
150
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
125
- `controller` varchar(255),
126
- `active_position` int(11),
127
- `config` text,
128
- `staged_position` int(11)
151
+ `active_position` int(11) DEFAULT NULL,
152
+ `config` text DEFAULT NULL,
153
+ `staged_position` int(11) DEFAULT NULL,
154
+ `type` varchar(255) DEFAULT NULL,
155
+ `blog_id` int(11) DEFAULT NULL
129
156
  ) ENGINE=InnoDB;
130
157
 
131
158
  CREATE TABLE tags (
132
159
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
133
- `name` varchar(255),
134
- `created_at` datetime,
135
- `updated_at` datetime,
136
- `display_name` varchar(255)
160
+ `name` varchar(255) DEFAULT NULL,
161
+ `created_at` datetime DEFAULT NULL,
162
+ `updated_at` datetime DEFAULT NULL,
163
+ `display_name` varchar(255) DEFAULT NULL
137
164
  ) ENGINE=InnoDB;
138
165
 
139
166
  CREATE TABLE text_filters (
140
167
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
141
- `name` varchar(255),
142
- `description` varchar(255),
143
- `markup` varchar(255),
144
- `filters` text,
145
- `params` text
168
+ `name` varchar(255) DEFAULT NULL,
169
+ `description` varchar(255) DEFAULT NULL,
170
+ `markup` varchar(255) DEFAULT NULL,
171
+ `filters` text DEFAULT NULL,
172
+ `params` text DEFAULT NULL
146
173
  ) ENGINE=InnoDB;
147
174
 
148
175
  CREATE TABLE triggers (
149
176
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
150
- `pending_item_id` int(11),
151
- `pending_item_type` varchar(255),
152
- `due_at` datetime,
153
- `trigger_method` varchar(255)
177
+ `pending_item_id` int(11) DEFAULT NULL,
178
+ `pending_item_type` varchar(255) DEFAULT NULL,
179
+ `due_at` datetime DEFAULT NULL,
180
+ `trigger_method` varchar(255) DEFAULT NULL
154
181
  ) ENGINE=InnoDB;
155
182
 
156
183
  CREATE TABLE users (
157
184
  `id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
158
- `login` varchar(255),
159
- `password` varchar(255),
160
- `email` text,
161
- `name` text,
162
- `notify_via_email` tinyint(1),
163
- `notify_on_new_articles` tinyint(1),
164
- `notify_on_comments` tinyint(1),
165
- `notify_watch_my_articles` tinyint(1),
166
- `notify_via_jabber` tinyint(1),
167
- `jabber` varchar(255)
185
+ `login` varchar(255) DEFAULT NULL,
186
+ `password` varchar(255) DEFAULT NULL,
187
+ `email` text DEFAULT NULL,
188
+ `name` text DEFAULT NULL,
189
+ `notify_via_email` tinyint(1) DEFAULT NULL,
190
+ `notify_on_new_articles` tinyint(1) DEFAULT NULL,
191
+ `notify_on_comments` tinyint(1) DEFAULT NULL,
192
+ `notify_watch_my_articles` tinyint(1) DEFAULT NULL,
193
+ `notify_via_jabber` tinyint(1) DEFAULT NULL,
194
+ `jabber` varchar(255) DEFAULT NULL
168
195
  ) ENGINE=InnoDB;
169
196
 
170
197
 
171
198
  -- indexes
172
199
 
173
- CREATE INDEX `blacklist_patterns_pattern_index` ON blacklist_patterns (`pattern`);
174
- CREATE INDEX `categories_permalink_index` ON categories (`permalink`);
175
- CREATE INDEX `contents_blog_id_index` ON contents (`blog_id`);
176
- CREATE INDEX `contents_article_id_index` ON contents (`article_id`);
177
- CREATE INDEX `page_caches_name_index` ON page_caches (`name`);
178
- CREATE INDEX `pings_article_id_index` ON pings (`article_id`);
179
- CREATE INDEX `sessions_sessid_index` ON sessions (`sessid`);
200
+ CREATE INDEX `index_blacklist_patterns_on_pattern` ON blacklist_patterns (`pattern`);
201
+ CREATE INDEX `index_categories_on_permalink` ON categories (`permalink`);
202
+ CREATE INDEX `index_contents_on_blog_id` ON contents (`blog_id`);
203
+ CREATE INDEX `index_contents_on_text_filter_id` ON contents (`text_filter_id`);
204
+ CREATE INDEX `index_contents_on_published` ON contents (`published`);
205
+ CREATE INDEX `index_feedback_on_text_filter_id` ON feedback (`text_filter_id`);
206
+ CREATE INDEX `index_feedback_on_article_id` ON feedback (`article_id`);
207
+ CREATE INDEX `index_page_caches_on_name` ON page_caches (`name`);
208
+ CREATE INDEX `index_pings_on_article_id` ON pings (`article_id`);
209
+ CREATE INDEX `index_sessions_on_sessid` ON sessions (`sessid`);
180
210
 
181
211
  -- data
182
212
 
183
- INSERT INTO sidebars (`config`, `staged_position`, `active_position`, `controller`) VALUES(NULL, NULL, 0, 'category');
184
- INSERT INTO sidebars (`config`, `staged_position`, `active_position`, `controller`) VALUES(NULL, NULL, 1, 'static');
185
- INSERT INTO sidebars (`config`, `staged_position`, `active_position`, `controller`) VALUES(NULL, NULL, 2, 'xml');
186
213
  INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`) VALUES('none', '--- []
187
214
 
188
215
  ', 'None', '--- {}
@@ -209,10 +236,14 @@ INSERT INTO text_filters (`name`, `filters`, `description`, `params`, `markup`)
209
236
 
210
237
  ', 'textile');
211
238
 
239
+ INSERT INTO `sidebars` (`id`, `active_position`, `config`, `staged_position`, `type`, `blog_id`) VALUES (1, 0, '--- !map:HashWithIndifferentAccess \nempty: false\ncount: true\n', 0, 'CategorySidebar', 1);
240
+ INSERT INTO `sidebars` (`id`, `active_position`, `config`, `staged_position`, `type`, `blog_id`) VALUES (3, 2, '--- !map:HashWithIndifferentAccess \nformat: rss20\ntrackbacks: false\ncomments: true\narticles: true\n', 2, 'XmlSidebar', 1);
241
+ INSERT INTO `sidebars` (`id`, `active_position`, `config`, `staged_position`, `type`, `blog_id`) VALUES (4, 1, '--- !map:HashWithIndifferentAccess \nbody: "<ul>\\n <li><a href=\\"http://www.typosphere.org\\" title=\\"Typo\\">Typo</a></li>\\n <li><a href=\\"http://blog.leetsoft.com\\" title=\\"too-biased\\">too-biased</a></li>\\n <li><a href=\\"http://blog.remor.com/\\" title=\\"seth hall\\">Seth Hall</a></li>\\n <li><a href=\\"http://scottstuff.net\\" title=\\"Scottstuff\\">scottstuff.net</a></li>\\n <li><a href=\\"http://www.bofh.org.uk\\" title=\\"Just a Summary\\">Just A Summary</a></li>\\n <li><a href=\\"http://nubyonrails.com\\" title=\\"Topfunky\\">Topfunky</a></li>\\n <li><a href=\\"http://planettypo.com\\" title=\\"PlanetTypo\\">PlanetTypo</a></li>\\n <li><a href=\\"http://typoforums.org\\" title=\\"Typo Forums\\">Typo Forums</a></li>\\n <li><a href=\\"http://fredericdevillamil.com\\" title=\\"Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil\\">Fr\\xC3\\xA9d\\xC3\\xA9ric de Villamil</a></li>\\n\\\n </ul>\\n"\ntitle: Links\n', NULL, 'StaticSidebar', 1);
242
+
212
243
  -- schema version meta-info
213
244
 
214
245
  CREATE TABLE schema_info (
215
- `version` int(11)
246
+ `version` int(11) DEFAULT NULL
216
247
  ) ENGINE=InnoDB;
217
248
 
218
- insert into schema_info (version) values (50);
249
+ insert into schema_info (version) values (61);