radiant 0.9.1 → 1.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of radiant might be problematic. Click here for more details.

Files changed (1514) hide show
  1. data/.gitignore +19 -0
  2. data/CHANGELOG +26 -0
  3. data/CONTRIBUTORS +18 -0
  4. data/Gemfile +3 -0
  5. data/app/controllers/admin/configuration_controller.rb +50 -0
  6. data/app/controllers/admin/page_fields_controller.rb +9 -0
  7. data/app/controllers/admin/pages_controller.rb +39 -8
  8. data/app/controllers/admin/preferences_controller.rb +1 -1
  9. data/app/controllers/admin/resource_controller.rb +10 -2
  10. data/app/controllers/admin/welcome_controller.rb +6 -1
  11. data/app/controllers/application_controller.rb +0 -1
  12. data/app/controllers/site_controller.rb +1 -1
  13. data/app/helpers/admin/configuration_helper.rb +80 -0
  14. data/app/helpers/admin/node_helper.rb +47 -1
  15. data/app/helpers/admin/pages_helper.rb +5 -7
  16. data/app/helpers/admin/preferences_helper.rb +1 -0
  17. data/app/helpers/admin/references_helper.rb +2 -3
  18. data/app/helpers/application_helper.rb +4 -3
  19. data/app/models/deprecated_tags.rb +77 -0
  20. data/app/models/file_not_found_page.rb +4 -0
  21. data/app/models/page.rb +75 -24
  22. data/app/models/page_field.rb +3 -0
  23. data/app/models/page_part.rb +0 -1
  24. data/app/models/radiant/config.rb +239 -38
  25. data/app/models/snippet.rb +4 -0
  26. data/app/models/standard_tags.rb +202 -156
  27. data/app/models/status.rb +9 -1
  28. data/app/models/text_filter.rb +12 -1
  29. data/app/models/user.rb +1 -2
  30. data/app/models/user_action_observer.rb +9 -3
  31. data/app/views/admin/configuration/edit.html.haml +38 -0
  32. data/app/views/admin/configuration/show.html.haml +58 -0
  33. data/app/views/admin/extensions/index.html.haml +2 -2
  34. data/app/views/admin/layouts/_form.html.haml +2 -2
  35. data/app/views/admin/layouts/index.html.haml +10 -10
  36. data/app/views/admin/layouts/remove.html.haml +1 -1
  37. data/app/views/admin/page_fields/_page_field.html.haml +12 -0
  38. data/app/views/admin/pages/_fields.html.haml +22 -5
  39. data/app/views/admin/pages/_meta_row.html.haml +5 -1
  40. data/app/views/admin/pages/_node.html.haml +10 -9
  41. data/app/views/admin/pages/_popups.html.haml +17 -4
  42. data/app/views/admin/pages/edit.html.haml +1 -1
  43. data/app/views/admin/pages/index.html.haml +5 -5
  44. data/app/views/admin/pages/remove.html.haml +1 -1
  45. data/app/views/admin/preferences/edit.html.haml +1 -1
  46. data/app/views/admin/references/filters.haml +1 -1
  47. data/app/views/admin/references/tags.haml +1 -1
  48. data/app/views/admin/snippets/_form.html.haml +2 -2
  49. data/app/views/admin/snippets/index.html.haml +11 -11
  50. data/app/views/admin/snippets/remove.html.haml +1 -1
  51. data/app/views/admin/users/_avatar.html.haml +3 -1
  52. data/app/views/admin/users/_form.html.haml +3 -3
  53. data/app/views/admin/users/_password_fields.html.haml +2 -2
  54. data/app/views/admin/users/index.html.haml +11 -11
  55. data/app/views/admin/users/remove.html.haml +1 -1
  56. data/app/views/admin/welcome/login.html.haml +1 -1
  57. data/app/views/layouts/application.html.haml +9 -14
  58. data/config/boot.rb +28 -11
  59. data/config/compass.config +18 -0
  60. data/config/environment.rb +10 -5
  61. data/config/environments/cucumber.rb +5 -5
  62. data/config/environments/test.rb +5 -5
  63. data/config/initializers/compass.rb +3 -0
  64. data/config/initializers/radiant_config.rb +17 -0
  65. data/config/locales/en.yml +61 -13
  66. data/config/locales/en_available_tags.yml +131 -39
  67. data/config/routes.rb +4 -6
  68. data/db/migrate/20100805154952_add_page_fields.rb +15 -0
  69. data/db/migrate/20100805155020_convert_page_metas.rb +15 -0
  70. data/db/migrate/20100810151922_add_field_name_index.rb +11 -0
  71. data/db/schema.rb +32 -7
  72. data/features/admin/configuration.feature +38 -0
  73. data/features/admin/pages_management.feature +2 -9
  74. data/features/admin/resource_pagination.feature +1 -1
  75. data/features/admin/snippets_management.feature +2 -1
  76. data/features/admin/user_permissions.feature +3 -4
  77. data/features/admin/user_preferences.feature +1 -1
  78. data/features/step_definitions/admin/admin_steps.rb +1 -1
  79. data/features/step_definitions/admin/content_negotiation_steps.rb +4 -0
  80. data/features/step_definitions/admin/pages_management_steps.rb +5 -1
  81. data/features/step_definitions/admin/pagination_steps.rb +2 -4
  82. data/features/step_definitions/page_serving_steps.rb +16 -0
  83. data/features/support/dataset.rb +7 -3
  84. data/features/support/datasets_loader.rb +3 -0
  85. data/features/support/env.rb +2 -0
  86. data/features/support/matchers.rb +3 -0
  87. data/features/support/paths.rb +2 -0
  88. data/lib/generators/extension/extension_generator.rb +6 -0
  89. data/lib/generators/extension/templates/README +4 -1
  90. data/lib/generators/extension/templates/RSpecRakefile +1 -28
  91. data/lib/generators/extension/templates/Rakefile +0 -17
  92. data/lib/generators/extension/templates/cucumber_datasets_loader.rb +3 -0
  93. data/lib/generators/extension/templates/cucumber_env.rb +1 -10
  94. data/lib/generators/extension/templates/extension.rb +3 -3
  95. data/lib/generators/extension/templates/gemspec.rb +24 -0
  96. data/lib/generators/extension/templates/lib.rb +2 -0
  97. data/lib/generators/extension/templates/radiant_config.rb +3 -0
  98. data/lib/generators/extension/templates/version.rb +3 -0
  99. data/lib/generators/instance/instance_generator.rb +3 -2
  100. data/lib/generators/instance/templates/instance_boot.rb +28 -10
  101. data/lib/generators/instance/templates/instance_environment.rb +10 -5
  102. data/lib/generators/instance/templates/instance_radiant_config.rb +16 -0
  103. data/lib/generators/language_extension/templates/lang.yml +11 -11
  104. data/lib/plugins/active_record_extensions/lib/active_record_extensions.rb +10 -0
  105. data/lib/plugins/object_extensions/lib/object_extensions.rb +3 -0
  106. data/lib/radiant.rb +4 -4
  107. data/lib/radiant/admin_ui.rb +58 -41
  108. data/lib/radiant/available_locales.rb +8 -8
  109. data/lib/radiant/cache.rb +1 -0
  110. data/lib/radiant/config/definition.rb +142 -0
  111. data/lib/radiant/extension.rb +20 -4
  112. data/lib/radiant/extension/script.rb +15 -15
  113. data/lib/radiant/extension_gem.rb +12 -0
  114. data/lib/radiant/extension_loader.rb +12 -5
  115. data/lib/radiant/extension_locator.rb +25 -0
  116. data/lib/radiant/extension_migrator.rb +3 -2
  117. data/lib/radiant/gem_dependency_fix.rb +21 -0
  118. data/lib/radiant/gem_locator.rb +28 -0
  119. data/lib/radiant/initializer.rb +74 -7
  120. data/lib/radiant/pagination/controller.rb +1 -0
  121. data/lib/radiant/setup.rb +19 -11
  122. data/lib/task_support.rb +14 -8
  123. data/lib/tasks/database.rake +2 -0
  124. data/lib/tasks/framework.rake +32 -15
  125. data/lib/tasks/prototype.rake +8 -11
  126. data/lib/tasks/release.rake +1 -0
  127. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n.jpg +0 -0
  128. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_icon.png +0 -0
  129. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_normal.jpg +0 -0
  130. data/public/assets/1/2375_1115822414591_1197894784_30347214_1109_n_thumbnail.png +0 -0
  131. data/public/flash/ZeroClipboard.swf +0 -0
  132. data/public/images/admin/assets/add.png +0 -0
  133. data/public/images/admin/assets/archive_icon.png +0 -0
  134. data/public/images/admin/assets/audio_icon.png +0 -0
  135. data/public/images/admin/assets/audio_thumbnail.png +0 -0
  136. data/public/images/admin/assets/c_icon.png +0 -0
  137. data/public/images/admin/assets/copy.png +0 -0
  138. data/public/images/admin/assets/css_icon.png +0 -0
  139. data/public/images/admin/assets/database_icon.png +0 -0
  140. data/public/images/admin/assets/delete.png +0 -0
  141. data/public/images/admin/assets/document_icon.png +0 -0
  142. data/public/images/admin/assets/document_thumbnail.png +0 -0
  143. data/public/images/admin/assets/flash_icon.png +0 -0
  144. data/public/images/admin/assets/flash_thumbnail.png +0 -0
  145. data/public/images/admin/assets/font_icon.png +0 -0
  146. data/public/images/admin/assets/gzip_icon.png +0 -0
  147. data/public/images/admin/assets/html_icon.png +0 -0
  148. data/public/images/admin/assets/image_icon.png +0 -0
  149. data/public/images/admin/assets/image_thumbnail.png +0 -0
  150. data/public/images/admin/assets/java_icon.png +0 -0
  151. data/public/images/admin/assets/page_edit.png +0 -0
  152. data/public/images/admin/assets/perl_icon.png +0 -0
  153. data/public/images/admin/assets/php_icon.png +0 -0
  154. data/public/images/admin/assets/presentation_icon.png +0 -0
  155. data/public/images/admin/assets/python_icon.png +0 -0
  156. data/public/images/admin/assets/reorder_assets.png +0 -0
  157. data/public/images/admin/assets/ruby_icon.png +0 -0
  158. data/public/images/admin/assets/script_icon.png +0 -0
  159. data/public/images/admin/assets/spreadsheet_icon.png +0 -0
  160. data/public/images/admin/assets/tar_icon.png +0 -0
  161. data/public/images/admin/assets/unknown_icon.png +0 -0
  162. data/public/images/admin/assets/unknown_thumbnail.png +0 -0
  163. data/public/images/admin/assets/video_icon.png +0 -0
  164. data/public/images/admin/assets/video_thumbnail.png +0 -0
  165. data/public/images/admin/assets/xml_icon.png +0 -0
  166. data/public/images/admin/assets/zip_icon.png +0 -0
  167. data/public/images/admin/avatar_64x64.png +0 -0
  168. data/public/images/admin/image.png +0 -0
  169. data/public/images/admin/javascript.png +0 -0
  170. data/public/images/admin/navigation_secondary_separator.gif +0 -0
  171. data/public/images/admin/plus_disabled.png +0 -0
  172. data/public/images/admin/search.png +0 -0
  173. data/public/images/admin/status_spinner.gif +0 -0
  174. data/public/images/admin/stylesheet.png +0 -0
  175. data/public/images/admin/upload.png +0 -0
  176. data/public/images/{radiant-badge-color.png → radiant/radiant-badge-color.png} +0 -0
  177. data/public/images/roasters/banner.jpg +0 -0
  178. data/public/images/roasters/closelabel.gif +0 -0
  179. data/public/images/roasters/comment.png +0 -0
  180. data/public/images/roasters/gallery1.jpg +0 -0
  181. data/public/images/roasters/gallery2.jpg +0 -0
  182. data/public/images/roasters/gallery3.jpg +0 -0
  183. data/public/images/roasters/gallery4.jpg +0 -0
  184. data/public/images/roasters/gift.gif +0 -0
  185. data/public/images/roasters/green.gif +0 -0
  186. data/public/images/roasters/nav-background.gif +0 -0
  187. data/public/images/roasters/nav-divider.gif +0 -0
  188. data/public/images/roasters/nextlabel.gif +0 -0
  189. data/public/images/roasters/open.gif +0 -0
  190. data/public/images/roasters/preview-1.jpg +0 -0
  191. data/public/images/roasters/preview.jpg +0 -0
  192. data/public/images/roasters/prevlabel.gif +0 -0
  193. data/public/images/roasters/prize.gif +0 -0
  194. data/public/images/roasters/recycle.gif +0 -0
  195. data/public/images/roasters/rss.gif +0 -0
  196. data/public/images/roasters/thumb-grinder.jpg +0 -0
  197. data/public/images/roasters/thumb-grower.jpg +0 -0
  198. data/public/images/roasters/thumb-roaster.jpg +0 -0
  199. data/public/images/roasters/truck.gif +0 -0
  200. data/public/javascripts/admin/application.js +11 -2
  201. data/public/javascripts/admin/codearea.js +4 -4
  202. data/public/javascripts/admin/cookie.js +1 -1
  203. data/public/javascripts/admin/dateinput.js +5 -5
  204. data/public/javascripts/admin/dropdown.js +216 -0
  205. data/public/javascripts/admin/page_preview.js +41 -0
  206. data/public/javascripts/admin/pagefield.js +54 -0
  207. data/public/javascripts/admin/popup.js +187 -64
  208. data/public/javascripts/admin/sitemap.js +2 -2
  209. data/public/javascripts/admin/status.js +13 -13
  210. data/public/javascripts/admin/tabcontrol.js +9 -7
  211. data/public/javascripts/admin/toggle.js +18 -18
  212. data/public/javascripts/admin/utility.js +5 -4
  213. data/public/loading-iframe.html +11 -0
  214. data/public/stylesheets/admin/base.css +1 -0
  215. data/public/stylesheets/admin/main.css +1 -1213
  216. data/public/stylesheets/admin/overrides.css +0 -1
  217. data/public/stylesheets/sass/admin/_base.sass +17 -0
  218. data/public/stylesheets/sass/admin/main.sass +21 -21
  219. data/public/stylesheets/sass/admin/modules/_boxes.sass +6 -0
  220. data/public/stylesheets/sass/admin/modules/_links.sass +6 -3
  221. data/public/stylesheets/sass/admin/partials/_actions.sass +51 -38
  222. data/public/stylesheets/sass/admin/partials/_avatars.sass +4 -4
  223. data/public/stylesheets/sass/admin/partials/_content.sass +41 -182
  224. data/public/stylesheets/sass/admin/partials/_dateinput.sass +5 -5
  225. data/public/stylesheets/sass/admin/partials/_deprecated.sass +31 -2
  226. data/public/stylesheets/sass/admin/partials/_dropdown.sass +28 -0
  227. data/public/stylesheets/sass/admin/partials/_forms.sass +40 -27
  228. data/public/stylesheets/sass/admin/partials/_header.sass +78 -76
  229. data/public/stylesheets/sass/admin/partials/_index.sass +147 -0
  230. data/public/stylesheets/sass/admin/partials/_popup.sass +116 -20
  231. data/public/stylesheets/sass/admin/partials/_tabcontrol.sass +5 -3
  232. data/public/stylesheets/sass/admin/partials/{_base.sass → _typography.sass} +4 -3
  233. data/public/stylesheets/sass/admin/partials/_validations.sass +16 -18
  234. data/radiant.gemspec +42 -0
  235. data/spec/controllers/admin/page_fields_controller_spec.rb +17 -0
  236. data/spec/controllers/admin/pages_controller_spec.rb +87 -6
  237. data/spec/controllers/admin/preferences_controller_spec.rb +1 -1
  238. data/spec/controllers/site_controller_spec.rb +4 -4
  239. data/spec/datasets/config_dataset.rb +3 -1
  240. data/spec/datasets/home_page_dataset.rb +1 -3
  241. data/spec/datasets/pages_dataset.rb +1 -1
  242. data/spec/datasets/users_dataset.rb +1 -1
  243. data/spec/fixtures/bad_settings.rb +5 -0
  244. data/spec/fixtures/invalid_config.yml +11 -0
  245. data/spec/fixtures/more_settings.rb +8 -0
  246. data/spec/fixtures/radiant_config.yml +2 -2
  247. data/spec/fixtures/settings.rb +5 -0
  248. data/spec/generators/extension_controller_generator_spec.rb +20 -18
  249. data/spec/generators/extension_generator_spec.rb +39 -17
  250. data/spec/generators/extension_generators_spec_helper.rb +10 -12
  251. data/spec/generators/extension_mailer_generator_spec.rb +15 -13
  252. data/spec/generators/extension_migration_generator_spec.rb +6 -5
  253. data/spec/generators/extension_model_generator_spec.rb +16 -14
  254. data/spec/generators/instance_generator_spec.rb +27 -20
  255. data/spec/helpers/admin/node_helper_spec.rb +57 -2
  256. data/spec/helpers/admin/pages_helper_spec.rb +4 -1
  257. data/spec/helpers/admin/references_helper_spec.rb +10 -1
  258. data/spec/helpers/application_helper_spec.rb +7 -2
  259. data/spec/lib/locator_spec.rb +41 -0
  260. data/spec/lib/login_system_spec.rb +6 -0
  261. data/spec/lib/radiant/admin_ui_spec.rb +12 -11
  262. data/spec/lib/radiant/config/definition_spec.rb +160 -0
  263. data/spec/lib/radiant/extension_loader_spec.rb +29 -6
  264. data/spec/lib/radiant/extension_migrator_spec.rb +11 -0
  265. data/spec/lib/radiant/extension_spec.rb +24 -4
  266. data/spec/lib/radiant/initializer_spec.rb +10 -0
  267. data/spec/lib/task_support_spec.rb +6 -0
  268. data/spec/matchers/render_matcher.rb +4 -4
  269. data/spec/models/deprecated_tags_spec.rb +85 -0
  270. data/spec/models/file_not_found_page_spec.rb +15 -11
  271. data/spec/models/page_part_spec.rb +0 -7
  272. data/spec/models/page_spec.rb +230 -174
  273. data/spec/models/radiant/config_spec.rb +38 -3
  274. data/spec/models/snippet_spec.rb +18 -0
  275. data/spec/models/standard_tags_spec.rb +175 -154
  276. data/spec/models/status_spec.rb +11 -0
  277. data/spec/models/text_filter_spec.rb +6 -2
  278. data/spec/models/user_spec.rb +0 -7
  279. data/test/fixtures/extensions/basic/basic_extension.rb +1 -6
  280. data/test/fixtures/extensions/basic/config/routes.rb +3 -0
  281. data/test/fixtures/extensions/unrouted/unrouted_extension.rb +2 -0
  282. data/{log/.keep → test/fixtures/gems/radiant-gem_ext-extension-0.0.0/app/views/dummy.haml} +0 -0
  283. data/vendor/extensions/archive/Rakefile +13 -24
  284. data/vendor/extensions/archive/app/models/archive_day_index_page.rb +4 -0
  285. data/vendor/extensions/archive/app/models/archive_finder.rb +2 -2
  286. data/vendor/extensions/archive/app/models/archive_month_index_page.rb +4 -0
  287. data/vendor/extensions/archive/app/models/archive_page.rb +50 -9
  288. data/vendor/extensions/archive/app/models/archive_year_index_page.rb +4 -0
  289. data/vendor/extensions/archive/archive_extension.rb +13 -12
  290. data/vendor/extensions/archive/config/initializers/radiant_config.rb +3 -0
  291. data/vendor/extensions/archive/config/locales/en.yml +3 -0
  292. data/vendor/extensions/archive/config/routes.rb +5 -0
  293. data/vendor/extensions/archive/cucumber.yml +1 -0
  294. data/vendor/extensions/archive/features/archive_content.feature +51 -0
  295. data/vendor/extensions/archive/features/step_definitions/web_steps.rb +7 -0
  296. data/vendor/extensions/archive/features/support/datasets_loader.rb +3 -0
  297. data/vendor/extensions/archive/features/support/env.rb +7 -0
  298. data/vendor/extensions/archive/features/support/matchers.rb +3 -0
  299. data/vendor/extensions/archive/features/support/paths.rb +14 -0
  300. data/vendor/extensions/archive/lib/archive_index_tags_and_methods.rb +28 -8
  301. data/vendor/extensions/archive/lib/radiant-archive-extension.rb +2 -0
  302. data/vendor/extensions/archive/lib/radiant-archive-extension/version.rb +3 -0
  303. data/vendor/extensions/archive/lib/tasks/archive_extension_tasks.rake +30 -3
  304. data/vendor/extensions/archive/radiant-archive-extension.gemspec +24 -0
  305. data/vendor/extensions/archive/spec/datasets/archive_dataset.rb +10 -6
  306. data/vendor/extensions/archive/spec/models/archive_day_index_page_spec.rb +13 -3
  307. data/vendor/extensions/archive/spec/models/archive_month_index_page_spec.rb +17 -3
  308. data/vendor/extensions/archive/spec/models/archive_page_spec.rb +31 -8
  309. data/vendor/extensions/archive/spec/models/archive_year_index_page_spec.rb +14 -3
  310. data/vendor/extensions/archive/spec/models/page_spec.rb +6 -0
  311. data/vendor/extensions/archive/tmp/cache/entity/d0/580097d24f3e7cfc7bf9706a0a3a3729a9de3e +6 -0
  312. data/vendor/extensions/archive/tmp/cache/meta/0e/da69d02186242cdfda62e46044566f2bc50f3a +0 -0
  313. data/vendor/extensions/assets/HELP_admin.markdown +69 -0
  314. data/vendor/extensions/assets/LICENSE +22 -0
  315. data/vendor/extensions/assets/README.md +230 -0
  316. data/vendor/extensions/assets/Rakefile +111 -0
  317. data/vendor/extensions/assets/VERSION +1 -0
  318. data/vendor/extensions/assets/app/controllers/admin/assets_controller.rb +54 -0
  319. data/vendor/extensions/assets/app/controllers/admin/page_attachments_controller.rb +45 -0
  320. data/vendor/extensions/assets/app/helpers/admin/assets_helper.rb +11 -0
  321. data/vendor/extensions/assets/app/models/asset.rb +161 -0
  322. data/vendor/extensions/assets/app/models/asset_tags.rb +378 -0
  323. data/vendor/extensions/assets/app/models/asset_type.rb +160 -0
  324. data/vendor/extensions/assets/app/models/old_page_attachment.rb +26 -0
  325. data/vendor/extensions/assets/app/models/page_attachment.rb +14 -0
  326. data/vendor/extensions/assets/app/views/admin/assets/_asset.html.haml +12 -0
  327. data/vendor/extensions/assets/app/views/admin/assets/_asset_table.html.haml +30 -0
  328. data/vendor/extensions/assets/app/views/admin/assets/_errors.html.haml +3 -0
  329. data/vendor/extensions/assets/app/views/admin/assets/_form.html.haml +20 -0
  330. data/vendor/extensions/assets/app/views/admin/assets/_page_assets.html.haml +12 -0
  331. data/vendor/extensions/assets/app/views/admin/assets/_search.html.haml +17 -0
  332. data/vendor/extensions/assets/app/views/admin/assets/_search_results.html.haml +17 -0
  333. data/vendor/extensions/assets/app/views/admin/assets/edit.html.haml +41 -0
  334. data/vendor/extensions/assets/app/views/admin/assets/index.html.haml +18 -0
  335. data/vendor/extensions/assets/app/views/admin/assets/new.html.haml +24 -0
  336. data/vendor/extensions/assets/app/views/admin/assets/remove.html.haml +16 -0
  337. data/vendor/extensions/assets/app/views/admin/configuration/_edit.html.haml +8 -0
  338. data/vendor/extensions/assets/app/views/admin/configuration/_show.html.haml +12 -0
  339. data/vendor/extensions/assets/app/views/admin/page_attachments/_attachment.html.haml +22 -0
  340. data/vendor/extensions/assets/app/views/admin/page_attachments/_new_attachment.html.haml +18 -0
  341. data/vendor/extensions/assets/app/views/admin/page_parts/_page_part.html.haml +20 -0
  342. data/vendor/extensions/assets/app/views/admin/pages/_asset_popups.html.haml +42 -0
  343. data/vendor/extensions/assets/app/views/admin/pages/_assets.html.haml +13 -0
  344. data/vendor/extensions/assets/app/views/admin/removed/_assets_bucket.html.haml +8 -0
  345. data/vendor/extensions/assets/app/views/admin/removed/_assets_container.html.haml +58 -0
  346. data/vendor/extensions/assets/app/views/admin/removed/_bucket.html.haml +11 -0
  347. data/vendor/extensions/assets/app/views/admin/removed/_bucket_asset.html.haml +9 -0
  348. data/vendor/extensions/assets/app/views/admin/removed/_show_bucket_link.html.haml +4 -0
  349. data/vendor/extensions/assets/app/views/admin/removed/_upload_to_page.html.haml +12 -0
  350. data/vendor/extensions/assets/app/views/admin/removed/bucket/_iframe.html.haml +1 -0
  351. data/vendor/extensions/assets/artwork/icons.png +0 -0
  352. data/vendor/extensions/assets/assets_extension.rb +86 -0
  353. data/vendor/extensions/assets/config/initializers/interpolation.rb +6 -0
  354. data/vendor/extensions/assets/config/initializers/radiant_config.rb +37 -0
  355. data/vendor/extensions/assets/config/locales/en.yml +105 -0
  356. data/vendor/extensions/assets/config/locales/nl.yml +105 -0
  357. data/vendor/extensions/assets/config/routes.rb +8 -0
  358. data/vendor/extensions/assets/db/migrate/001_create_assets.rb +12 -0
  359. data/vendor/extensions/assets/db/migrate/002_create_paperclip_attributes.rb +13 -0
  360. data/vendor/extensions/assets/db/migrate/003_create_user_observer.rb +13 -0
  361. data/vendor/extensions/assets/db/migrate/004_create_page_attachments.rb +19 -0
  362. data/vendor/extensions/assets/db/migrate/005_rename_users.rb +13 -0
  363. data/vendor/extensions/assets/db/migrate/20090316132151_disable_file_types.rb +20 -0
  364. data/vendor/extensions/assets/db/migrate/20110513205050_asset_uuid.rb +11 -0
  365. data/vendor/extensions/assets/lib/assets_admin_ui.rb +32 -0
  366. data/vendor/extensions/assets/lib/page_asset_associations.rb +13 -0
  367. data/vendor/extensions/assets/lib/paperclip/frame_grab.rb +39 -0
  368. data/vendor/extensions/assets/lib/tag_deprecation.rb +73 -0
  369. data/vendor/extensions/assets/lib/tasks/assets_extension_tasks.rake +123 -0
  370. data/vendor/extensions/assets/lib/tasks/paperclip_tasks.rake +79 -0
  371. data/vendor/extensions/assets/public/flash/ZeroClipboard.swf +0 -0
  372. data/vendor/extensions/assets/public/images/admin/assets/add.png +0 -0
  373. data/vendor/extensions/assets/public/images/admin/assets/archive_icon.png +0 -0
  374. data/vendor/extensions/assets/public/images/admin/assets/audio_icon.png +0 -0
  375. data/vendor/extensions/assets/public/images/admin/assets/audio_thumbnail.png +0 -0
  376. data/vendor/extensions/assets/public/images/admin/assets/c_icon.png +0 -0
  377. data/vendor/extensions/assets/public/images/admin/assets/copy.png +0 -0
  378. data/vendor/extensions/assets/public/images/admin/assets/css_icon.png +0 -0
  379. data/vendor/extensions/assets/public/images/admin/assets/database_icon.png +0 -0
  380. data/vendor/extensions/assets/public/images/admin/assets/delete.png +0 -0
  381. data/vendor/extensions/assets/public/images/admin/assets/document_icon.png +0 -0
  382. data/vendor/extensions/assets/public/images/admin/assets/document_thumbnail.png +0 -0
  383. data/vendor/extensions/assets/public/images/admin/assets/flash_icon.png +0 -0
  384. data/vendor/extensions/assets/public/images/admin/assets/flash_thumbnail.png +0 -0
  385. data/vendor/extensions/assets/public/images/admin/assets/font_icon.png +0 -0
  386. data/vendor/extensions/assets/public/images/admin/assets/gzip_icon.png +0 -0
  387. data/vendor/extensions/assets/public/images/admin/assets/html_icon.png +0 -0
  388. data/vendor/extensions/assets/public/images/admin/assets/image_icon.png +0 -0
  389. data/vendor/extensions/assets/public/images/admin/assets/image_thumbnail.png +0 -0
  390. data/vendor/extensions/assets/public/images/admin/assets/java_icon.png +0 -0
  391. data/vendor/extensions/assets/public/images/admin/assets/page_edit.png +0 -0
  392. data/vendor/extensions/assets/public/images/admin/assets/perl_icon.png +0 -0
  393. data/vendor/extensions/assets/public/images/admin/assets/php_icon.png +0 -0
  394. data/vendor/extensions/assets/public/images/admin/assets/presentation_icon.png +0 -0
  395. data/vendor/extensions/assets/public/images/admin/assets/python_icon.png +0 -0
  396. data/vendor/extensions/assets/public/images/admin/assets/reorder_assets.png +0 -0
  397. data/vendor/extensions/assets/public/images/admin/assets/ruby_icon.png +0 -0
  398. data/vendor/extensions/assets/public/images/admin/assets/script_icon.png +0 -0
  399. data/vendor/extensions/assets/public/images/admin/assets/spreadsheet_icon.png +0 -0
  400. data/vendor/extensions/assets/public/images/admin/assets/tar_icon.png +0 -0
  401. data/vendor/extensions/assets/public/images/admin/assets/unknown_icon.png +0 -0
  402. data/vendor/extensions/assets/public/images/admin/assets/unknown_thumbnail.png +0 -0
  403. data/vendor/extensions/assets/public/images/admin/assets/video_icon.png +0 -0
  404. data/vendor/extensions/assets/public/images/admin/assets/video_thumbnail.png +0 -0
  405. data/vendor/extensions/assets/public/images/admin/assets/xml_icon.png +0 -0
  406. data/vendor/extensions/assets/public/images/admin/assets/zip_icon.png +0 -0
  407. data/vendor/extensions/assets/public/javascripts/admin/assets.js +238 -0
  408. data/vendor/extensions/assets/public/stylesheets/sass/admin/assets.sass +203 -0
  409. data/vendor/extensions/assets/spec/controllers/admin/assets_controller_spec.rb +50 -0
  410. data/vendor/extensions/assets/spec/controllers/admin/page_attachment_controller_spec.rb +51 -0
  411. data/vendor/extensions/assets/spec/datasets/assets_dataset.rb +31 -0
  412. data/vendor/extensions/assets/spec/lib/asset_tags_spec.rb +9 -0
  413. data/vendor/extensions/assets/spec/lib/tag_deprecation_spec.rb +49 -0
  414. data/vendor/extensions/assets/spec/models/asset_spec.rb +71 -0
  415. data/vendor/extensions/assets/spec/models/asset_type_spec.rb +49 -0
  416. data/vendor/extensions/assets/spec/spec.opts +6 -0
  417. data/vendor/extensions/assets/spec/spec_helper.rb +36 -0
  418. data/vendor/extensions/assets/wireframes/edit-page-assets-2.bmml +453 -0
  419. data/vendor/extensions/assets/wireframes/edit-page-assets-2.png +0 -0
  420. data/vendor/extensions/assets/wireframes/edit-page-assets-3.bmml +454 -0
  421. data/vendor/extensions/assets/wireframes/edit-page-assets-3.png +0 -0
  422. data/vendor/extensions/assets/wireframes/edit-page-assets.bmml +433 -0
  423. data/vendor/extensions/assets/wireframes/edit-page-assets.png +0 -0
  424. data/vendor/extensions/assets/wireframes/edit-page.bmml +174 -0
  425. data/vendor/extensions/assets/wireframes/edit-page.png +0 -0
  426. data/vendor/extensions/debug/README +3 -0
  427. data/vendor/extensions/debug/Rakefile +136 -0
  428. data/{app → vendor/extensions/debug/app}/models/env_dump_page.rb +0 -0
  429. data/vendor/extensions/debug/config/locales/en.yml +3 -0
  430. data/vendor/extensions/debug/config/routes.rb +5 -0
  431. data/vendor/extensions/debug/debug_extension.rb +11 -0
  432. data/vendor/extensions/debug/lib/tasks/debug_extension_tasks.rake +55 -0
  433. data/{spec → vendor/extensions/debug/spec}/models/env_dump_page_spec.rb +0 -0
  434. data/vendor/extensions/debug/spec/spec.opts +6 -0
  435. data/vendor/extensions/debug/spec/spec_helper.rb +36 -0
  436. data/vendor/extensions/dutch_language_pack/config/locales/nl.yml +80 -29
  437. data/vendor/extensions/exporter/README +5 -0
  438. data/vendor/extensions/exporter/Rakefile +116 -0
  439. data/vendor/extensions/exporter/app/controllers/admin/export_controller.rb +5 -0
  440. data/vendor/extensions/exporter/app/models/radiant/exporter.rb +41 -0
  441. data/vendor/extensions/exporter/config/locales/en.yml +3 -0
  442. data/vendor/extensions/exporter/config/routes.rb +6 -0
  443. data/vendor/extensions/exporter/cucumber.yml +1 -0
  444. data/vendor/extensions/exporter/exporter_extension.rb +8 -0
  445. data/vendor/extensions/exporter/features/support/env.rb +16 -0
  446. data/vendor/extensions/exporter/features/support/paths.rb +14 -0
  447. data/vendor/extensions/exporter/lib/tasks/exporter_extension_tasks.rake +55 -0
  448. data/{spec → vendor/extensions/exporter/spec}/controllers/admin/export_controller_spec.rb +1 -1
  449. data/vendor/extensions/exporter/spec/models/radiant/exporter_spec.rb +29 -0
  450. data/vendor/extensions/exporter/spec/spec.opts +6 -0
  451. data/vendor/extensions/exporter/spec/spec_helper.rb +36 -0
  452. data/vendor/extensions/german_language_pack/config/locales/de.yml +52 -0
  453. data/vendor/extensions/japanese_language_pack/README +40 -1
  454. data/vendor/extensions/japanese_language_pack/config/locales/ja.yml +107 -71
  455. data/vendor/extensions/japanese_language_pack/config/locales/ja_available_tags.yml +327 -347
  456. data/vendor/extensions/japanese_language_pack/japanese_language_pack_extension.rb +3 -3
  457. data/vendor/extensions/markdown_filter/vendor/kramdown/CONTRIBUTERS +2 -1
  458. data/vendor/extensions/markdown_filter/vendor/kramdown/ChangeLog +1250 -0
  459. data/vendor/extensions/markdown_filter/vendor/kramdown/README +1 -1
  460. data/vendor/extensions/markdown_filter/vendor/kramdown/Rakefile +2 -2
  461. data/vendor/extensions/markdown_filter/vendor/kramdown/VERSION +1 -1
  462. data/vendor/extensions/markdown_filter/vendor/kramdown/bin/kramdown +5 -4
  463. data/vendor/extensions/markdown_filter/vendor/kramdown/data/kramdown/document.html +11 -2
  464. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/{default.less.css → default.scss.css} +18 -9
  465. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/default.template +11 -2
  466. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/documentation.page +1 -1
  467. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/index.page +37 -4
  468. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/quickref.page +2 -2
  469. data/vendor/extensions/markdown_filter/vendor/kramdown/doc/syntax.page +281 -187
  470. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter.rb +1 -0
  471. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/html.rb +92 -90
  472. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/kramdown.rb +421 -0
  473. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/converter/latex.rb +311 -289
  474. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/document.rb +10 -6
  475. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/options.rb +29 -15
  476. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/base.rb +0 -1
  477. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/html.rb +153 -41
  478. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown.rb +21 -3
  479. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/abbreviation.rb +1 -0
  480. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/attribute_list.rb +20 -12
  481. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/autolink.rb +11 -4
  482. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/block_boundary.rb +46 -0
  483. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/blockquote.rb +7 -3
  484. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/codeblock.rb +5 -3
  485. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/escaped_chars.rb +1 -1
  486. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/extension.rb +23 -8
  487. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/footnote.rb +3 -2
  488. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/header.rb +11 -11
  489. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html.rb +18 -16
  490. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html_entity.rb +2 -1
  491. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/link.rb +13 -10
  492. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/list.rb +48 -37
  493. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/math.rb +15 -4
  494. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/paragraph.rb +14 -3
  495. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/table.rb +17 -9
  496. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/typographic_symbol.rb +4 -4
  497. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils.rb +37 -0
  498. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/entities.rb +335 -0
  499. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/html.rb +75 -0
  500. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils/ordered_hash.rb +79 -0
  501. data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/version.rb +1 -1
  502. data/vendor/extensions/markdown_filter/vendor/kramdown/man/man1/kramdown.1 +60 -36
  503. data/vendor/extensions/markdown_filter/vendor/kramdown/test/run_tests.rb +1 -1
  504. data/vendor/extensions/markdown_filter/vendor/kramdown/test/test_files.rb +66 -4
  505. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/02_eob/middle.html +0 -1
  506. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.html +5 -2
  507. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.text +3 -1
  508. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html +4 -5
  509. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html.19 +30 -0
  510. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.html +34 -0
  511. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.text +20 -0
  512. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/nested.html +1 -0
  513. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/nested.text +1 -0
  514. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/with_code_blocks.html +2 -2
  515. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/lazy.html +4 -0
  516. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/lazy.text +5 -0
  517. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/no_newline_at_end_1.html +2 -0
  518. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/no_newline_at_end_1.text +2 -0
  519. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/whitespace.html +2 -2
  520. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/with_ial.html +6 -0
  521. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/06_codeblock/with_ial.text +5 -0
  522. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/error.html.19 +7 -0
  523. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/normal.html +0 -2
  524. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/07_horizontal_rule/normal.text +0 -2
  525. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.html +1 -3
  526. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/lazy.html +39 -0
  527. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/lazy.text +29 -0
  528. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/list_and_others.html +5 -3
  529. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/list_and_others.text +1 -0
  530. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/other_first_element.html +2 -2
  531. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/other_first_element.text +1 -1
  532. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/simple_ul.html +0 -13
  533. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/simple_ul.text +0 -7
  534. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.html +8 -31
  535. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.text +2 -15
  536. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.html +2 -2
  537. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.html +1 -1
  538. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.text +1 -1
  539. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.html +2 -0
  540. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.text +2 -0
  541. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_normal.html +2 -1
  542. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.html +40 -2
  543. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/table_simple.text +42 -0
  544. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/typography.html.19 +1 -0
  545. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/invalid_html_1.html +2 -0
  546. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_raw.html +2 -2
  547. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/parse_as_span.html +1 -1
  548. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.html +2 -0
  549. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.html.19 +64 -0
  550. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/simple.text +2 -0
  551. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/auto_id_and_ial.html +1 -1
  552. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/11_ial/simple.html +4 -4
  553. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.html +6 -3
  554. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/comment.text +2 -1
  555. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.html +5 -1
  556. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/ignored.text +1 -1
  557. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.html +5 -1
  558. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.kramdown +20 -0
  559. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.latex +13 -0
  560. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/nomarkdown.text +11 -1
  561. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.html +0 -3
  562. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/12_extension/options.text +0 -6
  563. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/item_ial.html +12 -0
  564. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/item_ial.text +8 -0
  565. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/13_definition_list/simple.html +2 -2
  566. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/errors.html +5 -0
  567. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/errors.text +6 -0
  568. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/header.text +1 -1
  569. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/no_table.text +1 -1
  570. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/simple.html +78 -0
  571. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/14_table/simple.text +22 -0
  572. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.html +11 -4
  573. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/15_math/normal.text +10 -0
  574. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.html +33 -0
  575. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.options +1 -0
  576. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/no_toc_depth.text +16 -0
  577. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.html +24 -0
  578. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.options +1 -0
  579. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/16_toc/toc_depth_2.text +16 -0
  580. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/encoding.html +1 -1
  581. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/empty.html +2 -0
  582. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/empty.text +2 -0
  583. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/image_in_a.html +3 -3
  584. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/imagelinks.html +8 -6
  585. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/imagelinks.text +2 -0
  586. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.html +11 -5
  587. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.html.19 +46 -0
  588. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/inline.text +11 -5
  589. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/link_defs.html +2 -1
  590. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/link_defs.text +4 -0
  591. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.html +3 -0
  592. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.html.19 +35 -0
  593. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/01_link/reference.text +5 -0
  594. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/03_codespan/highlighting.html +1 -0
  595. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/03_codespan/highlighting.text +1 -0
  596. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.html +3 -0
  597. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.latex +3 -4
  598. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/definitions.text +6 -0
  599. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/footnote_nr.latex +1 -5
  600. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/04_footnote/markers.latex +5 -14
  601. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/markdown_attr.html +1 -1
  602. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/markdown_attr.text +1 -1
  603. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/normal.html +5 -3
  604. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/05_html/normal.text +2 -0
  605. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/escaped_chars/normal.html +2 -0
  606. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/escaped_chars/normal.text +2 -0
  607. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/comment.html +5 -5
  608. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/extension/ignored.html +1 -1
  609. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/line_breaks/normal.latex +12 -0
  610. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities.html +1 -1
  611. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities.options +1 -0
  612. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.html +1 -0
  613. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.html.19 +1 -0
  614. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.options +1 -0
  615. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_char.text +1 -0
  616. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.html +1 -0
  617. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.options +1 -0
  618. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_as_input.text +1 -0
  619. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.html +1 -0
  620. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.options +1 -0
  621. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_numeric.text +1 -0
  622. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.html +1 -0
  623. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.options +1 -0
  624. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/entities_symbolic.text +1 -0
  625. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html +1 -1
  626. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.html.19 +18 -0
  627. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/span/text_substitutions/typography.text +1 -1
  628. data/vendor/extensions/russian_language_pack/README +3 -1
  629. data/vendor/extensions/russian_language_pack/config/locales/ru.yml +28 -19
  630. data/vendor/extensions/russian_language_pack/config/locales/ru_available_tags.yml +6 -8
  631. data/vendor/extensions/russian_language_pack/lib/tasks/i18n_ru_extension_tasks.rake +4 -4
  632. data/vendor/extensions/russian_language_pack/russian_language_pack_extension.rb +4 -4
  633. data/vendor/extensions/sheets/LICENSE +21 -0
  634. data/vendor/extensions/sheets/README.md +33 -0
  635. data/vendor/extensions/sheets/Rakefile +117 -0
  636. data/vendor/extensions/sheets/app/controllers/admin/scripts_controller.rb +13 -0
  637. data/vendor/extensions/sheets/app/controllers/admin/sheet_resource_controller.rb +54 -0
  638. data/vendor/extensions/sheets/app/controllers/admin/styles_controller.rb +13 -0
  639. data/vendor/extensions/sheets/app/helpers/admin/scripts_helper.rb +5 -0
  640. data/vendor/extensions/sheets/app/helpers/admin/styles_helper.rb +5 -0
  641. data/vendor/extensions/sheets/app/models/javascript_page.rb +16 -0
  642. data/vendor/extensions/sheets/app/models/sheet.rb +89 -0
  643. data/vendor/extensions/sheets/app/models/stylesheet_page.rb +16 -0
  644. data/vendor/extensions/sheets/app/views/admin/scripts/edit.html.haml +30 -0
  645. data/vendor/extensions/sheets/app/views/admin/scripts/index.html.haml +27 -0
  646. data/vendor/extensions/sheets/app/views/admin/scripts/new.html.haml +30 -0
  647. data/vendor/extensions/sheets/app/views/admin/sheets/_edit_scripts.html.haml +40 -0
  648. data/vendor/extensions/sheets/app/views/admin/sheets/_upload_script.html.haml +16 -0
  649. data/vendor/extensions/sheets/app/views/admin/styles/edit.html.haml +30 -0
  650. data/vendor/extensions/sheets/app/views/admin/styles/index.html.haml +31 -0
  651. data/vendor/extensions/sheets/app/views/admin/styles/new.html.haml +30 -0
  652. data/vendor/extensions/sheets/config/locales/en.yml +15 -0
  653. data/vendor/extensions/sheets/config/routes.rb +6 -0
  654. data/vendor/extensions/sheets/cucumber.yml +1 -0
  655. data/vendor/extensions/sheets/features/support/env.rb +16 -0
  656. data/vendor/extensions/sheets/features/support/paths.rb +14 -0
  657. data/vendor/extensions/sheets/lib/javascript_tags.rb +58 -0
  658. data/vendor/extensions/sheets/lib/radiant-sheets-extension.rb +2 -0
  659. data/vendor/extensions/sheets/lib/radiant-sheets-extension/version.rb +3 -0
  660. data/vendor/extensions/sheets/lib/sass_filter.rb +16 -0
  661. data/vendor/extensions/sheets/lib/stylesheet_tags.rb +61 -0
  662. data/vendor/extensions/sheets/lib/tasks/sheets_extension_tasks.rake +79 -0
  663. data/vendor/extensions/sheets/public/images/admin/javascript.png +0 -0
  664. data/vendor/extensions/sheets/public/images/admin/stylesheet.png +0 -0
  665. data/vendor/extensions/sheets/radiant-sheets-extension.gemspec +24 -0
  666. data/vendor/extensions/sheets/sass.html +82 -0
  667. data/vendor/extensions/sheets/sheets_extension.rb +88 -0
  668. data/vendor/extensions/sheets/spec/controllers/admin/scripts_controller_spec.rb +123 -0
  669. data/vendor/extensions/sheets/spec/controllers/admin/styles_controller_spec.rb +124 -0
  670. data/vendor/extensions/sheets/spec/datasets/javascripts_dataset.rb +10 -0
  671. data/vendor/extensions/sheets/spec/datasets/stylesheets_dataset.rb +15 -0
  672. data/vendor/extensions/sheets/spec/helpers/admin/scripts_helper_spec.rb +5 -0
  673. data/vendor/extensions/sheets/spec/helpers/admin/styles_helper_spec.rb +5 -0
  674. data/vendor/extensions/sheets/spec/lib/javascript_tags_spec.rb +36 -0
  675. data/vendor/extensions/sheets/spec/lib/stylesheet_tags_spec.rb +41 -0
  676. data/vendor/extensions/sheets/spec/models/javascript_page_spec.rb +80 -0
  677. data/vendor/extensions/sheets/spec/models/page_spec.rb +5 -0
  678. data/vendor/extensions/sheets/spec/models/stylesheet_page_spec.rb +80 -0
  679. data/vendor/extensions/sheets/spec/spec.opts +6 -0
  680. data/vendor/extensions/sheets/spec/spec_helper.rb +36 -0
  681. data/vendor/extensions/site_templates/README +3 -0
  682. data/vendor/extensions/site_templates/Rakefile +136 -0
  683. data/{db → vendor/extensions/site_templates/db}/templates/empty.yml +0 -0
  684. data/vendor/extensions/site_templates/db/templates/roasters.yml +7826 -0
  685. data/vendor/extensions/site_templates/db/templates/simple-blog.yml +251 -0
  686. data/vendor/extensions/site_templates/db/templates/styled-blog.yml +535 -0
  687. data/vendor/extensions/site_templates/lib/tasks/site_templates_extension_tasks.rake +55 -0
  688. data/vendor/extensions/site_templates/public/images/roasters/banner.jpg +0 -0
  689. data/vendor/extensions/site_templates/public/images/roasters/closelabel.gif +0 -0
  690. data/vendor/extensions/site_templates/public/images/roasters/comment.png +0 -0
  691. data/vendor/extensions/site_templates/public/images/roasters/gallery1.jpg +0 -0
  692. data/vendor/extensions/site_templates/public/images/roasters/gallery2.jpg +0 -0
  693. data/vendor/extensions/site_templates/public/images/roasters/gallery3.jpg +0 -0
  694. data/vendor/extensions/site_templates/public/images/roasters/gallery4.jpg +0 -0
  695. data/vendor/extensions/site_templates/public/images/roasters/gift.gif +0 -0
  696. data/vendor/extensions/site_templates/public/images/roasters/green.gif +0 -0
  697. data/vendor/extensions/site_templates/public/images/roasters/nav-background.gif +0 -0
  698. data/vendor/extensions/site_templates/public/images/roasters/nav-divider.gif +0 -0
  699. data/vendor/extensions/site_templates/public/images/roasters/nextlabel.gif +0 -0
  700. data/vendor/extensions/site_templates/public/images/roasters/open.gif +0 -0
  701. data/vendor/extensions/site_templates/public/images/roasters/preview-1.jpg +0 -0
  702. data/vendor/extensions/site_templates/public/images/roasters/preview.jpg +0 -0
  703. data/vendor/extensions/site_templates/public/images/roasters/prevlabel.gif +0 -0
  704. data/vendor/extensions/site_templates/public/images/roasters/prize.gif +0 -0
  705. data/vendor/extensions/site_templates/public/images/roasters/recycle.gif +0 -0
  706. data/vendor/extensions/site_templates/public/images/roasters/rss.gif +0 -0
  707. data/vendor/extensions/site_templates/public/images/roasters/thumb-grinder.jpg +0 -0
  708. data/vendor/extensions/site_templates/public/images/roasters/thumb-grower.jpg +0 -0
  709. data/vendor/extensions/site_templates/public/images/roasters/thumb-roaster.jpg +0 -0
  710. data/vendor/extensions/site_templates/public/images/roasters/truck.gif +0 -0
  711. data/vendor/extensions/site_templates/site_templates_extension.rb +8 -0
  712. data/vendor/extensions/textile_filter/textile.html +2 -2
  713. data/vendor/plugins/dataset/lib/dataset.rb +2 -2
  714. data/vendor/plugins/dataset/plugit/descriptor.rb +25 -0
  715. data/vendor/plugins/haml/README.md +95 -154
  716. data/vendor/plugins/haml/Rakefile +104 -91
  717. data/vendor/plugins/haml/TODO +26 -20
  718. data/vendor/plugins/haml/VERSION +1 -1
  719. data/vendor/plugins/haml/VERSION_NAME +1 -1
  720. data/vendor/plugins/haml/bin/css2sass +7 -1
  721. data/vendor/plugins/haml/bin/sass-convert +7 -0
  722. data/vendor/plugins/haml/doc-src/FAQ.md +16 -4
  723. data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md +536 -1
  724. data/vendor/plugins/haml/doc-src/HAML_REFERENCE.md +176 -16
  725. data/vendor/plugins/haml/doc-src/INDENTED_SYNTAX.md +210 -0
  726. data/vendor/plugins/haml/doc-src/SASS_CHANGELOG.md +1159 -0
  727. data/vendor/plugins/haml/doc-src/SASS_REFERENCE.md +1163 -633
  728. data/vendor/plugins/haml/doc-src/SCSS_FOR_SASS_USERS.md +155 -0
  729. data/vendor/plugins/haml/ext/extconf.rb +10 -0
  730. data/vendor/plugins/haml/extra/haml-mode.el +36 -34
  731. data/vendor/plugins/haml/extra/sass-mode.el +10 -9
  732. data/vendor/plugins/haml/haml.gemspec +8 -33
  733. data/vendor/plugins/haml/init.rbc +404 -0
  734. data/vendor/plugins/haml/lib/haml.rb +5 -2
  735. data/vendor/plugins/haml/lib/haml.rbc +569 -0
  736. data/vendor/plugins/haml/lib/haml/buffer.rb +22 -4
  737. data/vendor/plugins/haml/lib/haml/buffer.rbc +4048 -0
  738. data/vendor/plugins/haml/lib/haml/engine.rb +13 -4
  739. data/vendor/plugins/haml/lib/haml/engine.rbc +3852 -0
  740. data/vendor/plugins/haml/lib/haml/error.rbc +339 -0
  741. data/vendor/plugins/haml/lib/haml/exec.rb +456 -64
  742. data/vendor/plugins/haml/lib/haml/filters.rb +19 -1
  743. data/vendor/plugins/haml/lib/haml/filters.rbc +5617 -0
  744. data/vendor/plugins/haml/lib/haml/helpers.rb +40 -19
  745. data/vendor/plugins/haml/lib/haml/helpers.rbc +7086 -0
  746. data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rbc +522 -0
  747. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +38 -12
  748. data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rbc +5515 -0
  749. data/vendor/plugins/haml/lib/haml/helpers/xss_mods.rb +13 -2
  750. data/vendor/plugins/haml/lib/haml/html.rb +209 -49
  751. data/vendor/plugins/haml/lib/haml/html/erb.rb +141 -0
  752. data/vendor/plugins/haml/lib/haml/precompiler.rb +130 -89
  753. data/vendor/plugins/haml/lib/haml/precompiler.rbc +22247 -0
  754. data/vendor/plugins/haml/lib/haml/railtie.rb +16 -13
  755. data/vendor/plugins/haml/lib/haml/railtie.rbc +409 -0
  756. data/vendor/plugins/haml/lib/haml/root.rb +7 -0
  757. data/vendor/plugins/haml/lib/haml/root.rbc +160 -0
  758. data/vendor/plugins/haml/lib/haml/shared.rbc +1137 -0
  759. data/vendor/plugins/haml/lib/haml/template.rb +13 -12
  760. data/vendor/plugins/haml/lib/haml/template.rbc +1838 -0
  761. data/vendor/plugins/haml/lib/haml/template/options.rb +16 -0
  762. data/vendor/plugins/haml/lib/haml/template/options.rbc +235 -0
  763. data/vendor/plugins/haml/lib/haml/template/plugin.rb +18 -6
  764. data/vendor/plugins/haml/lib/haml/template/plugin.rbc +2720 -0
  765. data/vendor/plugins/haml/lib/haml/util.rb +483 -44
  766. data/vendor/plugins/haml/lib/haml/util.rbc +12059 -0
  767. data/vendor/plugins/haml/lib/haml/util/subset_map.rb +101 -0
  768. data/vendor/plugins/haml/lib/haml/util/subset_map.rbc +1316 -0
  769. data/vendor/plugins/haml/lib/haml/version.rb +25 -2
  770. data/vendor/plugins/haml/lib/haml/version.rbc +1671 -0
  771. data/vendor/plugins/haml/lib/sass.rb +7 -2
  772. data/vendor/plugins/haml/lib/sass.rbc +492 -0
  773. data/vendor/plugins/haml/lib/sass/callbacks.rb +52 -0
  774. data/vendor/plugins/haml/lib/sass/callbacks.rbc +388 -0
  775. data/vendor/plugins/haml/lib/sass/css.rb +86 -196
  776. data/vendor/plugins/haml/lib/sass/engine.rb +304 -99
  777. data/vendor/plugins/haml/lib/sass/engine.rbc +17020 -0
  778. data/vendor/plugins/haml/lib/sass/environment.rb +67 -3
  779. data/vendor/plugins/haml/lib/sass/environment.rbc +1751 -0
  780. data/vendor/plugins/haml/lib/sass/error.rb +166 -25
  781. data/vendor/plugins/haml/lib/sass/error.rbc +2801 -0
  782. data/vendor/plugins/haml/lib/sass/files.rb +43 -38
  783. data/vendor/plugins/haml/lib/sass/files.rbc +3118 -0
  784. data/vendor/plugins/haml/lib/sass/less.rb +382 -0
  785. data/vendor/plugins/haml/lib/sass/plugin.rb +198 -150
  786. data/vendor/plugins/haml/lib/sass/plugin.rbc +4356 -0
  787. data/vendor/plugins/haml/lib/sass/plugin/configuration.rb +221 -0
  788. data/vendor/plugins/haml/lib/sass/plugin/configuration.rbc +1343 -0
  789. data/vendor/plugins/haml/lib/sass/plugin/generic.rb +15 -0
  790. data/vendor/plugins/haml/lib/sass/plugin/merb.rb +8 -20
  791. data/vendor/plugins/haml/lib/sass/plugin/rack.rb +2 -20
  792. data/vendor/plugins/haml/lib/sass/plugin/rack.rbc +446 -0
  793. data/vendor/plugins/haml/lib/sass/plugin/rails.rb +16 -9
  794. data/vendor/plugins/haml/lib/sass/plugin/rails.rbc +879 -0
  795. data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rb +123 -0
  796. data/vendor/plugins/haml/lib/sass/plugin/staleness_checker.rbc +2019 -0
  797. data/vendor/plugins/haml/lib/sass/repl.rb +1 -1
  798. data/vendor/plugins/haml/lib/sass/script.rb +32 -31
  799. data/vendor/plugins/haml/lib/sass/script.rbc +1188 -0
  800. data/vendor/plugins/haml/lib/sass/script/bool.rb +2 -1
  801. data/vendor/plugins/haml/lib/sass/script/bool.rbc +366 -0
  802. data/vendor/plugins/haml/lib/sass/script/color.rb +295 -26
  803. data/vendor/plugins/haml/lib/sass/script/color.rbc +8148 -0
  804. data/vendor/plugins/haml/lib/sass/script/css_lexer.rb +29 -0
  805. data/vendor/plugins/haml/lib/sass/script/css_lexer.rbc +809 -0
  806. data/vendor/plugins/haml/lib/sass/script/css_parser.rb +31 -0
  807. data/vendor/plugins/haml/lib/sass/script/css_parser.rbc +628 -0
  808. data/vendor/plugins/haml/lib/sass/script/funcall.rb +33 -6
  809. data/vendor/plugins/haml/lib/sass/script/funcall.rbc +1805 -0
  810. data/vendor/plugins/haml/lib/sass/script/functions.rb +637 -33
  811. data/vendor/plugins/haml/lib/sass/script/functions.rbc +8418 -0
  812. data/vendor/plugins/haml/lib/sass/script/interpolation.rb +70 -0
  813. data/vendor/plugins/haml/lib/sass/script/interpolation.rbc +1225 -0
  814. data/vendor/plugins/haml/lib/sass/script/lexer.rb +200 -57
  815. data/vendor/plugins/haml/lib/sass/script/lexer.rbc +7231 -0
  816. data/vendor/plugins/haml/lib/sass/script/literal.rb +69 -10
  817. data/vendor/plugins/haml/lib/sass/script/literal.rbc +3365 -0
  818. data/vendor/plugins/haml/lib/sass/script/node.rb +99 -1
  819. data/vendor/plugins/haml/lib/sass/script/node.rbc +1418 -0
  820. data/vendor/plugins/haml/lib/sass/script/number.rb +64 -24
  821. data/vendor/plugins/haml/lib/sass/script/number.rbc +6024 -0
  822. data/vendor/plugins/haml/lib/sass/script/operation.rb +53 -3
  823. data/vendor/plugins/haml/lib/sass/script/operation.rbc +1856 -0
  824. data/vendor/plugins/haml/lib/sass/script/parser.rb +229 -50
  825. data/vendor/plugins/haml/lib/sass/script/parser.rbc +8418 -0
  826. data/vendor/plugins/haml/lib/sass/script/string.rb +57 -2
  827. data/vendor/plugins/haml/lib/sass/script/string.rbc +1357 -0
  828. data/vendor/plugins/haml/lib/sass/script/string_interpolation.rb +93 -0
  829. data/vendor/plugins/haml/lib/sass/script/string_interpolation.rbc +1643 -0
  830. data/vendor/plugins/haml/lib/sass/script/unary_operation.rb +25 -2
  831. data/vendor/plugins/haml/lib/sass/script/unary_operation.rbc +1144 -0
  832. data/vendor/plugins/haml/lib/sass/script/variable.rb +22 -5
  833. data/vendor/plugins/haml/lib/sass/script/variable.rbc +844 -0
  834. data/vendor/plugins/haml/lib/sass/scss.rb +17 -0
  835. data/vendor/plugins/haml/lib/sass/scss.rbc +242 -0
  836. data/vendor/plugins/haml/lib/sass/scss/css_parser.rb +46 -0
  837. data/vendor/plugins/haml/lib/sass/scss/css_parser.rbc +1106 -0
  838. data/vendor/plugins/haml/lib/sass/scss/parser.rb +846 -0
  839. data/vendor/plugins/haml/lib/sass/scss/parser.rbc +19348 -0
  840. data/vendor/plugins/haml/lib/sass/scss/rx.rb +126 -0
  841. data/vendor/plugins/haml/lib/sass/scss/rx.rbc +2849 -0
  842. data/vendor/plugins/haml/lib/sass/scss/sass_parser.rb +11 -0
  843. data/vendor/plugins/haml/lib/sass/scss/sass_parser.rbc +287 -0
  844. data/vendor/plugins/haml/lib/sass/scss/script_lexer.rb +15 -0
  845. data/vendor/plugins/haml/lib/sass/scss/script_lexer.rbc +439 -0
  846. data/vendor/plugins/haml/lib/sass/scss/script_parser.rb +25 -0
  847. data/vendor/plugins/haml/lib/sass/scss/script_parser.rbc +482 -0
  848. data/vendor/plugins/haml/lib/sass/scss/static_parser.rb +40 -0
  849. data/vendor/plugins/haml/lib/sass/scss/static_parser.rbc +971 -0
  850. data/vendor/plugins/haml/lib/sass/selector.rb +361 -0
  851. data/vendor/plugins/haml/lib/sass/selector.rbc +4193 -0
  852. data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rb +62 -0
  853. data/vendor/plugins/haml/lib/sass/selector/abstract_sequence.rbc +798 -0
  854. data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rb +82 -0
  855. data/vendor/plugins/haml/lib/sass/selector/comma_sequence.rbc +1814 -0
  856. data/vendor/plugins/haml/lib/sass/selector/sequence.rb +237 -0
  857. data/vendor/plugins/haml/lib/sass/selector/sequence.rbc +4928 -0
  858. data/vendor/plugins/haml/lib/sass/selector/simple.rb +113 -0
  859. data/vendor/plugins/haml/lib/sass/selector/simple.rbc +1553 -0
  860. data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rb +136 -0
  861. data/vendor/plugins/haml/lib/sass/selector/simple_sequence.rbc +2346 -0
  862. data/vendor/plugins/haml/lib/sass/tree/charset_node.rb +37 -0
  863. data/vendor/plugins/haml/lib/sass/tree/charset_node.rbc +606 -0
  864. data/vendor/plugins/haml/lib/sass/tree/comment_node.rb +71 -27
  865. data/vendor/plugins/haml/lib/sass/tree/comment_node.rbc +2397 -0
  866. data/vendor/plugins/haml/lib/sass/tree/debug_node.rb +8 -2
  867. data/vendor/plugins/haml/lib/sass/tree/debug_node.rbc +740 -0
  868. data/vendor/plugins/haml/lib/sass/tree/directive_node.rb +44 -37
  869. data/vendor/plugins/haml/lib/sass/tree/directive_node.rbc +1302 -0
  870. data/vendor/plugins/haml/lib/sass/tree/extend_node.rb +65 -0
  871. data/vendor/plugins/haml/lib/sass/tree/extend_node.rbc +1276 -0
  872. data/vendor/plugins/haml/lib/sass/tree/for_node.rb +19 -0
  873. data/vendor/plugins/haml/lib/sass/tree/for_node.rbc +1145 -0
  874. data/vendor/plugins/haml/lib/sass/tree/if_node.rb +26 -0
  875. data/vendor/plugins/haml/lib/sass/tree/if_node.rbc +1119 -0
  876. data/vendor/plugins/haml/lib/sass/tree/import_node.rb +64 -27
  877. data/vendor/plugins/haml/lib/sass/tree/import_node.rbc +2242 -0
  878. data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rb +31 -0
  879. data/vendor/plugins/haml/lib/sass/tree/mixin_def_node.rbc +1001 -0
  880. data/vendor/plugins/haml/lib/sass/tree/mixin_node.rb +82 -7
  881. data/vendor/plugins/haml/lib/sass/tree/mixin_node.rbc +3355 -0
  882. data/vendor/plugins/haml/lib/sass/tree/node.rb +291 -77
  883. data/vendor/plugins/haml/lib/sass/tree/node.rbc +5533 -0
  884. data/vendor/plugins/haml/lib/sass/tree/prop_node.rb +157 -58
  885. data/vendor/plugins/haml/lib/sass/tree/prop_node.rbc +3949 -0
  886. data/vendor/plugins/haml/lib/sass/tree/root_node.rb +157 -0
  887. data/vendor/plugins/haml/lib/sass/tree/root_node.rbc +3112 -0
  888. data/vendor/plugins/haml/lib/sass/tree/rule_node.rb +178 -137
  889. data/vendor/plugins/haml/lib/sass/tree/rule_node.rbc +5636 -0
  890. data/vendor/plugins/haml/lib/sass/tree/variable_node.rb +10 -5
  891. data/vendor/plugins/haml/lib/sass/tree/variable_node.rbc +845 -0
  892. data/vendor/plugins/haml/lib/sass/tree/warn_node.rb +42 -0
  893. data/vendor/plugins/haml/lib/sass/tree/warn_node.rbc +1043 -0
  894. data/vendor/plugins/haml/lib/sass/tree/while_node.rb +17 -0
  895. data/vendor/plugins/haml/lib/sass/tree/while_node.rbc +722 -0
  896. data/vendor/plugins/haml/test/benchmark.rb +5 -5
  897. data/vendor/plugins/haml/test/haml/engine_test.rb +530 -19
  898. data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_1.rhtml → erb/_av_partial_1.erb} +1 -1
  899. data/vendor/plugins/haml/test/haml/{rhtml/_av_partial_2.rhtml → erb/_av_partial_2.erb} +1 -1
  900. data/vendor/plugins/haml/test/haml/{rhtml/action_view.rhtml → erb/action_view.erb} +1 -1
  901. data/vendor/plugins/haml/test/haml/{rhtml/standard.rhtml → erb/standard.erb} +0 -0
  902. data/vendor/plugins/haml/test/haml/helper_test.rb +124 -7
  903. data/vendor/plugins/haml/test/haml/html2haml/erb_tests.rb +426 -0
  904. data/vendor/plugins/haml/test/haml/html2haml_test.rb +250 -66
  905. data/vendor/plugins/haml/test/haml/results/filters.xhtml +1 -1
  906. data/vendor/plugins/haml/test/haml/results/helpers.xhtml +0 -23
  907. data/vendor/plugins/haml/test/haml/results/just_stuff.xhtml +2 -0
  908. data/vendor/plugins/haml/test/haml/spec/LICENSE +14 -0
  909. data/vendor/plugins/haml/test/haml/spec/README.md +106 -0
  910. data/vendor/plugins/haml/test/haml/spec/lua_haml_spec.lua +38 -0
  911. data/vendor/plugins/haml/test/haml/spec/perl_haml_test.pl +81 -0
  912. data/vendor/plugins/haml/test/haml/spec/ruby_haml_test.rb +19 -0
  913. data/vendor/plugins/haml/test/haml/spec/tests.json +603 -0
  914. data/vendor/plugins/haml/test/haml/spec_test.rb +44 -0
  915. data/vendor/plugins/haml/test/haml/template_test.rb +33 -3
  916. data/vendor/plugins/haml/test/haml/templates/helpers.haml +0 -66
  917. data/vendor/plugins/haml/test/haml/templates/just_stuff.haml +2 -0
  918. data/vendor/plugins/haml/test/haml/util/subset_map_test.rb +91 -0
  919. data/vendor/plugins/haml/test/haml/util_test.rb +161 -0
  920. data/vendor/plugins/haml/test/linked_rails.rb +22 -1
  921. data/vendor/plugins/haml/test/sass/callbacks_test.rb +61 -0
  922. data/vendor/plugins/haml/test/sass/conversion_test.rb +1218 -0
  923. data/vendor/plugins/haml/test/sass/css2sass_test.rb +130 -18
  924. data/vendor/plugins/haml/test/sass/data/hsl-rgb.txt +319 -0
  925. data/vendor/plugins/haml/test/sass/engine_test.rb +1427 -139
  926. data/vendor/plugins/haml/test/sass/extend_test.rb +1348 -0
  927. data/vendor/plugins/haml/test/sass/functions_test.rb +429 -47
  928. data/vendor/plugins/haml/test/sass/less_conversion_test.rb +653 -0
  929. data/vendor/plugins/haml/test/sass/more_results/more_import.css +1 -1
  930. data/vendor/plugins/haml/test/sass/more_templates/more_import.sass +3 -3
  931. data/vendor/plugins/haml/test/sass/plugin_test.rb +246 -56
  932. data/vendor/plugins/haml/test/sass/results/compact.css +1 -1
  933. data/vendor/plugins/haml/test/sass/results/complex.css +5 -6
  934. data/vendor/plugins/haml/test/sass/results/compressed.css +1 -1
  935. data/vendor/plugins/haml/test/sass/results/expanded.css +1 -1
  936. data/vendor/plugins/haml/test/sass/results/import.css +3 -1
  937. data/vendor/plugins/haml/test/sass/results/import_charset.css +4 -0
  938. data/vendor/plugins/haml/test/sass/results/import_charset_1_8.css +4 -0
  939. data/vendor/plugins/haml/test/sass/results/import_charset_ibm866.css +4 -0
  940. data/vendor/plugins/haml/test/sass/results/mixins.css +12 -12
  941. data/vendor/plugins/haml/test/sass/results/nested.css +1 -1
  942. data/vendor/plugins/haml/test/sass/results/options.css +1 -0
  943. data/vendor/plugins/haml/test/sass/results/parent_ref.css +4 -4
  944. data/vendor/plugins/haml/test/sass/results/script.css +4 -4
  945. data/vendor/plugins/haml/test/sass/results/scss_import.css +31 -0
  946. data/vendor/plugins/haml/test/sass/results/scss_importee.css +2 -0
  947. data/vendor/plugins/haml/test/sass/results/warn.css +0 -0
  948. data/vendor/plugins/haml/test/sass/results/warn_imported.css +0 -0
  949. data/vendor/plugins/haml/test/sass/script_conversion_test.rb +314 -0
  950. data/vendor/plugins/haml/test/sass/script_test.rb +281 -78
  951. data/vendor/plugins/haml/test/sass/scss/css_test.rb +916 -0
  952. data/vendor/plugins/haml/test/sass/scss/rx_test.rb +156 -0
  953. data/vendor/plugins/haml/test/sass/scss/scss_test.rb +1088 -0
  954. data/vendor/plugins/haml/test/sass/scss/test_helper.rb +37 -0
  955. data/vendor/plugins/haml/test/sass/templates/_imported_charset_ibm866.sass +4 -0
  956. data/vendor/plugins/haml/test/sass/templates/_imported_charset_utf8.sass +4 -0
  957. data/vendor/plugins/haml/test/sass/templates/alt.sass +2 -2
  958. data/vendor/plugins/haml/test/sass/templates/basic.sass +1 -1
  959. data/vendor/plugins/haml/test/sass/templates/bork1.sass +2 -0
  960. data/vendor/plugins/haml/test/sass/templates/bork3.sass +2 -0
  961. data/vendor/plugins/haml/test/sass/templates/bork4.sass +2 -0
  962. data/vendor/plugins/haml/test/sass/templates/complex.sass +0 -2
  963. data/vendor/plugins/haml/test/sass/templates/import.sass +5 -4
  964. data/vendor/plugins/haml/test/sass/templates/import_charset.sass +7 -0
  965. data/vendor/plugins/haml/test/sass/templates/import_charset_1_8.sass +4 -0
  966. data/vendor/plugins/haml/test/sass/templates/import_charset_ibm866.sass +9 -0
  967. data/vendor/plugins/haml/test/sass/templates/importee.less +2 -0
  968. data/vendor/plugins/haml/test/sass/templates/importee.sass +3 -3
  969. data/vendor/plugins/haml/test/sass/templates/line_numbers.sass +1 -1
  970. data/vendor/plugins/haml/test/sass/templates/mixin_bork.sass +5 -0
  971. data/vendor/plugins/haml/test/sass/templates/mixins.sass +2 -2
  972. data/vendor/plugins/haml/test/sass/templates/nested_bork1.sass +2 -0
  973. data/vendor/plugins/haml/test/sass/templates/nested_bork2.sass +2 -0
  974. data/vendor/plugins/haml/test/sass/templates/nested_bork3.sass +2 -0
  975. data/vendor/plugins/haml/test/sass/templates/nested_bork4.sass +2 -0
  976. data/vendor/plugins/haml/test/sass/templates/nested_mixin_bork.sass +6 -0
  977. data/vendor/plugins/haml/test/sass/templates/options.sass +2 -0
  978. data/vendor/plugins/haml/test/sass/templates/parent_ref.sass +2 -2
  979. data/vendor/plugins/haml/test/sass/templates/script.sass +69 -69
  980. data/vendor/plugins/haml/test/sass/templates/scss_import.scss +11 -0
  981. data/vendor/plugins/haml/test/sass/templates/scss_importee.scss +1 -0
  982. data/vendor/plugins/haml/test/sass/templates/units.sass +10 -10
  983. data/vendor/plugins/haml/test/sass/templates/warn.sass +3 -0
  984. data/vendor/plugins/haml/test/sass/templates/warn_imported.sass +4 -0
  985. data/vendor/plugins/haml/test/test_helper.rb +52 -4
  986. data/vendor/plugins/haml/vendor/fssm/LICENSE +20 -0
  987. data/vendor/plugins/haml/vendor/fssm/README.markdown +55 -0
  988. data/vendor/plugins/haml/vendor/fssm/Rakefile +59 -0
  989. data/vendor/plugins/haml/vendor/fssm/VERSION.yml +5 -0
  990. data/vendor/plugins/haml/vendor/fssm/example.rb +9 -0
  991. data/vendor/plugins/haml/vendor/fssm/fssm.gemspec +77 -0
  992. data/vendor/plugins/haml/vendor/fssm/lib/fssm.rb +33 -0
  993. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/fsevents.rb +36 -0
  994. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/inotify.rb +26 -0
  995. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/polling.rb +25 -0
  996. data/vendor/plugins/haml/vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb +131 -0
  997. data/vendor/plugins/haml/vendor/fssm/lib/fssm/monitor.rb +26 -0
  998. data/vendor/plugins/haml/vendor/fssm/lib/fssm/path.rb +91 -0
  999. data/vendor/plugins/haml/vendor/fssm/lib/fssm/pathname.rb +502 -0
  1000. data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/directory.rb +57 -0
  1001. data/vendor/plugins/haml/vendor/fssm/lib/fssm/state/file.rb +24 -0
  1002. data/vendor/plugins/haml/vendor/fssm/lib/fssm/support.rb +63 -0
  1003. data/vendor/plugins/haml/vendor/fssm/lib/fssm/tree.rb +176 -0
  1004. data/vendor/plugins/haml/vendor/fssm/profile/prof-cache.rb +40 -0
  1005. data/vendor/plugins/haml/vendor/fssm/profile/prof-fssm-pathname.html +1231 -0
  1006. data/vendor/plugins/haml/vendor/fssm/profile/prof-pathname.rb +68 -0
  1007. data/vendor/plugins/haml/vendor/fssm/profile/prof-plain-pathname.html +988 -0
  1008. data/vendor/plugins/haml/vendor/fssm/profile/prof.html +2379 -0
  1009. data/vendor/plugins/haml/vendor/fssm/spec/path_spec.rb +75 -0
  1010. data/vendor/plugins/haml/vendor/fssm/spec/root/duck/quack.txt +0 -0
  1011. data/vendor/plugins/haml/vendor/fssm/spec/root/file.css +0 -0
  1012. data/vendor/plugins/haml/vendor/fssm/spec/root/file.rb +0 -0
  1013. data/vendor/plugins/haml/vendor/fssm/spec/root/file.yml +0 -0
  1014. data/vendor/plugins/haml/vendor/fssm/spec/root/moo/cow.txt +0 -0
  1015. data/vendor/plugins/haml/vendor/fssm/spec/spec_helper.rb +14 -0
  1016. data/vendor/plugins/haml/yard/callbacks.rb +29 -0
  1017. data/vendor/plugins/haml/yard/default/fulldoc/html/css/common.sass +5 -1
  1018. data/vendor/rails/Rakefile +83 -0
  1019. data/vendor/rails/actionmailer/CHANGELOG +3 -4
  1020. data/vendor/rails/actionmailer/Rakefile +1 -1
  1021. data/vendor/rails/actionmailer/lib/action_mailer/base.rb +34 -1
  1022. data/vendor/rails/actionmailer/lib/action_mailer/helpers.rb +1 -1
  1023. data/vendor/rails/actionmailer/lib/action_mailer/version.rb +1 -1
  1024. data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak +1 -0
  1025. data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~ +10 -0
  1026. data/vendor/rails/actionpack/CHANGELOG +11 -0
  1027. data/vendor/rails/actionpack/Rakefile +1 -1
  1028. data/vendor/rails/actionpack/lib/action_controller/base.rb +4 -2
  1029. data/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb +1 -1
  1030. data/vendor/rails/actionpack/lib/action_controller/cookies.rb +8 -2
  1031. data/vendor/rails/actionpack/lib/action_controller/integration.rb +19 -7
  1032. data/vendor/rails/actionpack/lib/action_controller/request.rb +2 -2
  1033. data/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb +9 -6
  1034. data/vendor/rails/actionpack/lib/action_controller/rescue.rb +2 -2
  1035. data/vendor/rails/actionpack/lib/action_controller/resources.rb +1 -1
  1036. data/vendor/rails/actionpack/lib/action_controller/routing.rb +1 -1
  1037. data/vendor/rails/actionpack/lib/action_controller/routing/route.rb +3 -3
  1038. data/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +143 -55
  1039. data/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb +48 -35
  1040. data/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb +10 -1
  1041. data/vendor/rails/actionpack/lib/action_controller/test_process.rb +1 -1
  1042. data/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb +11 -1
  1043. data/vendor/rails/actionpack/lib/action_pack/version.rb +1 -1
  1044. data/vendor/rails/actionpack/lib/action_view/helpers.rb +2 -0
  1045. data/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +1 -0
  1046. data/vendor/rails/actionpack/lib/action_view/helpers/csrf_helper.rb +14 -0
  1047. data/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +21 -14
  1048. data/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +1 -1
  1049. data/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb +1 -1
  1050. data/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb +3 -3
  1051. data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb +27 -17
  1052. data/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb +2 -1
  1053. data/vendor/rails/actionpack/lib/action_view/locale/en.yml +14 -14
  1054. data/vendor/rails/actionpack/lib/action_view/renderable_partial.rb +7 -1
  1055. data/vendor/rails/actionpack/lib/action_view/template.rb +2 -2
  1056. data/vendor/rails/actionpack/test/abstract_unit.rb +17 -0
  1057. data/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb +65 -18
  1058. data/vendor/rails/actionpack/test/controller/cookie_test.rb +38 -0
  1059. data/vendor/rails/actionpack/test/controller/integration_test.rb +44 -0
  1060. data/vendor/rails/actionpack/test/controller/reloader_test.rb +1 -0
  1061. data/vendor/rails/actionpack/test/controller/render_test.rb +12 -0
  1062. data/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb +15 -0
  1063. data/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb +92 -124
  1064. data/vendor/rails/actionpack/test/controller/rescue_test.rb +5 -6
  1065. data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +101 -7
  1066. data/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb +71 -11
  1067. data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb +9 -3
  1068. data/vendor/rails/actionpack/test/fixtures/session_autoload_test/session_autoload_test/foo.rb +10 -0
  1069. data/vendor/rails/actionpack/test/fixtures/test/hello_world.erb~ +1 -0
  1070. data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.en.html.erb~ +1 -0
  1071. data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.erb~ +1 -0
  1072. data/vendor/rails/actionpack/test/fixtures/test/malformed/malformed.html.erb~ +1 -0
  1073. data/vendor/rails/actionpack/test/template/form_options_helper_test.rb +4 -0
  1074. data/vendor/rails/actionpack/test/template/text_helper_test.rb +47 -18
  1075. data/vendor/rails/actionpack/test/template/url_helper_test.rb +4 -4
  1076. data/vendor/rails/activemodel/CHANGES +12 -0
  1077. data/vendor/rails/activemodel/README +21 -0
  1078. data/vendor/rails/activemodel/Rakefile +24 -0
  1079. data/vendor/rails/activemodel/lib/active_model.rb +5 -0
  1080. data/vendor/rails/activemodel/lib/active_model/base.rb +8 -0
  1081. data/vendor/rails/activemodel/lib/active_model/callbacks.rb +7 -0
  1082. data/vendor/rails/activemodel/lib/active_model/core.rb +7 -0
  1083. data/vendor/rails/activemodel/lib/active_model/deprecated_error_methods.rb +38 -0
  1084. data/vendor/rails/activemodel/lib/active_model/errors.rb +82 -0
  1085. data/vendor/rails/activemodel/lib/active_model/observing.rb +98 -0
  1086. data/vendor/rails/activemodel/lib/active_model/state_machine.rb +68 -0
  1087. data/vendor/rails/activemodel/lib/active_model/state_machine/event.rb +64 -0
  1088. data/vendor/rails/activemodel/lib/active_model/state_machine/machine.rb +78 -0
  1089. data/vendor/rails/activemodel/lib/active_model/state_machine/state.rb +47 -0
  1090. data/vendor/rails/activemodel/lib/active_model/state_machine/state_transition.rb +40 -0
  1091. data/vendor/rails/activemodel/lib/active_model/validations.rb +126 -0
  1092. data/vendor/rails/activemodel/lib/active_model/validations/acceptance.rb +45 -0
  1093. data/vendor/rails/activemodel/lib/active_model/validations/associated.rb +46 -0
  1094. data/vendor/rails/activemodel/lib/active_model/validations/confirmation.rb +44 -0
  1095. data/vendor/rails/activemodel/lib/active_model/validations/exclusion.rb +37 -0
  1096. data/vendor/rails/activemodel/lib/active_model/validations/format.rb +39 -0
  1097. data/vendor/rails/activemodel/lib/active_model/validations/inclusion.rb +37 -0
  1098. data/vendor/rails/activemodel/lib/active_model/validations/length.rb +95 -0
  1099. data/vendor/rails/activemodel/lib/active_model/validations/numericality.rb +80 -0
  1100. data/vendor/rails/activemodel/lib/active_model/validations/presence.rb +42 -0
  1101. data/vendor/rails/activemodel/lib/active_model/validations/uniqueness.rb +104 -0
  1102. data/vendor/rails/activemodel/test/observing_test.rb +121 -0
  1103. data/vendor/rails/activemodel/test/state_machine/event_test.rb +49 -0
  1104. data/vendor/rails/activemodel/test/state_machine/machine_test.rb +43 -0
  1105. data/vendor/rails/activemodel/test/state_machine/state_test.rb +72 -0
  1106. data/vendor/rails/activemodel/test/state_machine/state_transition_test.rb +84 -0
  1107. data/vendor/rails/activemodel/test/state_machine_test.rb +312 -0
  1108. data/vendor/rails/activemodel/test/test_helper.rb +21 -0
  1109. data/vendor/rails/activerecord/CHANGELOG +5 -2
  1110. data/vendor/rails/activerecord/MIT-LICENSE +20 -0
  1111. data/vendor/rails/activerecord/Rakefile +1 -1
  1112. data/vendor/rails/activerecord/examples/performance.rb +39 -3
  1113. data/vendor/rails/activerecord/lib/active_record/association_preload.rb +12 -2
  1114. data/vendor/rails/activerecord/lib/active_record/associations.rb +1 -1
  1115. data/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +60 -6
  1116. data/vendor/rails/activerecord/lib/active_record/attribute_methods.rb +0 -4
  1117. data/vendor/rails/activerecord/lib/active_record/autosave_association.rb +2 -2
  1118. data/vendor/rails/activerecord/lib/active_record/base.rb +28 -16
  1119. data/vendor/rails/activerecord/lib/active_record/calculations.rb +19 -12
  1120. data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +1 -1
  1121. data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +3 -1
  1122. data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +6 -0
  1123. data/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +2 -0
  1124. data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +1 -1
  1125. data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +2 -1
  1126. data/vendor/rails/activerecord/lib/active_record/dirty.rb +1 -1
  1127. data/vendor/rails/activerecord/lib/active_record/locale/en.yml +11 -11
  1128. data/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb +1 -0
  1129. data/vendor/rails/activerecord/lib/active_record/migration.rb +1 -1
  1130. data/vendor/rails/activerecord/lib/active_record/named_scope.rb +15 -10
  1131. data/vendor/rails/activerecord/lib/active_record/serialization.rb +1 -1
  1132. data/vendor/rails/activerecord/lib/active_record/session_store.rb +9 -1
  1133. data/vendor/rails/activerecord/lib/active_record/validations.rb +12 -12
  1134. data/vendor/rails/activerecord/lib/active_record/version.rb +1 -1
  1135. data/vendor/rails/activerecord/test/cases/adapter_test.rb +7 -8
  1136. data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb +7 -7
  1137. data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_polymorphic_include.rb +19 -0
  1138. data/vendor/rails/activerecord/test/cases/associations/eager_test.rb +12 -0
  1139. data/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +5 -0
  1140. data/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +108 -4
  1141. data/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb +14 -0
  1142. data/vendor/rails/activerecord/test/cases/associations_test.rb +10 -0
  1143. data/vendor/rails/activerecord/test/cases/base_test.rb +35 -75
  1144. data/vendor/rails/activerecord/test/cases/calculations_test.rb +13 -0
  1145. data/vendor/rails/activerecord/test/cases/connection_test_mysql.rb +1 -0
  1146. data/vendor/rails/activerecord/test/cases/counter_cache_test.rb +84 -0
  1147. data/vendor/rails/activerecord/test/cases/locking_test.rb +2 -1
  1148. data/vendor/rails/activerecord/test/cases/migration_test.rb +11 -0
  1149. data/vendor/rails/activerecord/test/cases/named_scope_test.rb +12 -1
  1150. data/vendor/rails/activerecord/test/cases/nested_attributes_test.rb +28 -1
  1151. data/vendor/rails/activerecord/test/cases/reflection_test.rb +5 -5
  1152. data/vendor/rails/activerecord/test/cases/sp_test_mysql.rb +16 -0
  1153. data/vendor/rails/activerecord/test/cases/transactions_test.rb +22 -1
  1154. data/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +12 -12
  1155. data/vendor/rails/activerecord/test/cases/validations_test.rb +42 -30
  1156. data/vendor/rails/activerecord/test/fixtures/polymorphic_designs.yml +19 -0
  1157. data/vendor/rails/activerecord/test/fixtures/polymorphic_prices.yml +19 -0
  1158. data/vendor/rails/activerecord/test/fixtures/tees.yml +4 -0
  1159. data/vendor/rails/activerecord/test/fixtures/ties.yml +4 -0
  1160. data/vendor/rails/activerecord/test/models/author.rb +2 -0
  1161. data/vendor/rails/activerecord/test/models/company.rb +2 -0
  1162. data/vendor/rails/activerecord/test/models/event_author.rb +3 -0
  1163. data/vendor/rails/activerecord/test/models/pirate.rb +2 -2
  1164. data/vendor/rails/activerecord/test/models/polymorphic_design.rb +3 -0
  1165. data/vendor/rails/activerecord/test/models/polymorphic_price.rb +3 -0
  1166. data/vendor/rails/activerecord/test/models/post.rb +2 -0
  1167. data/vendor/rails/activerecord/test/models/tee.rb +4 -0
  1168. data/vendor/rails/activerecord/test/models/tie.rb +4 -0
  1169. data/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb +7 -0
  1170. data/vendor/rails/activerecord/test/schema/schema.rb +16 -0
  1171. data/vendor/rails/activeresource/CHANGELOG +3 -4
  1172. data/vendor/rails/activeresource/MIT-LICENSE +20 -0
  1173. data/vendor/rails/activeresource/Rakefile +1 -1
  1174. data/vendor/rails/activeresource/lib/active_resource/http_mock.rb +104 -9
  1175. data/vendor/rails/activeresource/lib/active_resource/version.rb +1 -1
  1176. data/vendor/rails/activeresource/test/http_mock_test.rb +155 -0
  1177. data/vendor/rails/activesupport/CHANGELOG +16 -0
  1178. data/vendor/rails/activesupport/MIT-LICENSE +20 -0
  1179. data/vendor/rails/activesupport/Rakefile +175 -0
  1180. data/vendor/rails/activesupport/bin/generate_tables +147 -0
  1181. data/vendor/rails/activesupport/install.rb +30 -0
  1182. data/vendor/rails/activesupport/lib/active_support/basic_object.rb +7 -10
  1183. data/vendor/rails/activesupport/lib/active_support/buffered_logger.rb +2 -0
  1184. data/vendor/rails/activesupport/lib/active_support/core_ext/array/grouping.rb +1 -1
  1185. data/vendor/rails/activesupport/lib/active_support/core_ext/array/random_access.rb +24 -4
  1186. data/vendor/rails/activesupport/lib/active_support/core_ext/class.rb +1 -0
  1187. data/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute.rb +67 -0
  1188. data/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb +1 -1
  1189. data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/singleton_class.rb +13 -0
  1190. data/vendor/rails/activesupport/lib/active_support/core_ext/module/remove_method.rb +6 -0
  1191. data/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb +3 -0
  1192. data/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb +1 -1
  1193. data/vendor/rails/activesupport/lib/active_support/core_ext/string/output_safety.rb +0 -11
  1194. data/vendor/rails/activesupport/lib/active_support/dependencies.rb +38 -12
  1195. data/vendor/rails/activesupport/lib/active_support/deprecation.rb +7 -0
  1196. data/vendor/rails/activesupport/lib/active_support/json/backends/yajl.rb +1 -1
  1197. data/vendor/rails/activesupport/lib/active_support/locale/en.yml +4 -1
  1198. data/vendor/rails/activesupport/lib/active_support/memoizable.rb +2 -0
  1199. data/vendor/rails/activesupport/lib/active_support/ordered_hash.rb +6 -0
  1200. data/vendor/rails/activesupport/lib/active_support/testing/performance.rb +1 -1
  1201. data/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb +2 -2
  1202. data/vendor/rails/activesupport/lib/active_support/values/time_zone.rb +5 -1
  1203. data/vendor/rails/activesupport/lib/active_support/vendor.rb +2 -2
  1204. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n.rb +92 -105
  1205. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend.rb +5 -4
  1206. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb +61 -0
  1207. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/missing.rb +4 -6
  1208. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/store_procs.rb +0 -0
  1209. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/active_record/translation.rb +8 -3
  1210. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/base.rb +55 -84
  1211. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cache.rb +1 -0
  1212. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cascade.rb +0 -1
  1213. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/chain.rb +3 -1
  1214. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/cldr.rb +0 -0
  1215. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/fallbacks.rb +0 -0
  1216. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb +113 -0
  1217. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/gettext.rb +0 -0
  1218. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/interpolation_compiler.rb +8 -4
  1219. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb +102 -0
  1220. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb +48 -0
  1221. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/metadata.rb +5 -13
  1222. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/backend/pluralization.rb +0 -0
  1223. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb +87 -0
  1224. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb +98 -0
  1225. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/config.rb +84 -0
  1226. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb +28 -0
  1227. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/core_ext/string/interpolate.rb +3 -4
  1228. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/exceptions.rb +0 -0
  1229. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext.rb +2 -0
  1230. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7/i18n/helpers/gettext.rb → i18n-0.4.1/i18n/gettext/helpers.rb} +2 -2
  1231. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext/po_parser.rb +7 -7
  1232. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale.rb +0 -0
  1233. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/fallbacks.rb +0 -0
  1234. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag.rb +0 -0
  1235. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/parents.rb +0 -0
  1236. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/rfc4646.rb +0 -0
  1237. data/vendor/rails/activesupport/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/locale/tag/simple.rb +0 -0
  1238. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb +3 -0
  1239. data/vendor/rails/activesupport/lib/active_support/version.rb +1 -1
  1240. data/vendor/rails/activesupport/lib/active_support/whiny_nil.rb +1 -1
  1241. data/vendor/rails/activesupport/test/abstract_unit.rb +37 -0
  1242. data/vendor/rails/activesupport/test/autoloading_fixtures/a/b.rb +2 -0
  1243. data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/d.rb +2 -0
  1244. data/vendor/rails/activesupport/test/autoloading_fixtures/a/c/e/f.rb +2 -0
  1245. data/vendor/rails/activesupport/test/autoloading_fixtures/application.rb +1 -0
  1246. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder.rb +3 -0
  1247. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/class_folder_subclass.rb +3 -0
  1248. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/inline_class.rb +2 -0
  1249. data/vendor/rails/activesupport/test/autoloading_fixtures/class_folder/nested_class.rb +7 -0
  1250. data/vendor/rails/activesupport/test/autoloading_fixtures/conflict.rb +1 -0
  1251. data/vendor/rails/activesupport/test/autoloading_fixtures/counting_loader.rb +5 -0
  1252. data/vendor/rails/activesupport/test/autoloading_fixtures/cross_site_dependency.rb +2 -0
  1253. data/vendor/rails/activesupport/test/autoloading_fixtures/e.rb +2 -0
  1254. data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/inline_class.rb +2 -0
  1255. data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_class.rb +4 -0
  1256. data/vendor/rails/activesupport/test/autoloading_fixtures/module_folder/nested_sibling.rb +2 -0
  1257. data/vendor/rails/activesupport/test/autoloading_fixtures/module_with_custom_const_missing/a/b.rb +1 -0
  1258. data/vendor/rails/activesupport/test/autoloading_fixtures/multiple_constant_file.rb +2 -0
  1259. data/vendor/rails/activesupport/test/autoloading_fixtures/raises_name_error.rb +3 -0
  1260. data/vendor/rails/activesupport/test/autoloading_fixtures/raises_no_method_error.rb +3 -0
  1261. data/vendor/rails/activesupport/test/buffered_logger_test.rb +146 -0
  1262. data/vendor/rails/activesupport/test/caching_test.rb +355 -0
  1263. data/vendor/rails/activesupport/test/callbacks_test.rb +188 -0
  1264. data/vendor/rails/activesupport/test/clean_backtrace_test.rb +47 -0
  1265. data/vendor/rails/activesupport/test/clean_logger_test.rb +57 -0
  1266. data/vendor/rails/activesupport/test/core_ext/array_ext_test.rb +394 -0
  1267. data/vendor/rails/activesupport/test/core_ext/base64_ext_test.rb +8 -0
  1268. data/vendor/rails/activesupport/test/core_ext/bigdecimal.rb +10 -0
  1269. data/vendor/rails/activesupport/test/core_ext/blank_test.rb +21 -0
  1270. data/vendor/rails/activesupport/test/core_ext/cgi_ext_test.rb +14 -0
  1271. data/vendor/rails/activesupport/test/core_ext/class/attribute_accessor_test.rb +38 -0
  1272. data/vendor/rails/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb +224 -0
  1273. data/vendor/rails/activesupport/test/core_ext/class/delegating_attributes_test.rb +115 -0
  1274. data/vendor/rails/activesupport/test/core_ext/class_test.rb +46 -0
  1275. data/vendor/rails/activesupport/test/core_ext/date_ext_test.rb +286 -0
  1276. data/vendor/rails/activesupport/test/core_ext/date_time_ext_test.rb +363 -0
  1277. data/vendor/rails/activesupport/test/core_ext/duplicable_test.rb +22 -0
  1278. data/vendor/rails/activesupport/test/core_ext/duration_test.rb +121 -0
  1279. data/vendor/rails/activesupport/test/core_ext/enumerable_test.rb +102 -0
  1280. data/vendor/rails/activesupport/test/core_ext/exception_test.rb +68 -0
  1281. data/vendor/rails/activesupport/test/core_ext/file_test.rb +67 -0
  1282. data/vendor/rails/activesupport/test/core_ext/float_ext_test.rb +25 -0
  1283. data/vendor/rails/activesupport/test/core_ext/hash_ext_test.rb +1016 -0
  1284. data/vendor/rails/activesupport/test/core_ext/integer_ext_test.rb +37 -0
  1285. data/vendor/rails/activesupport/test/core_ext/kernel_test.rb +43 -0
  1286. data/vendor/rails/activesupport/test/core_ext/load_error_test.rb +16 -0
  1287. data/vendor/rails/activesupport/test/core_ext/module/attr_accessor_with_default_test.rb +30 -0
  1288. data/vendor/rails/activesupport/test/core_ext/module/attr_internal_test.rb +52 -0
  1289. data/vendor/rails/activesupport/test/core_ext/module/attribute_accessor_test.rb +39 -0
  1290. data/vendor/rails/activesupport/test/core_ext/module/attribute_aliasing_test.rb +58 -0
  1291. data/vendor/rails/activesupport/test/core_ext/module/model_naming_test.rb +27 -0
  1292. data/vendor/rails/activesupport/test/core_ext/module/synchronization_test.rb +86 -0
  1293. data/vendor/rails/activesupport/test/core_ext/module_test.rb +363 -0
  1294. data/vendor/rails/activesupport/test/core_ext/name_error_test.rb +20 -0
  1295. data/vendor/rails/activesupport/test/core_ext/numeric_ext_test.rb +168 -0
  1296. data/vendor/rails/activesupport/test/core_ext/object_and_class_ext_test.rb +294 -0
  1297. data/vendor/rails/activesupport/test/core_ext/object_ext_test.rb +8 -0
  1298. data/vendor/rails/activesupport/test/core_ext/pathname_test.rb +9 -0
  1299. data/vendor/rails/activesupport/test/core_ext/proc_test.rb +11 -0
  1300. data/vendor/rails/activesupport/test/core_ext/range_ext_test.rb +63 -0
  1301. data/vendor/rails/activesupport/test/core_ext/string_ext_test.rb +402 -0
  1302. data/vendor/rails/activesupport/test/core_ext/symbol_test.rb +9 -0
  1303. data/vendor/rails/activesupport/test/core_ext/time_ext_test.rb +771 -0
  1304. data/vendor/rails/activesupport/test/core_ext/time_with_zone_test.rb +851 -0
  1305. data/vendor/rails/activesupport/test/core_ext/uri_ext_test.rb +12 -0
  1306. data/vendor/rails/activesupport/test/dependencies/check_warnings.rb +2 -0
  1307. data/vendor/rails/activesupport/test/dependencies/conflict.rb +1 -0
  1308. data/vendor/rails/activesupport/test/dependencies/cross_site_depender.rb +3 -0
  1309. data/vendor/rails/activesupport/test/dependencies/mutual_one.rb +4 -0
  1310. data/vendor/rails/activesupport/test/dependencies/mutual_two.rb +4 -0
  1311. data/vendor/rails/activesupport/test/dependencies/raises_exception.rb +3 -0
  1312. data/vendor/rails/activesupport/test/dependencies/requires_nonexistent0.rb +1 -0
  1313. data/vendor/rails/activesupport/test/dependencies/requires_nonexistent1.rb +1 -0
  1314. data/vendor/rails/activesupport/test/dependencies/service_one.rb +5 -0
  1315. data/vendor/rails/activesupport/test/dependencies/service_two.rb +2 -0
  1316. data/vendor/rails/activesupport/test/dependencies_test.rb +789 -0
  1317. data/vendor/rails/activesupport/test/deprecation/proxy_wrappers_test.rb +22 -0
  1318. data/vendor/rails/activesupport/test/deprecation_test.rb +167 -0
  1319. data/vendor/rails/activesupport/test/empty_bool.rb +7 -0
  1320. data/vendor/rails/activesupport/test/flush_cache_on_private_memoization_test.rb +43 -0
  1321. data/vendor/rails/activesupport/test/gzip_test.rb +7 -0
  1322. data/vendor/rails/activesupport/test/i18n_test.rb +98 -0
  1323. data/vendor/rails/activesupport/test/inflector_test.rb +298 -0
  1324. data/vendor/rails/activesupport/test/inflector_test_cases.rb +262 -0
  1325. data/vendor/rails/activesupport/test/json/decoding_test.rb +79 -0
  1326. data/vendor/rails/activesupport/test/json/encoding_test.rb +162 -0
  1327. data/vendor/rails/activesupport/test/memoizable_test.rb +261 -0
  1328. data/vendor/rails/activesupport/test/message_encryptor_test.rb +55 -0
  1329. data/vendor/rails/activesupport/test/message_verifier_test.rb +31 -0
  1330. data/vendor/rails/activesupport/test/multibyte_chars_test.rb +606 -0
  1331. data/vendor/rails/activesupport/test/multibyte_conformance.rb +129 -0
  1332. data/vendor/rails/activesupport/test/multibyte_test_helpers.rb +19 -0
  1333. data/vendor/rails/activesupport/test/multibyte_unicode_database_test.rb +22 -0
  1334. data/vendor/rails/activesupport/test/multibyte_utils_test.rb +137 -0
  1335. data/vendor/rails/activesupport/test/option_merger_test.rb +85 -0
  1336. data/vendor/rails/activesupport/test/ordered_hash_test.rb +237 -0
  1337. data/vendor/rails/activesupport/test/ordered_options_test.rb +53 -0
  1338. data/vendor/rails/activesupport/test/rescuable_test.rb +75 -0
  1339. data/vendor/rails/activesupport/test/safe_buffer_test.rb +36 -0
  1340. data/vendor/rails/activesupport/test/secure_random_test.rb +19 -0
  1341. data/vendor/rails/activesupport/test/string_inquirer_test.rb +15 -0
  1342. data/vendor/rails/activesupport/test/test_case_test.rb +57 -0
  1343. data/vendor/rails/activesupport/test/test_test.rb +188 -0
  1344. data/vendor/rails/activesupport/test/time_zone_test.rb +285 -0
  1345. data/vendor/rails/activesupport/test/whiny_nil_test.rb +50 -0
  1346. data/vendor/rails/activesupport/test/xml_mini/jdom_engine_test.rb +153 -0
  1347. data/vendor/rails/activesupport/test/xml_mini/libxml_engine_test.rb +204 -0
  1348. data/vendor/rails/activesupport/test/xml_mini/libxmlsax_engine_test.rb +181 -0
  1349. data/vendor/rails/activesupport/test/xml_mini/nokogiri_engine_test.rb +204 -0
  1350. data/vendor/rails/activesupport/test/xml_mini/nokogirisax_engine_test.rb +217 -0
  1351. data/vendor/rails/activesupport/test/xml_mini/rexml_engine_test.rb +15 -0
  1352. data/vendor/rails/railties/CHANGELOG +7 -2
  1353. data/vendor/rails/railties/Rakefile +6 -7
  1354. data/vendor/rails/railties/builtin/rails_info/rails/info.rb +1 -1
  1355. data/vendor/rails/railties/environments/boot.rb +6 -2
  1356. data/vendor/rails/railties/environments/environment.rb +1 -1
  1357. data/vendor/rails/railties/guides/rails_guides.rb +13 -24
  1358. data/vendor/rails/railties/guides/rails_guides/generator.rb +169 -49
  1359. data/vendor/rails/railties/guides/rails_guides/indexer.rb +24 -11
  1360. data/vendor/rails/railties/guides/rails_guides/levenshtein.rb +31 -0
  1361. data/vendor/rails/railties/guides/source/action_mailer_basics.textile +29 -12
  1362. data/vendor/rails/railties/guides/source/{credits.erb.textile → credits.html.erb} +4 -4
  1363. data/vendor/rails/railties/guides/source/{index.erb.textile → index.html.erb} +13 -12
  1364. data/vendor/rails/railties/guides/source/plugins.textile +1 -1
  1365. data/vendor/rails/railties/guides/source/security.textile +1 -1
  1366. data/vendor/rails/railties/lib/initializer.rb +44 -20
  1367. data/vendor/rails/railties/lib/rails/gem_dependency.rb +4 -2
  1368. data/vendor/rails/railties/lib/rails/plugin.rb +1 -1
  1369. data/vendor/rails/railties/lib/rails/plugin/loader.rb +3 -3
  1370. data/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb +2 -2
  1371. data/vendor/rails/railties/lib/rails/version.rb +1 -1
  1372. data/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/git.rb +18 -0
  1373. data/vendor/rails/railties/lib/rails_generator/generators/components/migration/migration_generator.rb +1 -1
  1374. data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/test_helper.rb +2 -1
  1375. data/vendor/rails/railties/lib/tasks/databases.rake +9 -9
  1376. data/vendor/rails/railties/lib/tasks/tmp.rake +37 -0
  1377. data/vendor/rails/railties/test/abstract_unit.rb +27 -0
  1378. data/vendor/rails/railties/test/backtrace_cleaner_test.rb +61 -0
  1379. data/vendor/rails/railties/test/boot_test.rb +178 -0
  1380. data/vendor/rails/railties/test/console_app_test.rb +42 -0
  1381. data/vendor/rails/railties/test/fcgi_dispatcher_test.rb +266 -0
  1382. data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/about.yml +1 -0
  1383. data/vendor/rails/railties/test/fixtures/about_yml_plugins/bad_about_yml/init.rb +1 -0
  1384. data/vendor/rails/railties/test/fixtures/about_yml_plugins/plugin_without_about_yml/init.rb +1 -0
  1385. data/vendor/rails/railties/test/fixtures/eager/zoo.rb +3 -0
  1386. data/vendor/rails/railties/test/fixtures/eager/zoo/reptile_house.rb +2 -0
  1387. data/vendor/rails/railties/test/fixtures/environment_with_constant.rb +1 -0
  1388. data/vendor/rails/railties/test/fixtures/lib/generators/missing_class/missing_class_generator.rb +0 -0
  1389. data/vendor/rails/railties/test/fixtures/lib/generators/working/working_generator.rb +2 -0
  1390. data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb +5 -0
  1391. data/vendor/rails/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb +5 -0
  1392. data/vendor/rails/railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb +5 -0
  1393. data/vendor/rails/railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb +5 -0
  1394. data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb +7 -0
  1395. data/vendor/rails/railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb +7 -0
  1396. data/vendor/rails/railties/test/fixtures/plugins/alternate/a/generators/a_generator/a_generator.rb +4 -0
  1397. data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/init.rb +1 -0
  1398. data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb +2 -0
  1399. data/vendor/rails/railties/test/fixtures/plugins/default/gemlike/rails/init.rb +7 -0
  1400. data/vendor/rails/railties/test/fixtures/plugins/default/plugin_with_no_lib_dir/init.rb +0 -0
  1401. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/about.yml +2 -0
  1402. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/generators/stubby_generator/stubby_generator.rb +4 -0
  1403. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/init.rb +7 -0
  1404. data/vendor/rails/railties/test/fixtures/plugins/default/stubby/lib/stubby_mixin.rb +2 -0
  1405. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/controllers/engine_controller.rb +2 -0
  1406. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb +9 -0
  1407. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/app/models/engine_model.rb +2 -0
  1408. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/locales/en.yml +2 -0
  1409. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/config/routes.rb +3 -0
  1410. data/vendor/rails/railties/test/fixtures/plugins/engines/engine/init.rb +3 -0
  1411. data/vendor/rails/railties/test/fixtures/public/foo/bar.html +1 -0
  1412. data/vendor/rails/railties/test/fixtures/public/foo/index.html +1 -0
  1413. data/vendor/rails/railties/test/fixtures/public/index.html +1 -0
  1414. data/vendor/rails/railties/test/gem_dependency_test.rb +227 -0
  1415. data/vendor/rails/railties/test/generator_lookup_test.rb +40 -0
  1416. data/vendor/rails/railties/test/generators/generated_attribute_test.rb +38 -0
  1417. data/vendor/rails/railties/test/generators/generator_test_helper.rb +322 -0
  1418. data/vendor/rails/railties/test/generators/rails_controller_generator_test.rb +44 -0
  1419. data/vendor/rails/railties/test/generators/rails_helper_generator_test.rb +36 -0
  1420. data/vendor/rails/railties/test/generators/rails_mailer_generator_test.rb +29 -0
  1421. data/vendor/rails/railties/test/generators/rails_model_generator_test.rb +96 -0
  1422. data/vendor/rails/railties/test/generators/rails_resource_generator_test.rb +29 -0
  1423. data/vendor/rails/railties/test/generators/rails_scaffold_generator_test.rb +151 -0
  1424. data/vendor/rails/railties/test/generators/rails_template_runner_test.rb +216 -0
  1425. data/vendor/rails/railties/test/initializer_test.rb +437 -0
  1426. data/vendor/rails/railties/test/metal_test.rb +72 -0
  1427. data/vendor/rails/railties/test/mocks/routes.rb +6 -0
  1428. data/vendor/rails/railties/test/plugin_loader_test.rb +172 -0
  1429. data/vendor/rails/railties/test/plugin_locator_test.rb +62 -0
  1430. data/vendor/rails/railties/test/plugin_test.rb +162 -0
  1431. data/vendor/rails/railties/test/plugin_test_helper.rb +29 -0
  1432. data/vendor/rails/railties/test/rack_static_test.rb +47 -0
  1433. data/vendor/rails/railties/test/rails_generator_test.rb +145 -0
  1434. data/vendor/rails/railties/test/rails_info_controller_test.rb +52 -0
  1435. data/vendor/rails/railties/test/rails_info_test.rb +99 -0
  1436. data/vendor/rails/railties/test/secret_key_generation_test.rb +38 -0
  1437. data/vendor/rails/railties/test/vendor/gems/dummy-gem-a-0.4.0/lib/dummy-gem-a.rb +1 -0
  1438. data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.4.0/lib/dummy-gem-b.rb +1 -0
  1439. data/vendor/rails/railties/test/vendor/gems/dummy-gem-b-0.6.0/lib/dummy-gem-b.rb +1 -0
  1440. data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.4.0/lib/dummy-gem-c.rb +1 -0
  1441. data/vendor/rails/railties/test/vendor/gems/dummy-gem-c-0.6.0/lib/dummy-gem-c.rb +1 -0
  1442. data/vendor/rails/railties/test/vendor/gems/dummy-gem-d-1.0.0/lib/dummy-gem-d.rb +1 -0
  1443. data/vendor/rails/railties/test/vendor/gems/dummy-gem-e-1.0.0/lib/dummy-gem-e.rb +1 -0
  1444. data/vendor/rails/railties/test/vendor/gems/dummy-gem-f-1.0.0/lib/dummy-gem-f.rb +1 -0
  1445. data/vendor/rails/railties/test/vendor/gems/dummy-gem-g-1.0.0/lib/dummy-gem-g.rb +1 -0
  1446. data/vendor/rails/railties/test/vendor/gems/dummy-gem-h-1.0.0/lib/dummy-gem-h.rb +1 -0
  1447. data/vendor/rails/railties/test/vendor/gems/dummy-gem-i-1.0.0/ext/dummy-gem-i/Makefile +0 -0
  1448. data/vendor/rails/railties/test/vendor/gems/dummy-gem-i-1.0.0/lib/dummy-gem-i.rb +1 -0
  1449. data/vendor/rails/railties/test/vendor/gems/dummy-gem-j-1.0.0/lib/dummy-gem-j.rb +1 -0
  1450. data/vendor/rails/railties/test/vendor/gems/dummy-gem-k-1.0.0/lib/dummy-gem-k.rb +1 -0
  1451. data/vendor/rails/railties/test/vendor/gems/dummy-gem-l-1.0.0-x86-mswin32/lib/dummy-gem-l.rb +1 -0
  1452. metadata +1156 -125
  1453. data/app/controllers/admin/export_controller.rb +0 -5
  1454. data/app/helpers/admin/abstract_model_helper.rb +0 -2
  1455. data/app/models/radiant/exporter.rb +0 -11
  1456. data/db/templates/roasters.yml +0 -1210
  1457. data/db/templates/simple-blog.yml +0 -197
  1458. data/db/templates/styled-blog.yml +0 -472
  1459. data/lib/radiant/legacy_routes.rb +0 -72
  1460. data/public/images/admin/buttons_background.png +0 -0
  1461. data/public/images/admin/login_shadow.png +0 -0
  1462. data/public/images/admin/navigation_background.gif +0 -0
  1463. data/public/images/admin/navigation_secondary_background.png +0 -0
  1464. data/public/images/admin/navigation_shadow.png +0 -0
  1465. data/public/images/admin/navigation_tabs.png +0 -0
  1466. data/public/images/admin/new_homepage.png +0 -0
  1467. data/public/images/admin/new_layout.png +0 -0
  1468. data/public/images/admin/new_snippet.png +0 -0
  1469. data/public/images/admin/new_user.png +0 -0
  1470. data/public/images/admin/shadow.png +0 -0
  1471. data/public/images/admin/shadow_grey.png +0 -0
  1472. data/public/images/admin/spacer.gif +0 -0
  1473. data/public/images/admin/vertical_tan_gradient.png +0 -0
  1474. data/public/images/admin/view_site.png +0 -0
  1475. data/public/stylesheets/sass/admin/modules/_grid.sass +0 -56
  1476. data/public/stylesheets/sass/admin/modules/_opacity.sass +0 -7
  1477. data/public/stylesheets/sass/admin/modules/_rounded.sass +0 -41
  1478. data/public/stylesheets/sass/admin/modules/_shadow.sass +0 -9
  1479. data/public/stylesheets/sass/admin/partials/_reset.sass +0 -36
  1480. data/rerun.txt +0 -1
  1481. data/spec/helpers/admin/abstract_model_helper_spec.rb +0 -4
  1482. data/spec/lib/radiant/legacy_routes_spec.rb +0 -14
  1483. data/spec/models/radiant/exporter_spec.rb +0 -25
  1484. data/vendor/extensions/archive/test/fixtures/pages.yml +0 -397
  1485. data/vendor/extensions/archive/test/functional/archive_extension_test.rb +0 -16
  1486. data/vendor/extensions/archive/test/helpers/archive_index_test_helper.rb +0 -37
  1487. data/vendor/extensions/archive/test/test_helper.rb +0 -26
  1488. data/vendor/extensions/archive/test/unit/archive_day_index_page_test.rb +0 -22
  1489. data/vendor/extensions/archive/test/unit/archive_month_index_page_test.rb +0 -22
  1490. data/vendor/extensions/archive/test/unit/archive_page_test.rb +0 -40
  1491. data/vendor/extensions/archive/test/unit/archive_year_index_page_test.rb +0 -22
  1492. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/only_first_quoted.html +0 -8
  1493. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/only_first_quoted.text +0 -4
  1494. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.html +0 -1
  1495. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.options +0 -1
  1496. data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/filtered_html.text +0 -1
  1497. data/vendor/plugins/haml/test/sass/templates/bork.sass +0 -2
  1498. data/vendor/rails/activerecord/examples/performance.sql +0 -85
  1499. data/vendor/rails/activerecord/test/cases/encoding_test.rb +0 -6
  1500. data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite +0 -0
  1501. data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 +0 -0
  1502. data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite +0 -0
  1503. data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 +0 -0
  1504. data/vendor/rails/activeresource/test/debug.log +0 -80350
  1505. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb +0 -66
  1506. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/fast.rb +0 -69
  1507. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/helpers.rb +0 -68
  1508. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/links.rb +0 -34
  1509. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/backend/simple.rb +0 -22
  1510. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/except.rb +0 -8
  1511. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/slice.rb +0 -8
  1512. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/object/meta_class.rb +0 -5
  1513. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/helpers.rb +0 -5
  1514. data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.3.7/i18n/version.rb +0 -3
@@ -35,6 +35,7 @@ module Kramdown
35
35
  autoload :Base, 'kramdown/converter/base'
36
36
  autoload :Html, 'kramdown/converter/html'
37
37
  autoload :Latex, 'kramdown/converter/latex'
38
+ autoload :Kramdown, 'kramdown/converter/kramdown'
38
39
 
39
40
  end
40
41
 
@@ -29,6 +29,8 @@ module Kramdown
29
29
  # Converts a Kramdown::Document to HTML.
30
30
  class Html < Base
31
31
 
32
+ include ::Kramdown::Utils::HTML
33
+
32
34
  # :stopdoc:
33
35
 
34
36
  # Defines the amount of indentation used when nesting HTML tags.
@@ -60,6 +62,7 @@ module Kramdown
60
62
  result = ''
61
63
  indent += INDENTATION
62
64
  el.children.each do |inner_el|
65
+ opts[:parent] = el
63
66
  result << send("convert_#{inner_el.type}", inner_el, indent, opts)
64
67
  end
65
68
  result
@@ -73,50 +76,55 @@ module Kramdown
73
76
  escape_html(el.value, :text)
74
77
  end
75
78
 
76
- def convert_eob(el, indent, opts)
77
- ''
78
- end
79
-
80
79
  def convert_p(el, indent, opts)
81
- "#{' '*indent}<p#{options_for_element(el)}>#{inner(el, indent, opts)}</p>\n"
80
+ if el.options[:transparent]
81
+ "#{inner(el, indent, opts)}"
82
+ else
83
+ "#{' '*indent}<p#{html_attributes(el)}>#{inner(el, indent, opts)}</p>\n"
84
+ end
82
85
  end
83
86
 
84
87
  def convert_codeblock(el, indent, opts)
85
- if el.value && el.options[:attr] && el.options[:attr]['lang'] && HIGHLIGHTING_AVAILABLE
86
- el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
88
+ el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
89
+ lang = el.attr.delete('lang')
90
+ if lang && HIGHLIGHTING_AVAILABLE
87
91
  opts = {:wrap => @doc.options[:coderay_wrap], :line_numbers => @doc.options[:coderay_line_numbers],
88
92
  :line_number_start => @doc.options[:coderay_line_number_start], :tab_width => @doc.options[:coderay_tab_width],
89
93
  :bold_every => @doc.options[:coderay_bold_every], :css => @doc.options[:coderay_css]}
90
- result = CodeRay.scan(el.value, el.options[:attr].delete('lang').to_sym).html(opts).chomp + "\n"
91
- "#{' '*indent}<div#{options_for_element(el)}>#{result}#{' '*indent}</div>\n"
94
+ result = CodeRay.scan(el.value, lang.to_sym).html(opts).chomp + "\n"
95
+ "#{' '*indent}<div#{html_attributes(el)}>#{result}#{' '*indent}</div>\n"
92
96
  else
93
- result = (el.value ? escape_html(el.value) : inner(el, indent, opts))
94
- if el.options[:attr] && el.options[:attr].has_key?('class') && el.options[:attr]['class'] =~ /\bshow-whitespaces\b/
97
+ result = escape_html(el.value)
98
+ if el.attr['class'].to_s =~ /\bshow-whitespaces\b/
95
99
  result.gsub!(/(?:(^[ \t]+)|([ \t]+$)|([ \t]+))/) do |m|
96
100
  suffix = ($1 ? '-l' : ($2 ? '-r' : ''))
97
101
  m.scan(/./).map do |c|
98
102
  case c
99
103
  when "\t" then "<span class=\"ws-tab#{suffix}\">\t</span>"
100
- when " " then "<span class=\"ws-space#{suffix}\">&sdot;</span>"
104
+ when " " then "<span class=\"ws-space#{suffix}\">&#8901;</span>"
101
105
  end
102
106
  end.join('')
103
107
  end
104
108
  end
105
- "#{' '*indent}<pre#{options_for_element(el)}><code>#{result}#{result =~ /\n\Z/ ? '' : "\n"}</code></pre>\n"
109
+ "#{' '*indent}<pre#{html_attributes(el)}><code>#{result}#{result =~ /\n\Z/ ? '' : "\n"}</code></pre>\n"
106
110
  end
107
111
  end
108
112
 
109
113
  def convert_blockquote(el, indent, opts)
110
- "#{' '*indent}<blockquote#{options_for_element(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</blockquote>\n"
114
+ "#{' '*indent}<blockquote#{html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</blockquote>\n"
111
115
  end
112
116
 
113
117
  def convert_header(el, indent, opts)
114
118
  el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
115
- if @doc.options[:auto_ids] && !(el.options[:attr] && el.options[:attr]['id'])
116
- (el.options[:attr] ||= {})['id'] = generate_id(el.options[:raw_text])
119
+ if @doc.options[:auto_ids] && !el.attr['id']
120
+ el.attr['id'] = generate_id(el.options[:raw_text])
117
121
  end
118
- @toc << [el.options[:level], el.options[:attr]['id'], el.children] if el.options[:attr] && el.options[:attr]['id']
119
- "#{' '*indent}<h#{el.options[:level]}#{options_for_element(el)}>#{inner(el, indent, opts)}</h#{el.options[:level]}>\n"
122
+ @toc << [el.options[:level], el.attr['id'], el.children] if el.attr['id'] && within_toc_depth?(el)
123
+ "#{' '*indent}<h#{el.options[:level]}#{html_attributes(el)}>#{inner(el, indent, opts)}</h#{el.options[:level]}>\n"
124
+ end
125
+
126
+ def within_toc_depth?(el)
127
+ @doc.options[:toc_depth] <= 0 || el.options[:level] <= @doc.options[:toc_depth]
120
128
  end
121
129
 
122
130
  def convert_hr(el, indent, opts)
@@ -125,19 +133,19 @@ module Kramdown
125
133
 
126
134
  def convert_ul(el, indent, opts)
127
135
  if !@toc_code && (el.options[:ial][:refs].include?('toc') rescue nil) && (el.type == :ul || el.type == :ol)
128
- @toc_code = [el.type, el.options[:attr], (0..128).to_a.map{|a| rand(36).to_s(36)}.join]
136
+ @toc_code = [el.type, el.attr, (0..128).to_a.map{|a| rand(36).to_s(36)}.join]
129
137
  @toc_code.last
130
138
  else
131
- "#{' '*indent}<#{el.type}#{options_for_element(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</#{el.type}>\n"
139
+ "#{' '*indent}<#{el.type}#{html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</#{el.type}>\n"
132
140
  end
133
141
  end
134
142
  alias :convert_ol :convert_ul
135
143
  alias :convert_dl :convert_ul
136
144
 
137
145
  def convert_li(el, indent, opts)
138
- output = ' '*indent << "<#{el.type}" << options_for_element(el) << ">"
146
+ output = ' '*indent << "<#{el.type}" << html_attributes(el) << ">"
139
147
  res = inner(el, indent, opts)
140
- if el.children.empty? || el.children.first.options[:category] != :block
148
+ if el.children.empty? || (el.children.first.type == :p && el.children.first.options[:transparent])
141
149
  output << res << (res =~ /\n\Z/ ? ' '*indent : '')
142
150
  else
143
151
  output << "\n" << res << ' '*indent
@@ -147,38 +155,36 @@ module Kramdown
147
155
  alias :convert_dd :convert_li
148
156
 
149
157
  def convert_dt(el, indent, opts)
150
- "#{' '*indent}<dt#{options_for_element(el)}>#{inner(el, indent, opts)}</dt>\n"
158
+ "#{' '*indent}<dt#{html_attributes(el)}>#{inner(el, indent, opts)}</dt>\n"
151
159
  end
152
160
 
153
- HTML_TAGS_WITH_BODY=['div', 'script']
161
+ HTML_TAGS_WITH_BODY=['div', 'script', 'iframe', 'textarea']
154
162
 
155
163
  def convert_html_element(el, indent, opts)
164
+ parent = opts[:parent]
156
165
  res = inner(el, indent, opts)
157
- if @doc.options[:filter_html].include?(el.value)
158
- warn("The filter_html option is deprecated and will be removed in the next release")
159
- res.chomp + (el.options[:category] == :block ? "\n" : '')
160
- elsif el.options[:category] == :span
161
- "<#{el.value}#{options_for_element(el)}" << (!res.empty? ? ">#{res}</#{el.value}>" : " />")
166
+ if el.options[:category] == :span
167
+ "<#{el.value}#{html_attributes(el)}" << (!res.empty? || HTML_TAGS_WITH_BODY.include?(el.value) ? ">#{res}</#{el.value}>" : " />")
162
168
  else
163
169
  output = ''
164
- output << ' '*indent if !el.options[:parent_is_raw]
165
- output << "<#{el.value}#{options_for_element(el)}"
170
+ output << ' '*indent if parent.type != :html_element || parent.options[:parse_type] != :raw
171
+ output << "<#{el.value}#{html_attributes(el)}"
166
172
  if !res.empty? && el.options[:parse_type] != :block
167
173
  output << ">#{res}</#{el.value}>"
168
174
  elsif !res.empty?
169
- output << ">\n#{res}" << ' '*indent << "</#{el.value}>"
175
+ output << ">\n#{res.chomp}\n" << ' '*indent << "</#{el.value}>"
170
176
  elsif HTML_TAGS_WITH_BODY.include?(el.value)
171
177
  output << "></#{el.value}>"
172
178
  else
173
179
  output << " />"
174
180
  end
175
- output << "\n" if el.options[:outer_element] || !el.options[:parent_is_raw]
181
+ output << "\n" if parent.type != :html_element || parent.options[:parse_type] != :raw
176
182
  output
177
183
  end
178
184
  end
179
185
 
180
186
  def convert_xml_comment(el, indent, opts)
181
- if el.options[:category] == :block && !el.options[:parent_is_raw]
187
+ if el.options[:category] == :block && (opts[:parent].type != :html_element || opts[:parent].options[:parse_type] != :raw)
182
188
  ' '*indent + el.value + "\n"
183
189
  else
184
190
  el.value
@@ -195,11 +201,11 @@ module Kramdown
195
201
  "#{' '*(indent + INDENTATION)}" + (a == :default ? "<col />" : "<col align=\"#{a}\" />") + "\n"
196
202
  end.join('')
197
203
  end
198
- "#{' '*indent}<table#{options_for_element(el)}>\n#{alignment}#{inner(el, indent, opts)}#{' '*indent}</table>\n"
204
+ "#{' '*indent}<table#{html_attributes(el)}>\n#{alignment}#{inner(el, indent, opts)}#{' '*indent}</table>\n"
199
205
  end
200
206
 
201
207
  def convert_thead(el, indent, opts)
202
- "#{' '*indent}<#{el.type}#{options_for_element(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</#{el.type}>\n"
208
+ "#{' '*indent}<#{el.type}#{html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</#{el.type}>\n"
203
209
  end
204
210
  alias :convert_tbody :convert_thead
205
211
  alias :convert_tfoot :convert_thead
@@ -207,33 +213,48 @@ module Kramdown
207
213
 
208
214
  def convert_td(el, indent, opts)
209
215
  res = inner(el, indent, opts)
210
- "#{' '*indent}<#{el.type}#{options_for_element(el)}>#{res.empty? ? "&nbsp;" : res}</#{el.type}>\n"
216
+ "#{' '*indent}<#{el.type}#{html_attributes(el)}>#{res.empty? ? "&nbsp;" : res}</#{el.type}>\n"
211
217
  end
212
218
  alias :convert_th :convert_td
213
219
 
220
+ def convert_comment(el, indent, opts)
221
+ if el.options[:category] == :block
222
+ "#{' '*indent}<!-- #{el.value} -->\n"
223
+ else
224
+ "<!-- #{el.value} -->"
225
+ end
226
+ end
227
+
214
228
  def convert_br(el, indent, opts)
215
229
  "<br />"
216
230
  end
217
231
 
218
232
  def convert_a(el, indent, opts)
219
- do_obfuscation = el.options[:attr]['href'] =~ /^mailto:/
233
+ do_obfuscation = el.attr['href'] =~ /^mailto:/
220
234
  if do_obfuscation
221
235
  el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
222
- href = obfuscate(el.options[:attr]['href'].sub(/^mailto:/, ''))
236
+ href = obfuscate(el.attr['href'].sub(/^mailto:/, ''))
223
237
  mailto = obfuscate('mailto')
224
- el.options[:attr]['href'] = "#{mailto}:#{href}"
238
+ el.attr['href'] = "#{mailto}:#{href}"
225
239
  end
226
240
  res = inner(el, indent, opts)
227
241
  res = obfuscate(res) if do_obfuscation
228
- "<a#{options_for_element(el)}>#{res}</a>"
242
+ "<a#{html_attributes(el)}>#{res}</a>"
229
243
  end
230
244
 
231
245
  def convert_img(el, indent, opts)
232
- "<img#{options_for_element(el)} />"
246
+ "<img#{html_attributes(el)} />"
233
247
  end
234
248
 
235
249
  def convert_codespan(el, indent, opts)
236
- "<code#{options_for_element(el)}>#{el.value ? escape_html(el.value) : inner(el, indent, opts)}</code>"
250
+ el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
251
+ lang = el.attr.delete('lang')
252
+ if lang && HIGHLIGHTING_AVAILABLE
253
+ result = CodeRay.scan(el.value, lang.to_sym).html(:wrap => :span, :css => @doc.options[:coderay_css]).chomp
254
+ "<code#{html_attributes(el)}>#{result}</code>"
255
+ else
256
+ "<code#{html_attributes(el)}>#{escape_html(el.value)}</code>"
257
+ end
237
258
  end
238
259
 
239
260
  def convert_footnote(el, indent, opts)
@@ -244,39 +265,46 @@ module Kramdown
244
265
  end
245
266
 
246
267
  def convert_raw(el, indent, opts)
247
- el.value
268
+ if !el.options[:type] || el.options[:type].empty? || el.options[:type].include?('html')
269
+ el.value + (el.options[:category] == :block ? "\n" : '')
270
+ else
271
+ ''
272
+ end
248
273
  end
249
274
 
250
275
  def convert_em(el, indent, opts)
251
- "<#{el.type}#{options_for_element(el)}>#{inner(el, indent, opts)}</#{el.type}>"
276
+ "<#{el.type}#{html_attributes(el)}>#{inner(el, indent, opts)}</#{el.type}>"
252
277
  end
253
278
  alias :convert_strong :convert_em
254
279
 
255
280
  def convert_entity(el, indent, opts)
256
- "&#{el.value.kind_of?(Integer) ? '#' : ''}#{el.value};"
281
+ entity_to_str(el.value, el.options[:original])
257
282
  end
258
283
 
259
284
  TYPOGRAPHIC_SYMS = {
260
- :mdash => '&mdash;', :ndash => '&ndash;', :hellip => '&hellip;',
261
- :laquo_space => '&laquo;&nbsp;', :raquo_space => '&nbsp;&raquo;',
262
- :laquo => '&laquo;', :raquo => '&raquo;'
285
+ :mdash => [::Kramdown::Utils::Entities.entity('mdash')],
286
+ :ndash => [::Kramdown::Utils::Entities.entity('ndash')],
287
+ :hellip => [::Kramdown::Utils::Entities.entity('hellip')],
288
+ :laquo_space => [::Kramdown::Utils::Entities.entity('laquo'), ::Kramdown::Utils::Entities.entity('nbsp')],
289
+ :raquo_space => [::Kramdown::Utils::Entities.entity('nbsp'), ::Kramdown::Utils::Entities.entity('raquo')],
290
+ :laquo => [::Kramdown::Utils::Entities.entity('laquo')],
291
+ :raquo => [::Kramdown::Utils::Entities.entity('raquo')]
263
292
  }
264
293
  def convert_typographic_sym(el, indent, opts)
265
- TYPOGRAPHIC_SYMS[el.value]
294
+ TYPOGRAPHIC_SYMS[el.value].map {|e| entity_to_str(e)}.join('')
266
295
  end
267
296
 
268
297
  def convert_smart_quote(el, indent, opts)
269
- "&#{el.value};"
298
+ entity_to_str(::Kramdown::Utils::Entities.entity(el.value.to_s))
270
299
  end
271
300
 
272
301
  def convert_math(el, indent, opts)
273
302
  el = Marshal.load(Marshal.dump(el)) # so that the original is not changed
274
- el.options[:attr] ||= {}
275
- el.options[:attr]['class'] ||= ''
276
- el.options[:attr]['class'] += (el.options[:attr]['class'].empty? ? '' : ' ') + 'math'
303
+ el.attr['class'] ||= ''
304
+ el.attr['class'] += (el.attr['class'].empty? ? '' : ' ') + 'math'
277
305
  type = 'span'
278
306
  type = 'div' if el.options[:category] == :block
279
- "<#{type}#{options_for_element(el)}>#{escape_html(el.value, :text)}</#{type}>#{type == 'div' ? "\n" : ''}"
307
+ "<#{type}#{html_attributes(el)}>#{escape_html(el.value)}</#{type}>#{type == 'div' ? "\n" : ''}"
280
308
  end
281
309
 
282
310
  def convert_abbreviation(el, indent, opts)
@@ -301,13 +329,15 @@ module Kramdown
301
329
  end
302
330
 
303
331
  def generate_toc_tree(toc, type, attr)
304
- sections = Element.new(type, nil, {:attr => {'id' => 'markdown-toc'}.merge(attr)})
332
+ sections = Element.new(type, nil, attr)
333
+ sections.attr['id'] ||= 'markdown-toc'
305
334
  stack = []
306
335
  toc.each do |level, id, children|
307
- li = Element.new(:li, nil, {:level => level})
308
- a = Element.new(:a, nil, {:attr => {:href => "##{id}"}})
336
+ li = Element.new(:li, nil, nil, {:level => level})
337
+ li.children << Element.new(:p, nil, nil, {:transparent => true})
338
+ a = Element.new(:a, nil, {'href' => "##{id}"})
309
339
  a.children += children
310
- li.children << a
340
+ li.children.last.children << a
311
341
  li.children << Element.new(type)
312
342
 
313
343
  success = false
@@ -346,10 +376,10 @@ module Kramdown
346
376
  # Return a HTML list with the footnote content for the used footnotes.
347
377
  def footnote_content
348
378
  ol = Element.new(:ol)
349
- ol.options[:attr] = {'start' => @footnote_start} if @footnote_start != 1
379
+ ol.attr['start'] = @footnote_start if @footnote_start != 1
350
380
  @footnotes.each do |name, data|
351
- li = Element.new(:li, nil, {:attr => {:id => "fn:#{name}"}, :first_is_block => true})
352
- li.children = Marshal.load(Marshal.dump(data[:content].children)) #TODO: probably remove this!!!!
381
+ li = Element.new(:li, nil, {'id' => "fn:#{name}"}, {:first_is_block => true})
382
+ li.children = Marshal.load(Marshal.dump(data[:content].children))
353
383
  ol.children << li
354
384
 
355
385
  ref = Element.new(:raw, "<a href=\"#fnref:#{name}\" rev=\"footnote\">&#8617;</a>")
@@ -363,34 +393,6 @@ module Kramdown
363
393
  (ol.children.empty? ? '' : "<div class=\"footnotes\">\n#{convert(ol, 2)}</div>\n")
364
394
  end
365
395
 
366
- # Return the string with the attributes of the element +el+.
367
- def options_for_element(el)
368
- (el.options[:attr] || {}).map {|k,v| v.nil? ? '' : " #{k}=\"#{escape_html(v.to_s, :no_entities)}\"" }.sort.join('')
369
- end
370
-
371
- ESCAPE_MAP = {
372
- '<' => '&lt;',
373
- '>' => '&gt;',
374
- '&' => '&amp;',
375
- '"' => '&quot;'
376
- }
377
- ESCAPE_ALL_RE = Regexp.union(*ESCAPE_MAP.collect {|k,v| k})
378
- ESCAPE_NO_ENTITIES_RE = Regexp.union(REXML::Parsers::BaseParser::REFERENCE_RE, ESCAPE_ALL_RE)
379
- ESCAPE_NORMAL = Regexp.union(REXML::Parsers::BaseParser::REFERENCE_RE, /<|>|&/)
380
- ESCAPE_RE_FROM_TYPE = {
381
- :all => ESCAPE_ALL_RE,
382
- :no_entities => ESCAPE_NO_ENTITIES_RE,
383
- :text => ESCAPE_NORMAL
384
- }
385
-
386
- # Escape the special HTML characters in the string +str+. The parameter +type+ specifies what
387
- # is escaped: <tt>:all</tt> - all special HTML characters as well as entities,
388
- # <tt>:no_entities</tt> - all special HTML characters but no entities, <tt>:text</tt> - all
389
- # special HTML characters except the quotation mark but no entities.
390
- def escape_html(str, type = :all)
391
- str.gsub(ESCAPE_RE_FROM_TYPE[type]) {|m| ESCAPE_MAP[m] || m}
392
- end
393
-
394
396
  end
395
397
 
396
398
  end
@@ -0,0 +1,421 @@
1
+ # -*- coding: utf-8 -*-
2
+ #
3
+ #--
4
+ # Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
5
+ #
6
+ # This file is part of kramdown.
7
+ #
8
+ # kramdown is free software: you can redistribute it and/or modify
9
+ # it under the terms of the GNU General Public License as published by
10
+ # the Free Software Foundation, either version 3 of the License, or
11
+ # (at your option) any later version.
12
+ #
13
+ # This program is distributed in the hope that it will be useful,
14
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
+ # GNU General Public License for more details.
17
+ #
18
+ # You should have received a copy of the GNU General Public License
19
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
20
+ #++
21
+ #
22
+
23
+ require 'rexml/parsers/baseparser'
24
+
25
+ module Kramdown
26
+
27
+ module Converter
28
+
29
+ # Converts a Kramdown::Document to the kramdown format.
30
+ class Kramdown < Base
31
+
32
+ # :stopdoc:
33
+
34
+ include ::Kramdown::Utils::HTML
35
+
36
+ def initialize(doc)
37
+ super
38
+ @linkrefs = []
39
+ @footnotes = []
40
+ @abbrevs = []
41
+ @stack = []
42
+ end
43
+
44
+ def convert(el, opts = {:indent => 0})
45
+ res = send("convert_#{el.type}", el, opts)
46
+ if el.type != :html_element && el.type != :li && el.type != :dd && (ial = ial_for_element(el))
47
+ res << ial
48
+ res << "\n\n" if el.options[:category] == :block
49
+ elsif [:ul, :dl, :ol, :codeblock].include?(el.type) && opts[:next] &&
50
+ ([el.type, :codeblock].include?(opts[:next].type) ||
51
+ (opts[:next].type == :blank && opts[:nnext] && [el.type, :codeblock].include?(opts[:nnext].type)))
52
+ res << "^\n\n"
53
+ elsif el.options[:category] == :block && ![:li, :dd, :dt, :td, :th, :tr, :thead, :tbody, :tfoot, :blank].include?(el.type) &&
54
+ (el.type != :p || !el.options[:transparent])
55
+ res << "\n"
56
+ end
57
+ res
58
+ end
59
+
60
+ def inner(el, opts = {:indent => 0})
61
+ @stack.push(el)
62
+ result = ''
63
+ el.children.each_with_index do |inner_el, index|
64
+ options = opts.dup
65
+ options[:index] = index
66
+ options[:prev] = (index == 0 ? nil : el.children[index-1])
67
+ options[:pprev] = (index <= 1 ? nil : el.children[index-2])
68
+ options[:next] = (index == el.children.length - 1 ? nil : el.children[index+1])
69
+ options[:nnext] = (index >= el.children.length - 2 ? nil : el.children[index+2])
70
+ result << convert(inner_el, options)
71
+ end
72
+ @stack.pop
73
+ result
74
+ end
75
+
76
+ def convert_blank(el, opts)
77
+ ""
78
+ end
79
+
80
+ ESCAPED_CHAR_RE = /(\$\$|[\\*_`\[\]\{"'])|^[ ]{0,3}(:)/
81
+
82
+ def convert_text(el, opts)
83
+ if opts[:raw_text]
84
+ el.value
85
+ else
86
+ el.value.gsub(/\A\n/) do
87
+ opts[:prev] && opts[:prev].type == :br ? '' : "\n"
88
+ end.gsub(/\s+/, ' ').gsub(ESCAPED_CHAR_RE) { "\\#{$1 || $2}" }
89
+ end
90
+ end
91
+
92
+ def convert_p(el, opts)
93
+ w = @doc.options[:line_width] - opts[:indent].to_s.to_i
94
+ first, second, *rest = inner(el, opts).strip.gsub(/(.{1,#{w}})( +|$\n?)/, "\\1\n").split(/\n/)
95
+ first.gsub!(/^(?:(#)|(\d+)\.|([+-]\s))/) { $1 || $3 ? "\\#{$1 || $3}" : "#{$2}\\."}
96
+ first.gsub!(/\|/, '\\|')
97
+ second.gsub!(/^([=-]+\s*?)$/, "\\\1") if second
98
+ [first, second, *rest].compact.join("\n") + "\n"
99
+ end
100
+
101
+
102
+ def convert_codeblock(el, opts)
103
+ el.value.split(/\n/).map {|l| l.empty? ? " " : " #{l}"}.join("\n") + "\n"
104
+ end
105
+
106
+ def convert_blockquote(el, opts)
107
+ opts[:indent] += 2
108
+ inner(el, opts).chomp.split(/\n/).map {|l| "> #{l}"}.join("\n") << "\n"
109
+ end
110
+
111
+ def convert_header(el, opts)
112
+ res = ''
113
+ res << "#{'#' * el.options[:level]} #{inner(el, opts)}"
114
+ res << " {##{el.attr['id']}}" if el.attr['id']
115
+ res << "\n"
116
+ end
117
+
118
+ def convert_hr(el, opts)
119
+ "* * *\n"
120
+ end
121
+
122
+ def convert_ul(el, opts)
123
+ inner(el, opts).sub(/\n+\Z/, "\n")
124
+ end
125
+ alias :convert_ol :convert_ul
126
+ alias :convert_dl :convert_ul
127
+
128
+ def convert_li(el, opts)
129
+ sym, width = if @stack.last.type == :ul
130
+ ['* ', el.children.first.type == :codeblock ? 4 : 2]
131
+ else
132
+ ["#{opts[:index] + 1}.".ljust(4), 4]
133
+ end
134
+ if ial = ial_for_element(el)
135
+ sym += ial + " "
136
+ end
137
+
138
+ opts[:indent] += width
139
+ text = inner(el, opts)
140
+ newlines = text.scan(/\n*\Z/).first
141
+ first, *last = text.split(/\n/)
142
+ last = last.map {|l| " "*width + l}.join("\n")
143
+ text = first + (last.empty? ? "" : "\n") + last + newlines
144
+ if el.children.first.type == :p && !el.children.first.options[:transparent]
145
+ res = "#{sym}#{text}"
146
+ res << "^\n" if el.children.size == 1 && @stack.last.children.last == el &&
147
+ (@stack.last.children.any? {|c| c.children.first.type != :p} || @stack.last.children.size == 1)
148
+ res
149
+ elsif el.children.first.type == :codeblock
150
+ "#{sym}\n #{text}"
151
+ else
152
+ "#{sym}#{text}"
153
+ end
154
+ end
155
+
156
+ def convert_dd(el, opts)
157
+ sym, width = ": ", (el.children.first.type == :codeblock ? 4 : 2)
158
+ if ial = ial_for_element(el)
159
+ sym += ial + " "
160
+ end
161
+
162
+ opts[:indent] += width
163
+ text = inner(el, opts)
164
+ newlines = text.scan(/\n*\Z/).first
165
+ first, *last = text.split(/\n/)
166
+ last = last.map {|l| " "*width + l}.join("\n")
167
+ text = first + (last.empty? ? "" : "\n") + last + newlines
168
+ text.chomp! if text =~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dd
169
+ text += "\n" if text !~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dt
170
+ if el.children.first.type == :p && !el.children.first.options[:transparent]
171
+ "\n#{sym}#{text}"
172
+ elsif el.children.first.type == :codeblock
173
+ "#{sym}\n #{text}"
174
+ else
175
+ "#{sym}#{text}"
176
+ end
177
+ end
178
+
179
+ def convert_dt(el, opts)
180
+ inner(el, opts) << "\n"
181
+ end
182
+
183
+ HTML_TAGS_WITH_BODY=['div', 'script', 'iframe', 'textarea']
184
+
185
+ def convert_html_element(el, opts)
186
+ markdown_attr = el.options[:category] == :block && el.children.any? do |c|
187
+ c.type != :html_element && (c.type != :p || !c.options[:transparent]) && c.options[:category] == :block
188
+ end
189
+ opts[:force_raw_text] = true if %w{script pre code}.include?(el.value)
190
+ opts[:raw_text] = opts[:force_raw_text] || opts[:block_raw_text] || (el.options[:category] != :span && !markdown_attr)
191
+ opts[:block_raw_text] = true if el.options[:category] == :block && opts[:raw_text]
192
+ res = inner(el, opts)
193
+ if el.options[:category] == :span
194
+ "<#{el.value}#{html_attributes(el)}" << (!res.empty? || HTML_TAGS_WITH_BODY.include?(el.value) ? ">#{res}</#{el.value}>" : " />")
195
+ else
196
+ output = ''
197
+ output << "<#{el.value}#{html_attributes(el)}"
198
+ output << " markdown=\"1\"" if markdown_attr
199
+ if !res.empty? && el.options[:parse_type] != :block
200
+ output << ">#{res}</#{el.value}>"
201
+ elsif !res.empty?
202
+ output << ">\n#{res}" << "</#{el.value}>"
203
+ elsif HTML_TAGS_WITH_BODY.include?(el.value)
204
+ output << "></#{el.value}>"
205
+ else
206
+ output << " />"
207
+ end
208
+ output << "\n" if @stack.last.type != :html_element || @stack.last.options[:parse_type] != :raw
209
+ output
210
+ end
211
+ end
212
+
213
+ def convert_xml_comment(el, opts)
214
+ if el.options[:category] == :block && (@stack.last.type != :html_element || @stack.last.options[:parse_type] != :raw)
215
+ el.value + "\n"
216
+ else
217
+ el.value
218
+ end
219
+ end
220
+ alias :convert_xml_pi :convert_xml_comment
221
+ alias :convert_html_doctype :convert_xml_comment
222
+
223
+ def convert_table(el, opts)
224
+ opts[:alignment] = el.options[:alignment]
225
+ inner(el, opts)
226
+ end
227
+
228
+ def convert_thead(el, opts)
229
+ rows = inner(el, opts)
230
+ if opts[:alignment].all? {|a| a == :default}
231
+ "#{rows}|" + "-"*10 + "\n"
232
+ else
233
+ "#{rows}| " + opts[:alignment].map do |a|
234
+ case a
235
+ when :left then ":-"
236
+ when :right then "-:"
237
+ when :center then ":-:"
238
+ when :default then "-"
239
+ end
240
+ end.join(' ') + "\n"
241
+ end
242
+ end
243
+
244
+ def convert_tbody(el, opts)
245
+ res = ''
246
+ res << inner(el, opts)
247
+ res << '|' << '-'*10 << "\n" if opts[:next] && opts[:next].type == :tbody
248
+ res
249
+ end
250
+
251
+ def convert_tfoot(el, opts)
252
+ "|" + "="*10 + "\n#{inner(el, opts)}"
253
+ end
254
+
255
+ def convert_tr(el, opts)
256
+ "| " + el.children.map {|c| convert(c, opts)}.join(" | ") + " |\n"
257
+ end
258
+
259
+ def convert_td(el, opts)
260
+ inner(el, opts).gsub(/\|/, '\\|')
261
+ end
262
+ alias :convert_th :convert_td
263
+
264
+ def convert_comment(el, opts)
265
+ if el.options[:category] == :block
266
+ "{::comment}\n#{el.value}\n{:/}\n"
267
+ else
268
+ "{::comment}#{el.value}{:/}"
269
+ end
270
+ end
271
+
272
+ def convert_br(el, opts)
273
+ " \n"
274
+ end
275
+
276
+ def convert_a(el, opts)
277
+ if el.attr['href'].empty?
278
+ "[#{inner(el, opts)}]()"
279
+ elsif el.attr['href'] =~ /^(?:http|ftp)/ || el.attr['href'].count("()") > 0
280
+ index = if link_el = @linkrefs.find {|c| c.attr['href'] == el.attr['href']}
281
+ @linkrefs.index(link_el) + 1
282
+ else
283
+ @linkrefs << el
284
+ @linkrefs.size
285
+ end
286
+ "[#{inner(el, opts)}][#{index}]"
287
+ else
288
+ title = el.attr['title'].to_s.empty? ? '' : ' "' + el.attr['title'].gsub(/"/, "&quot;") + '"'
289
+ "[#{inner(el, opts)}](#{el.attr['href']}#{title})"
290
+ end
291
+ end
292
+
293
+ def convert_img(el, opts)
294
+ if el.attr['src'].empty?
295
+ "![#{el.attr['alt']}]()"
296
+ else
297
+ title = (el.attr['title'] ? ' "' + el.attr['title'].gsub(/"/, "&quot;") + '"' : '')
298
+ link = if el.attr['src'].count("()") > 0
299
+ "<#{el.attr['src']}>"
300
+ else
301
+ el.attr['src']
302
+ end
303
+ "![#{el.attr['alt']}](#{link}#{title})"
304
+ end
305
+ end
306
+
307
+ def convert_codespan(el, opts)
308
+ delim = (el.value.scan(/`+/).max || '') + '`'
309
+ "#{delim}#{' ' if delim.size > 1}#{el.value}#{' ' if delim.size > 1}#{delim}"
310
+ end
311
+
312
+ def convert_footnote(el, opts)
313
+ @footnotes << [el.options[:name], @doc.parse_infos[:footnotes][el.options[:name]]]
314
+ "[^#{el.options[:name]}]"
315
+ end
316
+
317
+ def convert_raw(el, opts)
318
+ attr = (el.options[:type] || []).join(' ')
319
+ attr = " type=\"#{attr}\"" if attr.length > 0
320
+ if @stack.last.type == :html_element
321
+ el.value
322
+ elsif el.options[:category] == :block
323
+ "{::nomarkdown#{attr}}\n#{el.value}\n{:/}\n"
324
+ else
325
+ "{::nomarkdown#{attr}}#{el.value}{:/}"
326
+ end
327
+ end
328
+
329
+ def convert_em(el, opts)
330
+ "*#{inner(el, opts)}*"
331
+ end
332
+
333
+ def convert_strong(el, opts)
334
+ "**#{inner(el, opts)}**"
335
+ end
336
+
337
+ def convert_entity(el, opts)
338
+ entity_to_str(el.value, el.options[:original])
339
+ end
340
+
341
+ TYPOGRAPHIC_SYMS = {
342
+ :mdash => '---', :ndash => '--', :hellip => '...',
343
+ :laquo_space => '<< ', :raquo_space => ' >>',
344
+ :laquo => '<<', :raquo => '>>'
345
+ }
346
+ def convert_typographic_sym(el, opts)
347
+ TYPOGRAPHIC_SYMS[el.value]
348
+ end
349
+
350
+ def convert_smart_quote(el, opts)
351
+ el.value.to_s =~ /[rl]dquo/ ? "\"" : "'"
352
+ end
353
+
354
+ def convert_math(el, opts)
355
+ (@stack.last.type == :p && opts[:prev].nil? ? "\\" : '') + "$$#{el.value}$$" + (el.options[:category] == :block ? "\n" : '')
356
+ end
357
+
358
+ def convert_abbreviation(el, opts)
359
+ el.value
360
+ end
361
+
362
+ def convert_root(el, opts)
363
+ res = inner(el, opts)
364
+ res << create_link_defs
365
+ res << create_footnote_defs
366
+ res << create_abbrev_defs
367
+ res
368
+ end
369
+
370
+ def create_link_defs
371
+ res = ''
372
+ res << "\n\n" if @linkrefs.size > 0
373
+ @linkrefs.each_with_index do |el, i|
374
+ title = el.attr['title']
375
+ res << "[#{i+1}]: #{el.attr['href']} #{title ? '"' + title.gsub(/"/, "&quot;") + '"' : ''}\n"
376
+ end
377
+ res
378
+ end
379
+
380
+ def create_footnote_defs
381
+ res = ''
382
+ @footnotes.each do |name, data|
383
+ res << "[^#{name}]:\n"
384
+ res << inner(data[:content]).chomp.split(/\n/).map {|l| " #{l}"}.join("\n") + "\n\n"
385
+ end
386
+ res
387
+ end
388
+
389
+ def create_abbrev_defs
390
+ return '' unless @doc.parse_infos[:abbrev_defs]
391
+ res = ''
392
+ @doc.parse_infos[:abbrev_defs].each do |name, text|
393
+ res << "*[#{name}]: #{text}\n"
394
+ end
395
+ res
396
+ end
397
+
398
+ # Return the IAL containing the attributes of the element +el+.
399
+ def ial_for_element(el)
400
+ res = el.attr.map do |k,v|
401
+ next if [:img, :a].include?(el.type) && ['href', 'src', 'alt', 'title'].include?(k)
402
+ next if el.type == :header && k == 'id'
403
+ if v.nil?
404
+ ''
405
+ elsif k == 'class'
406
+ " " + v.split(/\s+/).map {|w| ".#{w}"}.join(" ")
407
+ elsif k == 'id'
408
+ " ##{v}"
409
+ else
410
+ " #{k}=\"#{v.to_s}\""
411
+ end
412
+ end.compact.join('')
413
+ res = "toc" + (res.strip.empty? ? '' : " #{res}") if (el.type == :ul || el.type == :ol) &&
414
+ (el.options[:ial][:refs].include?('toc') rescue nil)
415
+ res.strip.empty? ? nil : "{:#{res}}"
416
+ end
417
+
418
+ end
419
+
420
+ end
421
+ end