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
@@ -3,6 +3,1165 @@
3
3
  * Table of contents
4
4
  {:toc}
5
5
 
6
+ ## 3.0.23
7
+
8
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.23).
9
+
10
+ * Fix the error message for unloadable modules when running the executables under Ruby 1.9.2.
11
+
12
+ ### `@charset` Change
13
+
14
+ The behavior of `@charset` has changed in version 3.0.23
15
+ in order to work around a bug in Safari,
16
+ where `@charset` declarations placed anywhere other than the beginning of the document
17
+ cause some CSS rules to be ignored.
18
+ This change also makes `@charset`s in imported files behave in a more useful way.
19
+
20
+ #### Ruby 1.9
21
+
22
+ When using Ruby 1.9, which keeps track of the character encoding of the Sass document internally,
23
+ `@charset` directive in the Sass stylesheet and any stylesheets it imports
24
+ are no longer directly output to the generated CSS.
25
+ They're still used for determining the encoding of the input and output stylesheets,
26
+ but they aren't rendered in the same way other directives are.
27
+
28
+ Instead, Sass adds a single `@charset` directive at the beginning of the output stylesheet
29
+ if necessary, whether or not the input stylesheet had a `@charset` directive.
30
+ It will add this directive if and only if the output stylesheet contains non-ASCII characters.
31
+ By default, the declared charset will be UTF-8,
32
+ but if the Sass stylesheet declares a different charset then that will be used instead if possible.
33
+
34
+ One important consequence of this scheme is that it's possible for a Sass file
35
+ to import partials with different encodings (e.g. one encoded as UTF-8 and one as IBM866).
36
+ The output will then be UTF-8, unless the importing stylesheet
37
+ declares a different charset.
38
+
39
+ #### Ruby 1.8
40
+
41
+ Ruby 1.8 doesn't have good support for encodings, so it uses a simpler but less accurate
42
+ scheme for figuring out what `@charset` declaration to use for the output stylesheet.
43
+ It just takes the first `@charset` declaration to appear in the stylesheet
44
+ or any of its imports and moves it to the beginning of the document.
45
+ This means that under Ruby 1.8 it's *not* safe to import files with different encodings.
46
+
47
+ ## 3.0.22
48
+
49
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.22).
50
+
51
+ * Remove `vendor/sass`, which snuck into the gem by mistake
52
+ and was causing trouble for Heroku users (thanks to [Jacques Crocker](http://railsjedi.com/)).
53
+
54
+ * `sass-convert` now understands better when it's acceptable
55
+ to remove parentheses from expressions.
56
+
57
+ ## 3.0.21
58
+
59
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.21).
60
+
61
+ * Fix the permissions errors for good.
62
+
63
+ * Fix more `#options` attribute errors.
64
+
65
+ ## 3.0.20
66
+
67
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.20).
68
+
69
+ * Fix some permissions errors.
70
+
71
+ * Fix `#options` attribute errors when CSS functions were used with commas.
72
+
73
+ ## 3.0.19
74
+
75
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.19).
76
+
77
+ * Make the alpha value for `rgba` colors respect {Sass::Script::Number::PRECISION}.
78
+
79
+ * Remove all newlines in selectors in `:compressed` mode.
80
+
81
+ * Make color names case-insensitive.
82
+
83
+ * Properly detect SCSS files when using `sass -c`.
84
+
85
+ * Remove spaces after commas in `:compressed` mode.
86
+
87
+ * Allow the `--unix-newlines` flag to work on Unix, where it's a no-op.
88
+
89
+ ## 3.0.18
90
+
91
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.18).
92
+
93
+ * Don't require `rake` in the gemspec, for bundler compatibility under
94
+ JRuby. Thanks to [Gordon McCreight](http://www.gmccreight.com/blog).
95
+
96
+ * Add a command-line option `--stop-on-error` that causes Sass to exit
97
+ when a file fails to compile using `--watch` or `--update`.
98
+
99
+ * Fix a bug in `haml_tag` that would allow duplicate attributes to be added
100
+ and make `data-` attributes not work.
101
+
102
+ * Get rid of the annoying RDoc errors on install.
103
+
104
+ * Disambiguate references to the `Rails` module when `haml-rails` is installed.
105
+
106
+ * Allow `@import` in SCSS to import multiple files in the same `@import` rule.
107
+
108
+ ## 3.0.17
109
+
110
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.17).
111
+
112
+ * Disallow `#{}` interpolation in `@media` queries or unrecognized directives.
113
+ This was never allowed, but now it explicitly throws an error
114
+ rather than just producing invalid CSS.
115
+
116
+ * Make `sass --watch` not throw an error when passed a single file or directory.
117
+
118
+ * Understand that mingw counts as Windows.
119
+
120
+ * Make `sass --update` return a non-0 exit code if one or more files being updated
121
+ contained an error.
122
+
123
+ ## 3.0.16
124
+
125
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.16).
126
+
127
+ * Fix a bug where certain sorts of comments would get improperly
128
+ rendered in the `:compact` style.
129
+
130
+ * Always allow a trailing `*/` in loud comments in the indented syntax.
131
+
132
+ * Fix a performance issue with SCSS parsing in rare cases.
133
+ Thanks to [Chris Eppstein](http://chriseppstein.github.com).
134
+
135
+ * Use better heuristics for figuring out when someone might be using
136
+ the wrong syntax with `sass --watch`.
137
+
138
+ ## 3.0.15
139
+
140
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.15).
141
+
142
+ * Fix a bug where `sass --watch` and `sass --update` were completely broken.
143
+
144
+ * Allow `@import`ed values to contain commas.
145
+
146
+ ## 3.0.14
147
+
148
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.14).
149
+
150
+ * Properly parse paths with drive letters on Windows (e.g. `C:\Foo\Bar.sass`)
151
+ in the Sass executable.
152
+
153
+ * Compile Sass files in a deterministic order.
154
+
155
+ * Fix a bug where comments after `@if` statements in SCSS
156
+ weren't getting passed through to the output document.
157
+
158
+ ## 3.0.13
159
+
160
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.13).
161
+
162
+ ## CSS `@import` Directives
163
+
164
+ Sass is now more intelligent about when to compile `@import` directives to plain CSS.
165
+ Any of the following conditions will cause a literal CSS `@import`:
166
+
167
+ * Importing a path with a `.css` extension (e.g. `@import "foo.css"`).
168
+ * Importing a path with a media type (e.g. `@import "foo" screen;`).
169
+ * Importing an HTTP path (e.g. `@import "http://foo.com/style.css"`).
170
+ * Importing any URL (e.g. `@import url(foo)`).
171
+
172
+ The former two conditions always worked, but the latter two are new.
173
+
174
+ ## `-moz-calc` Support
175
+
176
+ The new [`-moz-calc()` function](http://hacks.mozilla.org/2010/06/css3-calc/) in Firefox 4
177
+ will now be properly parsed by Sass.
178
+ `calc()` was already supported, but because the parsing rules are different
179
+ than for normal CSS functions, this had to be expanded to include `-moz-calc`.
180
+
181
+ In anticipation of wider browser support, in fact,
182
+ *any* function named `-*-calc` (such as `-webkit-calc` or `-ms-calc`)
183
+ will be parsed the same as the `calc` function.
184
+
185
+ ## `:-moz-any` Support
186
+
187
+ The [`:-moz-any` pseudoclass selector](http://hacks.mozilla.org/2010/05/moz-any-selector-grouping/)
188
+ is now parsed by Sass.
189
+
190
+ ## `--require` Flag
191
+
192
+ The Sass command-line executable can now require Ruby files
193
+ using the `--require` flag (or `-r` for short).
194
+
195
+ ## Rails Support
196
+
197
+ Make sure the default Rails options take precedence over the default non-Rails options.
198
+ This makes `./script/server --daemon` work again.
199
+
200
+ ### Rails 3 Support
201
+
202
+ Support for Rails 3 versions prior to beta 4 has been removed.
203
+ Upgrade to Rails 3.0.0.beta4 if you haven't already.
204
+
205
+ ## 3.0.12
206
+
207
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.12).
208
+
209
+ ## Rails 3 Support
210
+
211
+ Apparently the last version broke in new and exciting ways under Rails 3,
212
+ due to the inconsistent load order caused by certain combinations of gems.
213
+ 3.0.12 hacks around that inconsistency, and *should* be fully Rails 3-compatible.
214
+
215
+ ### Deprecated: Rails 3 Beta 3
216
+
217
+ Haml's support for Rails 3.0.0.beta.3 has been deprecated.
218
+ Haml 3.0.13 will only support 3.0.0.beta.4.
219
+
220
+ ## 3.0.11
221
+
222
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.11).
223
+
224
+ There were no changes made to Haml between versions 3.0.10 and 3.0.11.
225
+
226
+ ## Rails 3 Support
227
+
228
+ Make sure Sass *actually* regenerates stylesheets under Rails 3.
229
+ The fix in 3.0.10 didn't work because the Rack stack we were modifying
230
+ wasn't reloaded at the proper time.
231
+
232
+ ## Bug Fixes
233
+
234
+ * Give a decent error message when `--recursive` is used
235
+ in `sass-convert` without a directory.
236
+
237
+ ## 3.0.10
238
+
239
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.10).
240
+
241
+ ### Appengine-JRuby Support
242
+
243
+ The way we determine the location of the Haml installation
244
+ no longer breaks the version of JRuby
245
+ used by [`appengine-jruby`](http://code.google.com/p/appengine-jruby/).
246
+
247
+ ### Rails 3 Support
248
+
249
+ Sass will regenerate stylesheets under Rails 3
250
+ even when no controllers are being accessed.
251
+
252
+ ### Other Improvements
253
+
254
+ * When using `sass-convert --from sass2 --to sass --recursive`,
255
+ suggest the use of `--in-place` as well.
256
+
257
+ ## 3.0.9
258
+
259
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.9).
260
+
261
+ There were no changes made to Sass between versions 3.0.8 and 3.0.9.
262
+ A bug in Gemcutter caused the gem to be uploaded improperly.
263
+
264
+ ## 3.0.8
265
+
266
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.8).
267
+
268
+ * Fix a bug with Rails versions prior to Rails 3.
269
+
270
+ ## 3.0.7
271
+
272
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.7).
273
+
274
+ ### Encoding Support
275
+
276
+ Sass 3.0.7 adds support for `@charset` for declaring the encoding of a stylesheet.
277
+ For details see {file:SASS_REFERENCE.md#encodings the reference}.
278
+
279
+ The `sass` and `sass-convert` executables also now take an `-E` option
280
+ for specifying the encoding of Sass/SCSS/CSS files.
281
+
282
+ ### Bug Fixes
283
+
284
+ * When compiling a file named `.sass` but with SCSS syntax specified,
285
+ use the latter (and vice versa).
286
+
287
+ * Fix a bug where interpolation would cause some selectors to render improperly.
288
+
289
+ * If a line in a Sass comment starts with `*foo`,
290
+ render it as `*foo` rather than `* *foo`.
291
+
292
+ ## 3.0.6
293
+
294
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.6).
295
+
296
+ There were no changes made to Sass between versions 3.0.5 and 3.0.6.
297
+
298
+ ## 3.0.5
299
+
300
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.5).
301
+
302
+ ### `#{}` Interpolation in Properties
303
+
304
+ Previously, using `#{}` in some places in properties
305
+ would cause a syntax error.
306
+ Now it can be used just about anywhere.
307
+
308
+ Note that when `#{}` is used near operators like `/`,
309
+ those operators are treated as plain CSS
310
+ rather than math operators.
311
+ For example:
312
+
313
+ p {
314
+ $font-size: 12px;
315
+ $line-height: 30px;
316
+ font: #{$font-size}/#{$line-height};
317
+ }
318
+
319
+ is compiled to:
320
+
321
+ p {
322
+ font: 12px/30px;
323
+ }
324
+
325
+ This is useful, since normally {file:SASS_REFERENCE.md#division-and-slash
326
+ a slash with variables is treated as division}.
327
+
328
+ ### Recursive Mixins
329
+
330
+ Mixins that include themselves will now print
331
+ much more informative error messages.
332
+ For example:
333
+
334
+ @mixin foo {@include bar}
335
+ @mixin bar {@include foo}
336
+ @include foo
337
+
338
+ will print:
339
+
340
+ An @include loop has been found:
341
+ foo includes bar
342
+ bar includes foo
343
+
344
+ Although it was previously possible to use recursive mixins
345
+ without causing infinite looping, this is now disallowed,
346
+ since there's no good reason to do it.
347
+
348
+ ### Rails 3 Support
349
+
350
+ Fix Sass configuration under Rails 3.
351
+ Thanks [Dan Cheail](http://github.com/codeape).
352
+
353
+ ### `sass --no-cache`
354
+
355
+ Make the `--no-cache` flag properly forbid Sass from writing `.sass-cache` files.
356
+
357
+ ## 3.0.4
358
+
359
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.4).
360
+
361
+ * Raise an informative error when function arguments have a mispaced comma,
362
+ as in `foo(bar, )`.
363
+
364
+ * Fix a performance problem when using long function names
365
+ such as `-moz-linear-gradient`.
366
+
367
+ ## 3.0.3
368
+
369
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.3).
370
+
371
+ ### Rails 3 Support
372
+
373
+ Make sure Sass is loaded properly when using Rails 3
374
+ along with non-Rails-3-compatible plugins like some versions of `will_paginate`.
375
+
376
+ Also, In order to make some Rails loading errors like the above easier to debug,
377
+ Sass will now raise an error if `Rails.root` is `nil` when Sass is loading.
378
+ Previously, this would just cause the paths to be mis-set.
379
+
380
+ ### Merb Support
381
+
382
+ Merb, including 1.1.0 as well as earlier versions,
383
+ should *really* work with this release.
384
+
385
+ ### Bug Fixes
386
+
387
+ * Raise an informative error when mixin arguments have a mispaced comma,
388
+ as in `@include foo(bar, )`.
389
+
390
+ * Make sure SassScript subtraction happens even when nothing else dynamic is going on.
391
+
392
+ * Raise an error when colors are used with the wrong number of digits.
393
+
394
+ ## 3.0.2
395
+
396
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.2).
397
+
398
+ ### Merb 1.1.0 Support
399
+
400
+ Fixed a bug inserting the Sass plugin into the Merb 1.1.0 Rack application.
401
+
402
+ ### Bug Fixes
403
+
404
+ * Allow identifiers to begin with multiple underscores.
405
+
406
+ * Don't raise an error when using `haml --rails` with older Rails versions.
407
+
408
+ ## 3.0.1
409
+
410
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.1).
411
+
412
+ ### Installation in Rails
413
+
414
+ `haml --rails` is no longer necessary for installing Sass in Rails.
415
+ Now all you need to do is add `gem "haml"` to the Gemfile for Rails 3,
416
+ or add `config.gem "haml"` to `config/environment.rb` for previous versions.
417
+
418
+ `haml --rails` will still work,
419
+ but it has been deprecated and will print an error message.
420
+ It will not work in the next version of Sass.
421
+
422
+ ### Rails 3 Beta Integration
423
+
424
+ * Make sure manually importing the Sass Rack plugin still works with Rails,
425
+ even though it's not necessary now.
426
+
427
+ * Allow Sass to be configured in Rails even when it's being lazy-loaded.
428
+
429
+ ### `:template_location` Methods
430
+
431
+ The {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
432
+ can be either a String, a Hash, or an Array.
433
+ This makes it difficult to modify or use with confidence.
434
+ Thus, three new methods have been added for handling it:
435
+
436
+ * {Sass::Plugin#template_location_array} --
437
+ Returns the template locations and CSS locations formatted as an array.
438
+
439
+ * {Sass::Plugin#add_template_location} --
440
+ Converts the template location option to an array and adds a new location.
441
+
442
+ * {Sass::Plugin#remove_template_location} --
443
+ Converts the template location option to an array and removes an existing location.
444
+
445
+ ## 3.0.0
446
+ {#3-0-0}
447
+
448
+ [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0).
449
+
450
+ ### Deprecations -- Must Read!
451
+ {#3-0-0-deprecations}
452
+
453
+ * Using `=` for SassScript properties and variables is deprecated,
454
+ and will be removed in Sass 3.2.
455
+ Use `:` instead.
456
+ See also [this changelog entry](#3-0-0-sass-script-context)
457
+
458
+ * Because of the above, property values using `:`
459
+ will be parsed more thoroughly than they were before.
460
+ Although all valid CSS3 properties
461
+ as well as most hacks and proprietary syntax should be supported,
462
+ it's possible that some properties will break.
463
+ If this happens, please report it to [the Sass mailing list](http://groups.google.com/group/haml).
464
+
465
+ * In addition, setting the default value of variables
466
+ with `||=` is now deprecated
467
+ and will be removed in Sass 3.2.
468
+ Instead, add `!default` to the end of the value.
469
+ See also [this changelog entry](#3-0-0-default-flag)
470
+
471
+ * The `!` prefix for variables is deprecated,
472
+ and will be removed in Sass 3.2.
473
+ Use `$` as a prefix instead.
474
+ See also [this changelog entry](#3-0-0-dollar-prefix).
475
+
476
+ * The `css2sass` command-line tool has been deprecated,
477
+ and will be removed in Sass 3.2.
478
+ Use the new `sass-convert` tool instead.
479
+ See also [this changelog entry](#3-0-0-sass-convert).
480
+
481
+ * Selector parent references using `&` can now only be used
482
+ where element names are valid.
483
+ This is because Sass 3 fully parses selectors
484
+ to support the new [`@extend` directive](#3-0-0-extend),
485
+ and it's possible that the `&` could be replaced by an element name.
486
+
487
+ ### SCSS (Sassy CSS)
488
+
489
+ Sass 3 introduces a new syntax known as SCSS
490
+ which is fully compatible with the syntax of CSS3,
491
+ while still supporting the full power of Sass.
492
+ This means that every valid CSS3 stylesheet
493
+ is a valid SCSS file with the same meaning.
494
+ In addition, SCSS understands most CSS hacks
495
+ and vendor-specific syntax, such as [IE's old `filter` syntax](http://msdn.microsoft.com/en-us/library/ms533754%28VS.85%29.aspx).
496
+
497
+ SCSS files use the `.scss` extension.
498
+ They can import `.sass` files, and vice-versa.
499
+ Their syntax is fully described in the {file:SASS_REFERENCE.md Sass reference};
500
+ if you're already familiar with Sass, though,
501
+ you may prefer the {file:SCSS_FOR_SASS_USERS.md intro to SCSS for Sass users}.
502
+
503
+ Since SCSS is a much more approachable syntax for those new to Sass,
504
+ it will be used as the default syntax for the reference,
505
+ as well as for most other Sass documentation.
506
+ The indented syntax will continue to be fully supported, however.
507
+
508
+ Sass files can be converted to SCSS using the new `sass-convert` command-line tool.
509
+ For example:
510
+
511
+ # Convert a Sass file to SCSS
512
+ $ sass-convert style.sass style.scss
513
+
514
+ **Note that if you're converting a Sass file written for Sass 2**,
515
+ you should use the `--from sass2` flag.
516
+ For example:
517
+
518
+ # Convert a Sass file to SCSS
519
+ $ sass-convert --from sass2 style.sass style.scss
520
+
521
+ # Convert all Sass files to SCSS
522
+ $ sass-convert --recursive --in-place --from sass2 --to scss stylesheets/
523
+
524
+ ### Syntax Changes {#3-0-0-syntax-changes}
525
+
526
+ #### SassScript Context
527
+ {#3-0-0-sass-script-context}
528
+
529
+ The `=` character is no longer required for properties that use SassScript
530
+ (that is, variables and operations).
531
+ All properties now use SassScript automatically;
532
+ this means that `:` should be used instead.
533
+ Variables should also be set with `:`.
534
+ For example, what used to be
535
+
536
+ // Indented syntax
537
+ .page
538
+ color = 5px + 9px
539
+
540
+ should now be
541
+
542
+ // Indented syntax
543
+ .page
544
+ color: 5px + 9px
545
+
546
+ This means that SassScript is now an extension of the CSS3 property syntax.
547
+ All valid CSS3 properties are valid SassScript,
548
+ and will compile without modification
549
+ (some invalid properties work as well, such as Microsoft's proprietary `filter` syntax).
550
+ This entails a few changes to SassScript to make it fully CSS3-compatible,
551
+ which are detailed below.
552
+
553
+ This also means that Sass will now be fully parsing all property values,
554
+ rather than passing them through unchanged to the CSS.
555
+ Although care has been taken to support all valid CSS3,
556
+ as well as hacks and proprietary syntax,
557
+ it's possible that a property that worked in Sass 2 won't work in Sass 3.
558
+ If this happens, please report it to [the Sass mailing list](http://groups.google.com/group/haml).
559
+
560
+ Note that if `=` is used,
561
+ SassScript will be interpreted as backwards-compatibly as posssible.
562
+ In particular, the changes listed below don't apply in an `=` context.
563
+
564
+ The `sass-convert` command-line tool can be used
565
+ to upgrade Sass files to the new syntax using the `--in-place` flag.
566
+ For example:
567
+
568
+ # Upgrade style.sass:
569
+ $ sass-convert --in-place style.sass
570
+
571
+ # Upgrade all Sass files:
572
+ $ sass-convert --recursive --in-place --from sass2 --to sass stylesheets/
573
+
574
+ ##### Quoted Strings
575
+
576
+ Quoted strings (e.g. `"foo"`) in SassScript now render with quotes.
577
+ In addition, unquoted strings are no longer deprecated,
578
+ and render without quotes.
579
+ This means that almost all strings that had quotes in Sass 2
580
+ should not have quotes in Sass 3.
581
+
582
+ Although quoted strings render with quotes when used with `:`,
583
+ they do not render with quotes when used with `#{}`.
584
+ This allows quoted strings to be used for e.g. selectors
585
+ that are passed to mixins.
586
+
587
+ Strings can be forced to be quoted and unquoted using the new
588
+ \{Sass::Script::Functions#unquote unquote} and \{Sass::Script::Functions#quote quote}
589
+ functions.
590
+
591
+ ##### Division and `/`
592
+
593
+ Two numbers separated by a `/` character
594
+ are allowed as property syntax in CSS,
595
+ e.g. for the `font` property.
596
+ SassScript also uses `/` for division, however,
597
+ which means it must decide what to do
598
+ when it encounters numbers separated by `/`.
599
+
600
+ For CSS compatibility, SassScript does not perform division by default.
601
+ However, division will be done in almost all cases where division is intended.
602
+ In particular, SassScript will perform division
603
+ in the following three situations:
604
+
605
+ 1. If the value, or any part of it, is stored in a variable.
606
+ 2. If the value is surrounded by parentheses.
607
+ 3. If the value is used as part of another arithmetic expression.
608
+
609
+ For example:
610
+
611
+ p
612
+ font: 10px/8px
613
+ $width: 1000px
614
+ width: $width/2
615
+ height: (500px/2)
616
+ margin-left: 5px + 8px/2px
617
+
618
+ is compiled to:
619
+
620
+ p {
621
+ font: 10px/8px;
622
+ width: 500px;
623
+ height: 250px;
624
+ margin-left: 9px; }
625
+
626
+ ##### Variable Defaults
627
+
628
+ Since `=` is no longer used for variable assignment,
629
+ assigning defaults to variables with `||=` no longer makes sense.
630
+ Instead, the `!default` flag
631
+ should be added to the end of the variable value.
632
+ This syntax is meant to be similar to CSS's `!important` flag.
633
+ For example:
634
+
635
+ $var: 12px !default;
636
+
637
+ #### Variable Prefix Character
638
+ {#3-0-0-dollar-prefix}
639
+
640
+ The Sass variable character has been changed from `!`
641
+ to the more aesthetically-appealing `$`.
642
+ For example, what used to be
643
+
644
+ !width = 13px
645
+ .icon
646
+ width = !width
647
+
648
+ should now be
649
+
650
+ $width: 13px
651
+ .icon
652
+ width: $width
653
+
654
+ The `sass-convert` command-line tool can be used
655
+ to upgrade Sass files to the new syntax using the `--in-place` flag.
656
+ For example:
657
+
658
+ # Upgrade style.sass:
659
+ $ sass-convert --in-place style.sass
660
+
661
+ # Upgrade all Sass files:
662
+ $ sass-convert --recursive --in-place --from sass2 --to sass stylesheets/
663
+
664
+ `!` may still be used, but it's deprecated and will print a warning.
665
+ It will be removed in the next version of Sass, 3.2.
666
+
667
+ #### Variable and Mixin Names
668
+
669
+ SassScript variable and mixin names may now contain hyphens.
670
+ In fact, they may be any valid CSS3 identifier.
671
+ For example:
672
+
673
+ $prettiest-color: #542FA9
674
+ =pretty-text
675
+ color: $prettiest-color
676
+
677
+ In order to allow frameworks like [Compass](http://compass-style.org)
678
+ to use hyphens in variable names
679
+ while maintaining backwards-compatibility,
680
+ variables and mixins using hyphens may be referred to
681
+ with underscores, and vice versa.
682
+ For example:
683
+
684
+ $prettiest-color: #542FA9
685
+ .pretty
686
+ // Using an underscore instead of a hyphen works
687
+ color: $prettiest_color
688
+
689
+ #### Single-Quoted Strings
690
+
691
+ SassScript now supports single-quoted strings.
692
+ They behave identically to double-quoted strings,
693
+ except that single quotes need to be backslash-escaped
694
+ and double quotes do not.
695
+
696
+ #### Mixin Definition and Inclusion
697
+
698
+ Sass now supports the `@mixin` directive as a way of defining mixins (like `=`),
699
+ as well as the `@include` directive as a way of including them (like `+`).
700
+ The old syntax is *not* deprecated,
701
+ and the two are fully compatible.
702
+ For example:
703
+
704
+ @mixin pretty-text
705
+ color: $prettiest-color
706
+
707
+ a
708
+ @include pretty-text
709
+
710
+ is the same as:
711
+
712
+ =pretty-text
713
+ color: $prettiest-color
714
+
715
+ a
716
+ +pretty-text
717
+
718
+ #### Sass Properties
719
+
720
+ New-style properties (with the colon after the name) in indented syntax
721
+ now allow whitespace before the colon. For example:
722
+
723
+ foo
724
+ color : blue
725
+
726
+ #### Sass `@import`
727
+
728
+ The Sass `@import` statement now allows non-CSS files to be specified with quotes,
729
+ for similarity with the SCSS syntax. For example, `@import "foo.sass"`
730
+ will now import the `foo.sass` file, rather than compiling to `@import "foo.sass";`.
731
+
732
+ ### `@extend`
733
+ {#3-0-0-extend}
734
+
735
+ There are often cases when designing a page
736
+ when one class should have all the styles of another class,
737
+ as well as its own specific styles.
738
+ The most common way of handling this is to use both the more general class
739
+ and the more specific class in the HTML.
740
+ For example, suppose we have a design for a normal error
741
+ and also for a serious error. We might write our markup like so:
742
+
743
+ <div class="error seriousError">
744
+ Oh no! You've been hacked!
745
+ </div>
746
+
747
+ And our styles like so:
748
+
749
+ .error {
750
+ border: 1px #f00;
751
+ background-color: #fdd;
752
+ }
753
+ .seriousError {
754
+ border-width: 3px;
755
+ }
756
+
757
+ Unfortunately, this means that we have to always remember
758
+ to use `.error` with `.seriousError`.
759
+ This is a maintenance burden, leads to tricky bugs,
760
+ and can bring non-semantic style concerns into the markup.
761
+
762
+ The `@extend` directive avoids these problems
763
+ by telling Sass that one selector should inherit the styles of another selector.
764
+ For example:
765
+
766
+ .error {
767
+ border: 1px #f00;
768
+ background-color: #fdd;
769
+ }
770
+ .seriousError {
771
+ @extend .error;
772
+ border-width: 3px;
773
+ }
774
+
775
+ This means that all styles defined for `.error`
776
+ are also applied to `.seriousError`,
777
+ in addition to the styles specific to `.seriousError`.
778
+ In effect, everything with class `.seriousError` also has class `.error`.
779
+
780
+ Other rules that use `.error` will work for `.seriousError` as well.
781
+ For example, if we have special styles for errors caused by hackers:
782
+
783
+ .error.intrusion {
784
+ background-image: url("/image/hacked.png");
785
+ }
786
+
787
+ Then `<div class="seriousError intrusion">`
788
+ will have the `hacked.png` background image as well.
789
+
790
+ #### How it Works
791
+
792
+ `@extend` works by inserting the extending selector (e.g. `.seriousError`)
793
+ anywhere in the stylesheet that the extended selector (.e.g `.error`) appears.
794
+ Thus the example above:
795
+
796
+ .error {
797
+ border: 1px #f00;
798
+ background-color: #fdd;
799
+ }
800
+ .error.intrusion {
801
+ background-image: url("/image/hacked.png");
802
+ }
803
+ .seriousError {
804
+ @extend .error;
805
+ border-width: 3px;
806
+ }
807
+
808
+ is compiled to:
809
+
810
+ .error, .seriousError {
811
+ border: 1px #f00;
812
+ background-color: #fdd; }
813
+
814
+ .error.intrusion, .seriousError.intrusion {
815
+ background-image: url("/image/hacked.png"); }
816
+
817
+ .seriousError {
818
+ border-width: 3px; }
819
+
820
+ When merging selectors, `@extend` is smart enough
821
+ to avoid unnecessary duplication,
822
+ so something like `.seriousError.seriousError` gets translated to `.seriousError`.
823
+ In addition, it won't produce selectors that can't match anything, like `#main#footer`.
824
+
825
+ See also {file:SASS_REFERENCE.md#extend the `@extend` reference documentation}.
826
+
827
+ ### Colors
828
+
829
+ SassScript color values are much more powerful than they were before.
830
+ Support was added for alpha channels,
831
+ and most of Chris Eppstein's [compass-colors](http://chriseppstein.github.com/compass-colors) plugin
832
+ was merged in, providing color-theoretic functions for modifying colors.
833
+
834
+ One of the most interesting of these functions is {Sass::Script::Functions#mix mix},
835
+ which mixes two colors together.
836
+ This provides a much better way of combining colors and creating themes
837
+ than standard color arithmetic.
838
+
839
+ #### Alpha Channels
840
+
841
+ Sass now supports colors with alpha channels,
842
+ constructed via the {Sass::Script::Functions#rgba rgba}
843
+ and {Sass::Script::Functions#hsla hsla} functions.
844
+ Alpha channels are unaffected by color arithmetic.
845
+ However, the {Sass::Script::Functions#opacify opacify}
846
+ and {Sass::Script::Functions#transparentize transparentize} functions
847
+ allow colors to be made more and less opaque, respectively.
848
+
849
+ Sass now also supports functions that return the values of the
850
+ {Sass::Script::Functions#red red},
851
+ {Sass::Script::Functions#blue blue},
852
+ {Sass::Script::Functions#green green},
853
+ and {Sass::Script::Functions#alpha alpha}
854
+ components of colors.
855
+
856
+ #### HSL Colors
857
+
858
+ Sass has many new functions for using the HSL values of colors.
859
+ For an overview of HSL colors, check out [the CSS3 Spec](http://www.w3.org/TR/css3-color/#hsl-color).
860
+ All these functions work just as well on RGB colors
861
+ as on colors constructed with the {Sass::Script::Functions#hsl hsl} function.
862
+
863
+ * The {Sass::Script::Functions#lighten lighten}
864
+ and {Sass::Script::Functions#darken darken}
865
+ functions adjust the lightness of a color.
866
+
867
+ * The {Sass::Script::Functions#saturate saturate}
868
+ and {Sass::Script::Functions#desaturate desaturate}
869
+ functions adjust the saturation of a color.
870
+
871
+ * The {Sass::Script::Functions#adjust_hue adjust-hue}
872
+ function adjusts the hue of a color.
873
+
874
+ * The {Sass::Script::Functions#hue hue},
875
+ {Sass::Script::Functions#saturation saturation},
876
+ and {Sass::Script::Functions#lightness lightness}
877
+ functions return the corresponding HSL values of the color.
878
+
879
+ * The {Sass::Script::Functions#grayscale grayscale}
880
+ function converts a color to grayscale.
881
+
882
+ * The {Sass::Script::Functions#complement complement}
883
+ function returns the complement of a color.
884
+
885
+ ### Other New Functions
886
+
887
+ Several other new functions were added to make it easier to have
888
+ more flexible arguments to mixins and to enable deprecation
889
+ of obsolete APIs.
890
+
891
+ * {Sass::Script::Functions#type_of `type-of`} -- Returns the type of a value.
892
+ * {Sass::Script::Functions#unit `unit`} --
893
+ Returns the units associated with a number.
894
+ * {Sass::Script::Functions#unitless `unitless`} --
895
+ Returns whether a number has units or not.
896
+ * {Sass::Script::Functions#comparable `comparable`} --
897
+ Returns whether two numbers can be added or compared.
898
+
899
+ ### Watching for Updates
900
+ {#3-0-0-watch}
901
+
902
+ The `sass` command-line utility has a new flag: `--watch`.
903
+ `sass --watch` monitors files or directories for updated Sass files
904
+ and compiles those files to CSS automatically.
905
+ This will allow people not using Ruby or [Compass](http://compass-style.org)
906
+ to use Sass without having to manually recompile all the time.
907
+
908
+ Here's the syntax for watching a directory full of Sass files:
909
+
910
+ sass --watch app/stylesheets:public/stylesheets
911
+
912
+ This will watch every Sass file in `app/stylesheets`.
913
+ Whenever one of them changes,
914
+ the corresponding CSS file in `public/stylesheets` will be regenerated.
915
+ Any files that import that file will be regenerated, too.
916
+
917
+ The syntax for watching individual files is the same:
918
+
919
+ sass --watch style.sass:out.css
920
+
921
+ You can also omit the output filename if you just want it to compile to name.css.
922
+ For example:
923
+
924
+ sass --watch style.sass
925
+
926
+ This will update `style.css` whenever `style.sass` changes.
927
+
928
+ You can list more than one file and/or directory,
929
+ and all of them will be watched:
930
+
931
+ sass --watch foo/style:public/foo bar/style:public/bar
932
+ sass --watch screen.sass print.sass awful-hacks.sass:ie.css
933
+ sass --watch app/stylesheets:public/stylesheets public/stylesheets/test.sass
934
+
935
+ File and directory watching is accessible from Ruby,
936
+ using the {Sass::Plugin#watch} function.
937
+
938
+ #### Bulk Updating
939
+
940
+ Another new flag for the `sass` command-line utility is `--update`.
941
+ It checks a group of Sass files to see if their CSS needs to be updated,
942
+ and updates if so.
943
+
944
+ The syntax for `--update` is just like watch:
945
+
946
+ sass --update app/stylesheets:public/stylesheets
947
+ sass --update style.sass:out.css
948
+ sass --watch screen.sass print.sass awful-hacks.sass:ie.css
949
+
950
+ In fact, `--update` work exactly the same as `--watch`,
951
+ except that it doesn't continue watching the files
952
+ after the first check.
953
+
954
+ ### `sass-convert` (née `css2sass`) {#3-0-0-sass-convert}
955
+
956
+ The `sass-convert` tool, which used to be known as `css2sass`,
957
+ has been greatly improved in various ways.
958
+ It now uses a full-fledged CSS3 parser,
959
+ so it should be able to handle any valid CSS3,
960
+ as well as most hacks and proprietary syntax.
961
+
962
+ `sass-convert` can now convert between Sass and SCSS.
963
+ This is normally inferred from the filename,
964
+ but it can also be specified using the `--from` and `--to` flags.
965
+ For example:
966
+
967
+ $ generate-sass | sass-convert --from sass --to scss | consume-scss
968
+
969
+ It's also now possible to convert a file in-place --
970
+ that is, overwrite the old file with the new file.
971
+ This is useful for converting files in the [Sass 2 syntax](#3-0-0-deprecations)
972
+ to the new Sass 3 syntax,
973
+ e.g. by doing `sass-convert --in-place --from sass2 style.sass`.
974
+
975
+ #### `--recursive`
976
+
977
+ The `--recursive` option allows `sass-convert` to convert an entire directory of files.
978
+ `--recursive` requires both the `--from` and `--to` flags to be specified.
979
+ For example:
980
+
981
+ # Convert all .sass files in stylesheets/ to SCSS.
982
+ # "sass2" means that these files are assumed to use the Sass 2 syntax.
983
+ $ sass-convert --recursive --from sass2 --to scss stylesheets/
984
+
985
+ #### `--dasherize`
986
+
987
+ The `--dasherize` options converts all underscores to hyphens,
988
+ which are now allowed as part of identifiers in Sass.
989
+ Note that since underscores may still be used in place of hyphens
990
+ when referring to mixins and variables,
991
+ this won't cause any backwards-incompatibilities.
992
+
993
+ #### Convert Less to SCSS
994
+
995
+ `sass-convert` can also convert [Less](http://lesscss.org) files
996
+ to SCSS (or the indented syntax, although I anticipate less interest in that).
997
+ For example:
998
+
999
+ # Convert all .less files in the current directory into .scss files
1000
+ sass-convert --from less --to scss --recursive .
1001
+
1002
+ This is done using the Less parser, so it requires that the `less` RubyGem be installed.
1003
+
1004
+ ##### Incompatibilities
1005
+
1006
+ Because of the reasonably substantial differences between Sass and Less,
1007
+ there are some things that can't be directly translated,
1008
+ and one feature that can't be translated at all.
1009
+ In the tests I've run on open-source Less stylesheets,
1010
+ none of these have presented issues, but it's good to be aware of them.
1011
+
1012
+ First, Less doesn't distinguish fully between mixins and selector inheritance.
1013
+ In Less, all classes and some other selectors may be used as mixins,
1014
+ alongside more Sass-like mixins.
1015
+ If a class is being used as a mixin,
1016
+ it may also be used directly in the HTML,
1017
+ so it's not safe to translate it into a Sass mixin.
1018
+ What `sass-convert` does instead is leave the class in the stylesheet as a class,
1019
+ and use {file:SASS_REFERENCE.md#extend `@extend`}
1020
+ rather than {file:SASS_REFERENCE.md#including_a_mixin `@include`}
1021
+ to take on the styles of that class.
1022
+ Although `@extend` and mixins work quite differently,
1023
+ using `@extend` here doesn't actually seem to make a difference in practice.
1024
+
1025
+ Another issue with Less mixins is that Less allows nested selectors
1026
+ (such as `.body .button` or `.colors > .teal`) to be used
1027
+ as a means of "namespacing" mixins.
1028
+ Sass's `@extend` doesn't work that way,
1029
+ so it does away with the namespacing and just extends the base class
1030
+ (so `.colors > .teal` becomes simply `@extend .teal`).
1031
+ In practice, this feature doesn't seem to be widely-used,
1032
+ but `sass-convert` will print a warning and leave a comment
1033
+ when it encounters it just in case.
1034
+
1035
+ Finally, Less has the ability to directly access variables and property values
1036
+ defined in other selectors, which Sass does not support.
1037
+ Whenever such an accessor is used,
1038
+ `sass-convert` will print a warning
1039
+ and comment it out in the SCSS output.
1040
+ Like namespaced mixins, though,
1041
+ this does not seem to be a widely-used feature.
1042
+
1043
+ ### `@warn` Directive
1044
+
1045
+ A new directive `@warn` has been added that allows Sass libraries to emit warnings.
1046
+ This can be used to issue deprecation warnings, discourage sloppy use of mixins, etc.
1047
+ `@warn` takes a single argument: a SassScript expression that will be
1048
+ displayed on the console along with a stylesheet trace for locating the warning.
1049
+ For example:
1050
+
1051
+ @mixin blue-text {
1052
+ @warn "The blue-text mixin is deprecated. Use new-blue-text instead.";
1053
+ color: #00f;
1054
+ }
1055
+
1056
+ Warnings may be silenced with the new `--quiet` command line option,
1057
+ or the corresponding {file:SASS_REFERENCE.md#quiet-option `:quiey` Sass option}.
1058
+ This option will also affect warnings printed by Sass itself.
1059
+ Warnings are off by default in the Rails, Rack, and Merb production environments.
1060
+
1061
+ ### Sass::Plugin API
1062
+
1063
+ {Sass::Plugin} now has a large collection of callbacks that allow users
1064
+ to run code when various actions are performed.
1065
+ For example:
1066
+
1067
+ Sass::Plugin.on_updating_stylesheet do |template, css|
1068
+ puts "#{template} has been compiled to #{css}!"
1069
+ end
1070
+
1071
+ For a full list of callbacks and usage notes, see the {Sass::Plugin} documentation.
1072
+
1073
+ {Sass::Plugin} also has a new method,
1074
+ {Sass::Plugin#force_update_stylesheets force_update_stylesheets}.
1075
+ This works just like {Sass::Plugin#update_stylesheets},
1076
+ except that it doesn't check modification times and doesn't use the cache;
1077
+ all stylesheets are always compiled anew.
1078
+
1079
+ ### Output Formatting
1080
+
1081
+ Properties with a value and *also* nested properties
1082
+ are now rendered with the nested properties indented.
1083
+ For example:
1084
+
1085
+ margin: auto
1086
+ top: 10px
1087
+ bottom: 20px
1088
+
1089
+ is now compiled to:
1090
+
1091
+ margin: auto;
1092
+ margin-top: 10px;
1093
+ margin-bottom: 20px;
1094
+
1095
+ #### `:compressed` Style
1096
+
1097
+ When the `:compressed` style is used,
1098
+ colors will be output as the minimal possible representation.
1099
+ This means whichever is smallest of the HTML4 color name
1100
+ and the hex representation (shortened to the three-letter version if possible).
1101
+
1102
+ ### Stylesheet Updating Speed
1103
+
1104
+ Several caching layers were added to Sass's stylesheet updater.
1105
+ This means that it should run significantly faster.
1106
+ This benefit will be seen by people using Sass in development mode
1107
+ with Rails, Rack, and Merb,
1108
+ as well as people using `sass --watch` from the command line,
1109
+ and to a lesser (but still significant) extent `sass --update`.
1110
+ Thanks to [thedarkone](http://github.com/thedarkone).
1111
+
1112
+ ### Error Backtraces
1113
+
1114
+ Numerous bugs were fixed with the backtraces given for Sass errors,
1115
+ especially when importing files and using mixins.
1116
+ All imports and mixins will now show up in the Ruby backtrace,
1117
+ with the proper filename and line number.
1118
+
1119
+ In addition, when the `sass` executable encounters an error,
1120
+ it now prints the filename where the error occurs,
1121
+ as well as a backtrace of Sass imports and mixins.
1122
+
1123
+ ### Ruby 1.9 Support
1124
+
1125
+ * Sass and `css2sass` now produce more descriptive errors
1126
+ when given a template with invalid byte sequences for that template's encoding,
1127
+ including the line number and the offending character.
1128
+
1129
+ * Sass and `css2sass` now accept Unicode documents with a
1130
+ [byte-order-mark](http://en.wikipedia.org/wiki/Byte_order_mark).
1131
+
1132
+ ### Firebug Support
1133
+
1134
+ A new {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option}
1135
+ has been added that emits line-number and filename information
1136
+ to the CSS file in a browser-readable format.
1137
+ This can be used with the new [FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988)
1138
+ to report the Sass filename and line number for generated CSS files.
1139
+
1140
+ This is also available via the `--debug-info` command-line flag.
1141
+
1142
+ ### Minor Improvements
1143
+
1144
+ * If a CSS or Sass function is used that has the name of a color,
1145
+ it will now be parsed as a function rather than as a color.
1146
+ For example, `fuchsia(12)` now renders as `fuchsia(12)`
1147
+ rather than `fuchsia 12`,
1148
+ and `tealbang(12)` now renders as `tealbang(12)`
1149
+ rather than `teal bang(12)`.
1150
+
1151
+ * The Sass Rails and Merb plugins now use Rack middleware by default.
1152
+
1153
+ * Haml is now compatible with the [Rip](http://hellorip.com/) package management system.
1154
+ Thanks to [Josh Peek](http://joshpeek.com/).
1155
+
1156
+ * Indented-syntax `/*` comments may now include `*` on lines beyond the first.
1157
+
1158
+ * A {file:SASS_REFERENCE.md#read_cache-option `:read_cache`} option has been added
1159
+ to allow the Sass cache to be read from but not written to.
1160
+
1161
+ * Stylesheets are no longer checked during each request
1162
+ when running tests in Rails.
1163
+ This should speed up some tests significantly.
1164
+
6
1165
  ## 2.2.24
7
1166
 
8
1167
  [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.24).