alchemy_cms 2.1.12 → 2.2.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (405) hide show
  1. data/.travis.yml +1 -1
  2. data/Gemfile +20 -16
  3. data/README.md +11 -7
  4. data/alchemy_cms.gemspec +31 -29
  5. data/app/assets/javascripts/alchemy/alchemy.base.js +234 -233
  6. data/app/assets/javascripts/alchemy/alchemy.buttons.js +26 -26
  7. data/app/assets/javascripts/alchemy/alchemy.datepicker.js +32 -32
  8. data/app/assets/javascripts/alchemy/alchemy.dirty.js +78 -78
  9. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +103 -103
  10. data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js +84 -84
  11. data/app/assets/javascripts/alchemy/alchemy.elements_window.js +88 -88
  12. data/app/assets/javascripts/alchemy/alchemy.file_progress.js +92 -0
  13. data/app/assets/javascripts/alchemy/alchemy.growler.js +23 -23
  14. data/app/assets/javascripts/alchemy/alchemy.html5.js +23 -0
  15. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js +53 -52
  16. data/app/assets/javascripts/alchemy/alchemy.jquery_loader.js +33 -30
  17. data/app/assets/javascripts/alchemy/alchemy.js +2 -0
  18. data/app/assets/javascripts/alchemy/alchemy.js_extensions.js +14 -14
  19. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +181 -0
  20. data/app/assets/javascripts/alchemy/alchemy.menubar.js +48 -48
  21. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +39 -39
  22. data/app/assets/javascripts/alchemy/alchemy.preview.js +81 -83
  23. data/app/assets/javascripts/alchemy/alchemy.preview_window.js +86 -86
  24. data/app/assets/javascripts/alchemy/alchemy.routes.js.erb +23 -23
  25. data/app/assets/javascripts/alchemy/alchemy.swf_upload.js +208 -353
  26. data/app/assets/javascripts/alchemy/alchemy.uploader.js +279 -0
  27. data/app/assets/javascripts/alchemy/alchemy.windows.js +268 -268
  28. data/app/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js +42 -42
  29. data/app/assets/stylesheets/alchemy/_defaults.scss +89 -89
  30. data/app/assets/stylesheets/alchemy/base.css.scss +790 -804
  31. data/app/assets/stylesheets/alchemy/buttons.css.scss +263 -264
  32. data/app/assets/stylesheets/alchemy/dashboard.css.scss +66 -66
  33. data/app/assets/stylesheets/alchemy/elements.css.scss +575 -564
  34. data/app/assets/stylesheets/alchemy/flash.css.scss +45 -45
  35. data/app/assets/stylesheets/alchemy/frame.css.scss +262 -262
  36. data/app/assets/stylesheets/alchemy/icons.css.scss +86 -86
  37. data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss +706 -707
  38. data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss +46 -27
  39. data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +107 -107
  40. data/app/assets/stylesheets/alchemy/login.css.scss +40 -38
  41. data/app/assets/stylesheets/alchemy/menubar.css.scss +84 -82
  42. data/app/assets/stylesheets/alchemy/modules.css.scss +9 -9
  43. data/app/assets/stylesheets/alchemy/pagination.css.scss +49 -49
  44. data/app/assets/stylesheets/alchemy/print.css +7 -7
  45. data/app/assets/stylesheets/alchemy/sitemap.css.scss +185 -154
  46. data/app/assets/stylesheets/alchemy/standard_set.css +205 -206
  47. data/app/assets/stylesheets/alchemy/tables.css.scss +94 -60
  48. data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +34 -34
  49. data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +177 -177
  50. data/app/assets/stylesheets/alchemy/upload.css.scss +68 -45
  51. data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss +222 -221
  52. data/app/controllers/alchemy/admin/attachments_controller.rb +100 -100
  53. data/app/controllers/alchemy/admin/base_controller.rb +116 -116
  54. data/app/controllers/alchemy/admin/clipboard_controller.rb +44 -44
  55. data/app/controllers/alchemy/admin/contents_controller.rb +55 -55
  56. data/app/controllers/alchemy/admin/dashboard_controller.rb +12 -11
  57. data/app/controllers/alchemy/admin/elements_controller.rb +109 -109
  58. data/app/controllers/alchemy/admin/essence_audios_controller.rb +8 -8
  59. data/app/controllers/alchemy/admin/essence_files_controller.rb +20 -20
  60. data/app/controllers/alchemy/admin/essence_flashes_controller.rb +8 -8
  61. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +81 -81
  62. data/app/controllers/alchemy/admin/essence_videos_controller.rb +8 -8
  63. data/app/controllers/alchemy/admin/languages_controller.rb +16 -4
  64. data/app/controllers/alchemy/admin/layoutpages_controller.rb +9 -9
  65. data/app/controllers/alchemy/admin/pages_controller.rb +249 -248
  66. data/app/controllers/alchemy/admin/pictures_controller.rb +105 -105
  67. data/app/controllers/alchemy/admin/resources_controller.rb +111 -166
  68. data/app/controllers/alchemy/admin/trash_controller.rb +18 -18
  69. data/app/controllers/alchemy/admin/users_controller.rb +69 -69
  70. data/app/controllers/alchemy/attachments_controller.rb +27 -27
  71. data/app/controllers/alchemy/base_controller.rb +159 -155
  72. data/app/controllers/alchemy/elements_controller.rb +16 -16
  73. data/app/controllers/alchemy/messages_controller.rb +59 -59
  74. data/app/controllers/alchemy/pages_controller.rb +194 -198
  75. data/app/controllers/alchemy/pictures_controller.rb +57 -57
  76. data/app/controllers/alchemy/user_sessions_controller.rb +70 -70
  77. data/app/helpers/alchemy/admin/attachments_helper.rb +7 -7
  78. data/app/helpers/alchemy/admin/base_helper.rb +425 -425
  79. data/app/helpers/alchemy/admin/contents_helper.rb +72 -72
  80. data/app/helpers/alchemy/admin/elements_helper.rb +108 -107
  81. data/app/helpers/alchemy/admin/essences_helper.rb +108 -108
  82. data/app/helpers/alchemy/admin/pages_helper.rb +42 -42
  83. data/app/helpers/alchemy/admin/pictures_helper.rb +26 -26
  84. data/app/helpers/alchemy/base_helper.rb +90 -90
  85. data/app/helpers/alchemy/elements_helper.rb +167 -168
  86. data/app/helpers/alchemy/essences_helper.rb +133 -133
  87. data/app/helpers/alchemy/pages_helper.rb +515 -526
  88. data/app/helpers/alchemy/pictures_helper.rb +19 -0
  89. data/app/mailers/alchemy/messages.rb +13 -13
  90. data/app/mailers/alchemy/notifications.rb +19 -19
  91. data/app/models/alchemy.rb +3 -3
  92. data/app/models/alchemy/attachment.rb +52 -78
  93. data/app/models/alchemy/cell.rb +48 -48
  94. data/app/models/alchemy/content.rb +196 -196
  95. data/app/models/alchemy/element.rb +500 -490
  96. data/app/models/alchemy/essence_audio.rb +7 -7
  97. data/app/models/alchemy/essence_date.rb +10 -10
  98. data/app/models/alchemy/essence_file.rb +7 -7
  99. data/app/models/alchemy/essence_flash.rb +6 -6
  100. data/app/models/alchemy/essence_html.rb +9 -9
  101. data/app/models/alchemy/essence_picture.rb +17 -17
  102. data/app/models/alchemy/essence_richtext.rb +53 -53
  103. data/app/models/alchemy/essence_text.rb +21 -21
  104. data/app/models/alchemy/essence_video.rb +7 -7
  105. data/app/models/alchemy/folded_page.rb +3 -3
  106. data/app/models/alchemy/language.rb +91 -91
  107. data/app/models/alchemy/language/code.rb +14 -14
  108. data/app/models/alchemy/message.rb +48 -45
  109. data/app/models/alchemy/page.rb +555 -558
  110. data/app/models/alchemy/picture.rb +100 -99
  111. data/app/models/alchemy/user.rb +76 -74
  112. data/app/models/alchemy/user_session.rb +8 -8
  113. data/app/sweepers/alchemy/content_sweeper.rb +15 -15
  114. data/app/sweepers/alchemy/pages_sweeper.rb +50 -50
  115. data/app/sweepers/alchemy/pictures_sweeper.rb +14 -14
  116. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +23 -23
  117. data/app/views/alchemy/admin/attachments/_attachment.html.erb +56 -56
  118. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +15 -15
  119. data/app/views/alchemy/admin/attachments/_files_list.html.erb +16 -16
  120. data/app/views/alchemy/admin/attachments/create.js.erb +2 -2
  121. data/app/views/alchemy/admin/attachments/destroy.js.erb +3 -3
  122. data/app/views/alchemy/admin/attachments/edit.html.erb +10 -10
  123. data/app/views/alchemy/admin/attachments/index.html.erb +14 -14
  124. data/app/views/alchemy/admin/attachments/new.html.erb +9 -9
  125. data/app/views/alchemy/admin/clipboard/index.html.erb +21 -21
  126. data/app/views/alchemy/admin/clipboard/insert.js.erb +5 -5
  127. data/app/views/alchemy/admin/contents/_missing.html.erb +1 -1
  128. data/app/views/alchemy/admin/contents/create.js.erb +33 -33
  129. data/app/views/alchemy/admin/contents/destroy.js.erb +5 -5
  130. data/app/views/alchemy/admin/contents/new.html.erb +13 -13
  131. data/app/views/alchemy/admin/contents/order.js.erb +2 -2
  132. data/app/views/alchemy/admin/dashboard/index.html.erb +96 -92
  133. data/app/views/alchemy/admin/elements/_add_content.html.erb +12 -12
  134. data/app/views/alchemy/admin/elements/_element.html.erb +3 -3
  135. data/app/views/alchemy/admin/elements/_new_element_form.html.erb +28 -28
  136. data/app/views/alchemy/admin/elements/_picture_editor.html.erb +21 -21
  137. data/app/views/alchemy/admin/elements/create.js.erb +32 -32
  138. data/app/views/alchemy/admin/elements/index.html.erb +2 -2
  139. data/app/views/alchemy/admin/elements/new.html.erb +31 -31
  140. data/app/views/alchemy/admin/elements/order.js.erb +3 -3
  141. data/app/views/alchemy/admin/elements/trash.js.erb +13 -13
  142. data/app/views/alchemy/admin/elements/update.js.erb +6 -6
  143. data/app/views/alchemy/admin/essence_files/assign.js.erb +6 -6
  144. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +32 -32
  145. data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +1 -1
  146. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +1 -1
  147. data/app/views/alchemy/admin/essence_pictures/update.js.erb +11 -11
  148. data/app/views/alchemy/admin/languages/_form.html.erb +51 -45
  149. data/app/views/alchemy/admin/languages/_language.html.erb +45 -45
  150. data/app/views/alchemy/admin/languages/_table.html.erb +25 -25
  151. data/app/views/alchemy/admin/layoutpages/index.html.erb +35 -35
  152. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +42 -42
  153. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  154. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +27 -27
  155. data/app/views/alchemy/admin/pages/_page.html.erb +112 -112
  156. data/app/views/alchemy/admin/pages/_sitemap.html.erb +1 -1
  157. data/app/views/alchemy/admin/pages/configure.html.erb +71 -69
  158. data/app/views/alchemy/admin/pages/configure_external.html.erb +38 -38
  159. data/app/views/alchemy/admin/pages/destroy.js.erb +10 -10
  160. data/app/views/alchemy/admin/pages/edit.html.erb +165 -165
  161. data/app/views/alchemy/admin/pages/fold.js.erb +2 -2
  162. data/app/views/alchemy/admin/pages/index.html.erb +66 -66
  163. data/app/views/alchemy/admin/pages/locked.html.erb +1 -1
  164. data/app/views/alchemy/admin/pages/new.html.erb +40 -40
  165. data/app/views/alchemy/admin/pages/sort.js.erb +4 -4
  166. data/app/views/alchemy/admin/pages/unlock.js.erb +6 -6
  167. data/app/views/alchemy/admin/pages/update.js.erb +19 -19
  168. data/app/views/alchemy/admin/partials/_flash.html.erb +2 -2
  169. data/app/views/alchemy/admin/partials/_flash_notices.html.erb +1 -1
  170. data/app/views/alchemy/admin/partials/_flash_upload.html.erb +38 -0
  171. data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +15 -15
  172. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +8 -8
  173. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +35 -35
  174. data/app/views/alchemy/admin/partials/_search_form.html.erb +14 -14
  175. data/app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb +6 -6
  176. data/app/views/alchemy/admin/partials/_upload_form.html.erb +56 -118
  177. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +11 -11
  178. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +71 -71
  179. data/app/views/alchemy/admin/pictures/_picture.html.erb +32 -32
  180. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +26 -26
  181. data/app/views/alchemy/admin/pictures/_pictures_list.html.erb +6 -6
  182. data/app/views/alchemy/admin/pictures/create.js.erb +7 -7
  183. data/app/views/alchemy/admin/pictures/index.html.erb +67 -67
  184. data/app/views/alchemy/admin/pictures/show_in_window.html.erb +5 -4
  185. data/app/views/alchemy/admin/resources/_form.html.erb +25 -19
  186. data/app/views/alchemy/admin/resources/_resource.html.erb +37 -36
  187. data/app/views/alchemy/admin/resources/_table.html.erb +17 -17
  188. data/app/views/alchemy/admin/resources/destroy.js.erb +1 -1
  189. data/app/views/alchemy/admin/resources/index.html.erb +14 -14
  190. data/app/views/alchemy/admin/trash/index.html.erb +20 -20
  191. data/app/views/alchemy/admin/users/_table.html.erb +52 -52
  192. data/app/views/alchemy/admin/users/_user.html.erb +35 -36
  193. data/app/views/alchemy/admin/users/index.html.erb +26 -27
  194. data/app/views/alchemy/base/error_notice.html.erb +2 -2
  195. data/app/views/alchemy/base/update.js.erb +1 -1
  196. data/app/views/alchemy/elements/_contactform_view.html.erb +76 -76
  197. data/app/views/alchemy/elements/_download_view.html.erb +1 -1
  198. data/app/views/alchemy/elements/_editor_not_found.html.erb +3 -3
  199. data/app/views/alchemy/elements/_searchresult_view.html.erb +2 -2
  200. data/app/views/alchemy/elements/_sitemap_editor.html.erb +1 -1
  201. data/app/views/alchemy/essences/_essence_audio_view.html.erb +13 -13
  202. data/app/views/alchemy/essences/_essence_date_editor.html.erb +10 -10
  203. data/app/views/alchemy/essences/_essence_file_editor.html.erb +62 -62
  204. data/app/views/alchemy/essences/_essence_file_view.html.erb +8 -8
  205. data/app/views/alchemy/essences/_essence_flash_view.html.erb +19 -19
  206. data/app/views/alchemy/essences/_essence_html_editor.html.erb +6 -6
  207. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +73 -73
  208. data/app/views/alchemy/essences/_essence_picture_view.html.erb +34 -34
  209. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +7 -7
  210. data/app/views/alchemy/essences/_essence_text_editor.html.erb +8 -8
  211. data/app/views/alchemy/navigation/_image_link.html.erb +12 -12
  212. data/app/views/alchemy/navigation/_link.html.erb +13 -13
  213. data/app/views/alchemy/navigation/_renderer.html.erb +17 -17
  214. data/app/views/alchemy/page_layouts/_layout_footer.html.erb +1 -1
  215. data/app/views/alchemy/page_layouts/_layout_header.html.erb +1 -1
  216. data/app/views/alchemy/pages/show.rss.builder +14 -14
  217. data/app/views/alchemy/search/_result.html.erb +7 -7
  218. data/app/views/alchemy/user_sessions/leave.html.erb +9 -9
  219. data/app/views/alchemy/user_sessions/login.html.erb +39 -39
  220. data/app/views/alchemy/user_sessions/logout.html.erb +1 -1
  221. data/app/views/layouts/alchemy/admin.html.erb +81 -81
  222. data/app/views/layouts/alchemy/login.html.erb +36 -36
  223. data/app/views/layouts/alchemy/pages.html.erb +48 -27
  224. data/bin/alchemy +136 -134
  225. data/config/alchemy/config.yml +13 -9
  226. data/config/locales/alchemy.de.yml +24 -30
  227. data/config/locales/alchemy.en.yml +11 -28
  228. data/config/routes.rb +146 -146
  229. data/db/migrate/20100607193638_create_essence_pictures.rb +3 -3
  230. data/db/migrate/20101109150312_alter_pages_visible_column_default.rb +1 -1
  231. data/db/migrate/20101109151812_create_languages.rb +3 -3
  232. data/db/migrate/20110115123343_remove_css_class_default_from_essence_pictures.rb +3 -3
  233. data/db/migrate/20110224105120_change_pages_visible_default.rb +3 -3
  234. data/db/migrate/20110228182659_remove_default_page_layout_from_pages.rb +2 -2
  235. data/db/migrate/20110414163140_remove_display_name_from_elements.rb +3 -3
  236. data/db/migrate/20110511100516_rename_essence_texts_title_to_link_title.rb +2 -2
  237. data/db/migrate/20110529130500_add_cell_id_to_elements.rb +3 -3
  238. data/db/migrate/20110530102804_change_pages_page_layout_column.rb +3 -3
  239. data/db/migrate/20110711142057_change_open_link_in_new_window_to_link_target.rb +1 -1
  240. data/db/migrate/20111116125112_namespace_alchemy_models.rb +21 -21
  241. data/lib/alchemy/auth_engine.rb +5 -5
  242. data/lib/alchemy/capistrano.rb +64 -64
  243. data/lib/alchemy/config.rb +47 -44
  244. data/lib/alchemy/engine.rb +41 -41
  245. data/lib/alchemy/essence.rb +50 -51
  246. data/lib/alchemy/i18n.rb +48 -48
  247. data/lib/alchemy/modules.rb +30 -30
  248. data/lib/alchemy/mount_point.rb +6 -6
  249. data/lib/alchemy/page_layout.rb +94 -93
  250. data/lib/alchemy/resource.rb +82 -0
  251. data/lib/alchemy/resources_helper.rb +56 -0
  252. data/lib/alchemy/scoped_pagination_url_helper.rb +8 -8
  253. data/lib/alchemy/seeder.rb +88 -88
  254. data/lib/alchemy/tinymce.rb +49 -49
  255. data/lib/alchemy/upgrader.rb +103 -103
  256. data/lib/alchemy/version.rb +1 -1
  257. data/lib/alchemy_cms.rb +26 -27
  258. data/lib/extensions/action_view.rb +1 -1
  259. data/lib/extensions/array.rb +3 -3
  260. data/lib/extensions/hash.rb +3 -3
  261. data/lib/middleware/flash_session_cookie.rb +1 -1
  262. data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +24 -24
  263. data/lib/rails/generators/alchemy/elements/elements_generator.rb +7 -7
  264. data/lib/rails/generators/alchemy/elements/templates/view.html.erb +17 -17
  265. data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +6 -6
  266. data/lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb +8 -8
  267. data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb +7 -7
  268. data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +36 -36
  269. data/lib/rails/templates/alchemy.rb +1 -1
  270. data/lib/tasks/ferret.rake +2 -2
  271. data/lib/tasks/fleximage.rake +32 -32
  272. data/lib/tasks/install.rake +12 -12
  273. data/lib/tasks/upgrade.rake +4 -4
  274. data/spec/controllers/admin/clipboard_controller_spec.rb +43 -43
  275. data/spec/controllers/admin/contents_controller_spec.rb +22 -22
  276. data/spec/controllers/admin/elements_controller_spec.rb +13 -13
  277. data/spec/controllers/admin/languages_controller_spec.rb +31 -0
  278. data/spec/controllers/admin/pages_controller_spec.rb +10 -41
  279. data/spec/controllers/admin/resources_controller_spec.rb +19 -0
  280. data/spec/controllers/admin/trash_controller_spec.rb +11 -11
  281. data/spec/controllers/base_controller_spec.rb +46 -46
  282. data/spec/controllers/pages_controller_spec.rb +102 -92
  283. data/spec/dummy/app/controllers/admin/events_controller.rb +3 -0
  284. data/spec/dummy/app/controllers/errors_controller.rb +5 -0
  285. data/spec/dummy/app/models/event.rb +3 -0
  286. data/spec/dummy/config.ru +1 -1
  287. data/spec/dummy/config/application.rb +3 -0
  288. data/spec/dummy/config/authorization_rules.rb +7 -0
  289. data/spec/dummy/config/environments/development.rb +8 -1
  290. data/spec/dummy/config/environments/production.rb +1 -1
  291. data/spec/dummy/config/environments/test.rb +5 -2
  292. data/spec/dummy/config/routes.rb +9 -1
  293. data/spec/dummy/db/schema.rb +47 -35
  294. data/spec/dummy/public/404.html +19 -7
  295. data/spec/dummy/public/404.html.bak +26 -0
  296. data/spec/dummy/public/422.html +19 -7
  297. data/spec/dummy/public/500.html +19 -7
  298. data/spec/dummy/script/rails +2 -2
  299. data/spec/factories.rb +76 -76
  300. data/spec/helpers/admin/base_helper_spec.rb +21 -21
  301. data/spec/helpers/admin/contents_helper_spec.rb +14 -14
  302. data/spec/helpers/admin/elements_helper_spec.rb +40 -40
  303. data/spec/helpers/admin/essences_helper_spec.rb +7 -7
  304. data/spec/helpers/elements_helper_spec.rb +154 -154
  305. data/spec/helpers/essences_helper_spec.rb +10 -10
  306. data/spec/helpers/pages_helper_spec.rb +369 -372
  307. data/spec/helpers/pictures_helper_spec.rb +14 -0
  308. data/spec/helpers/url_helpers_spec.rb +29 -34
  309. data/spec/integration/admin/pages_controller_spec.rb +50 -50
  310. data/spec/integration/admin/resources_integration_spec.rb +100 -0
  311. data/spec/integration/navigation_spec.rb +1 -1
  312. data/spec/integration/pages_controller_spec.rb +205 -207
  313. data/spec/integration/security_spec.rb +47 -47
  314. data/spec/javascripts/alchemy/link_overlay_spec.js.coffee +42 -0
  315. data/spec/javascripts/alchemy_integration_spec.coffee +12 -0
  316. data/spec/javascripts/fixtures/select.html +3 -0
  317. data/spec/javascripts/helpers/.gitkeep +0 -0
  318. data/spec/javascripts/helpers/jasmine-jquery-1.3.1.js +289 -0
  319. data/spec/javascripts/helpers/mock-ajax.js +207 -0
  320. data/spec/javascripts/helpers/test_responses/test_responses.js +1 -0
  321. data/spec/javascripts/spec.css +3 -0
  322. data/spec/javascripts/spec.js +2 -0
  323. data/spec/libraries/resource_spec.rb +122 -0
  324. data/spec/libraries/resources_helper_spec.rb +105 -0
  325. data/spec/models/content_spec.rb +67 -67
  326. data/spec/models/element_spec.rb +133 -133
  327. data/spec/models/essence_picture_spec.rb +5 -5
  328. data/spec/models/essence_richtext_spec.rb +4 -4
  329. data/spec/models/language_spec.rb +89 -89
  330. data/spec/models/page_spec.rb +436 -506
  331. data/spec/models/picture_spec.rb +34 -34
  332. data/spec/models/user_spec.rb +2 -2
  333. data/spec/page_layout_spec.rb +24 -20
  334. data/spec/routing_spec.rb +253 -253
  335. data/spec/spec_helper.rb +51 -50
  336. data/spec/support/alchemy/controller_hacks.rb +25 -25
  337. data/spec/support/alchemy/specs_helpers.rb +25 -25
  338. data/spec/support/integration_spec_helper.rb +24 -0
  339. data/vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js +271 -0
  340. data/vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js +86 -85
  341. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +380 -377
  342. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +285 -279
  343. data/vendor/assets/javascripts/swfupload/SWFObject License.txt +3 -3
  344. data/vendor/assets/javascripts/swfupload/swfupload.cookies.js +47 -47
  345. data/vendor/assets/javascripts/swfupload/swfupload.js +612 -612
  346. data/vendor/assets/javascripts/swfupload/swfupload.queue.js +93 -93
  347. data/vendor/assets/javascripts/swfupload/swfupload.speed.js +337 -337
  348. data/vendor/assets/javascripts/swfupload/swfupload.swfobject.js +706 -102
  349. data/vendor/assets/javascripts/tiny_mce/license.txt +6 -6
  350. data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +97 -97
  351. data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +386 -376
  352. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +30 -30
  353. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +45 -45
  354. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +20 -17
  355. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +12 -12
  356. data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +183 -173
  357. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +4 -4
  358. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +7 -7
  359. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +3 -3
  360. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +282 -280
  361. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +15 -15
  362. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +204 -204
  363. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +435 -435
  364. data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +24 -22
  365. data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +144 -136
  366. data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +184 -168
  367. data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +62 -46
  368. data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +17 -16
  369. data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +56 -47
  370. data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +67 -54
  371. data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +852 -1
  372. data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +79 -69
  373. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +48 -48
  374. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +28 -28
  375. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +317 -317
  376. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +248 -246
  377. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +246 -246
  378. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +146 -146
  379. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +31 -31
  380. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +1 -1
  381. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +1 -1
  382. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +1 -1
  383. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
  384. data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +53 -46
  385. data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +57 -45
  386. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +182 -47
  387. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +399 -92
  388. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +891 -187
  389. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +102 -24
  390. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +377 -78
  391. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +452 -77
  392. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +167 -45
  393. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +399 -92
  394. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +890 -190
  395. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +33 -7
  396. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +15 -4
  397. data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +18 -15
  398. data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +46 -46
  399. data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +124 -124
  400. data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +112 -112
  401. data/vendor/assets/javascripts/tiny_mce/utils/validate.js +213 -213
  402. metadata +102 -115
  403. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js +0 -216
  404. data/lib/tasks/routes.rake +0 -29
  405. data/spec/integration/admin/resources_spec.rb +0 -19
metadata CHANGED
@@ -1,37 +1,33 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.12
5
- prerelease:
4
+ version: 2.2.rc1
5
+ prerelease: 4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Thomas von Deyen
9
9
  - Robin Böning
10
+ - Marc Schettke
10
11
  - Carsten Fregin
11
12
  autorequire:
12
13
  bindir: bin
13
14
  cert_chain: []
14
- date: 2012-09-14 00:00:00.000000000 Z
15
+ date: 2012-04-06 00:00:00.000000000 Z
15
16
  dependencies:
16
17
  - !ruby/object:Gem::Dependency
17
18
  name: rails
18
- requirement: !ruby/object:Gem::Requirement
19
+ requirement: &70345801404800 !ruby/object:Gem::Requirement
19
20
  none: false
20
21
  requirements:
21
22
  - - ~>
22
23
  - !ruby/object:Gem::Version
23
- version: 3.1.6
24
+ version: 3.2.1
24
25
  type: :runtime
25
26
  prerelease: false
26
- version_requirements: !ruby/object:Gem::Requirement
27
- none: false
28
- requirements:
29
- - - ~>
30
- - !ruby/object:Gem::Version
31
- version: 3.1.6
27
+ version_requirements: *70345801404800
32
28
  - !ruby/object:Gem::Dependency
33
29
  name: authlogic
34
- requirement: !ruby/object:Gem::Requirement
30
+ requirement: &70345801403120 !ruby/object:Gem::Requirement
35
31
  none: false
36
32
  requirements:
37
33
  - - ! '>='
@@ -39,15 +35,10 @@ dependencies:
39
35
  version: '0'
40
36
  type: :runtime
41
37
  prerelease: false
42
- version_requirements: !ruby/object:Gem::Requirement
43
- none: false
44
- requirements:
45
- - - ! '>='
46
- - !ruby/object:Gem::Version
47
- version: '0'
38
+ version_requirements: *70345801403120
48
39
  - !ruby/object:Gem::Dependency
49
40
  name: awesome_nested_set
50
- requirement: !ruby/object:Gem::Requirement
41
+ requirement: &70345801402000 !ruby/object:Gem::Requirement
51
42
  none: false
52
43
  requirements:
53
44
  - - ~>
@@ -55,15 +46,10 @@ dependencies:
55
46
  version: '2.0'
56
47
  type: :runtime
57
48
  prerelease: false
58
- version_requirements: !ruby/object:Gem::Requirement
59
- none: false
60
- requirements:
61
- - - ~>
62
- - !ruby/object:Gem::Version
63
- version: '2.0'
49
+ version_requirements: *70345801402000
64
50
  - !ruby/object:Gem::Dependency
65
51
  name: declarative_authorization
66
- requirement: !ruby/object:Gem::Requirement
52
+ requirement: &70345801560280 !ruby/object:Gem::Requirement
67
53
  none: false
68
54
  requirements:
69
55
  - - ~>
@@ -71,31 +57,21 @@ dependencies:
71
57
  version: 0.5.4
72
58
  type: :runtime
73
59
  prerelease: false
74
- version_requirements: !ruby/object:Gem::Requirement
75
- none: false
76
- requirements:
77
- - - ~>
78
- - !ruby/object:Gem::Version
79
- version: 0.5.4
60
+ version_requirements: *70345801560280
80
61
  - !ruby/object:Gem::Dependency
81
62
  name: tvdeyen-fleximage
82
- requirement: !ruby/object:Gem::Requirement
63
+ requirement: &70345801559060 !ruby/object:Gem::Requirement
83
64
  none: false
84
65
  requirements:
85
66
  - - ~>
86
67
  - !ruby/object:Gem::Version
87
- version: 1.2.0
68
+ version: 1.1.0
88
69
  type: :runtime
89
70
  prerelease: false
90
- version_requirements: !ruby/object:Gem::Requirement
91
- none: false
92
- requirements:
93
- - - ~>
94
- - !ruby/object:Gem::Version
95
- version: 1.2.0
71
+ version_requirements: *70345801559060
96
72
  - !ruby/object:Gem::Dependency
97
73
  name: kaminari
98
- requirement: !ruby/object:Gem::Requirement
74
+ requirement: &70345801557220 !ruby/object:Gem::Requirement
99
75
  none: false
100
76
  requirements:
101
77
  - - ~>
@@ -103,15 +79,10 @@ dependencies:
103
79
  version: 0.13.0
104
80
  type: :runtime
105
81
  prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- none: false
108
- requirements:
109
- - - ~>
110
- - !ruby/object:Gem::Version
111
- version: 0.13.0
82
+ version_requirements: *70345801557220
112
83
  - !ruby/object:Gem::Dependency
113
84
  name: acts_as_ferret
114
- requirement: !ruby/object:Gem::Requirement
85
+ requirement: &70345801556420 !ruby/object:Gem::Requirement
115
86
  none: false
116
87
  requirements:
117
88
  - - ~>
@@ -119,15 +90,10 @@ dependencies:
119
90
  version: '0.5'
120
91
  type: :runtime
121
92
  prerelease: false
122
- version_requirements: !ruby/object:Gem::Requirement
123
- none: false
124
- requirements:
125
- - - ~>
126
- - !ruby/object:Gem::Version
127
- version: '0.5'
93
+ version_requirements: *70345801556420
128
94
  - !ruby/object:Gem::Dependency
129
95
  name: acts_as_list
130
- requirement: !ruby/object:Gem::Requirement
96
+ requirement: &70345801555280 !ruby/object:Gem::Requirement
131
97
  none: false
132
98
  requirements:
133
99
  - - ~>
@@ -135,15 +101,10 @@ dependencies:
135
101
  version: '0.1'
136
102
  type: :runtime
137
103
  prerelease: false
138
- version_requirements: !ruby/object:Gem::Requirement
139
- none: false
140
- requirements:
141
- - - ~>
142
- - !ruby/object:Gem::Version
143
- version: '0.1'
104
+ version_requirements: *70345801555280
144
105
  - !ruby/object:Gem::Dependency
145
106
  name: magiclabs-userstamp
146
- requirement: !ruby/object:Gem::Requirement
107
+ requirement: &70345801554340 !ruby/object:Gem::Requirement
147
108
  none: false
148
109
  requirements:
149
110
  - - ~>
@@ -151,15 +112,10 @@ dependencies:
151
112
  version: 2.0.2
152
113
  type: :runtime
153
114
  prerelease: false
154
- version_requirements: !ruby/object:Gem::Requirement
155
- none: false
156
- requirements:
157
- - - ~>
158
- - !ruby/object:Gem::Version
159
- version: 2.0.2
115
+ version_requirements: *70345801554340
160
116
  - !ruby/object:Gem::Dependency
161
117
  name: dynamic_form
162
- requirement: !ruby/object:Gem::Requirement
118
+ requirement: &70345801553380 !ruby/object:Gem::Requirement
163
119
  none: false
164
120
  requirements:
165
121
  - - ~>
@@ -167,31 +123,21 @@ dependencies:
167
123
  version: '1.1'
168
124
  type: :runtime
169
125
  prerelease: false
170
- version_requirements: !ruby/object:Gem::Requirement
171
- none: false
172
- requirements:
173
- - - ~>
174
- - !ruby/object:Gem::Version
175
- version: '1.1'
126
+ version_requirements: *70345801553380
176
127
  - !ruby/object:Gem::Dependency
177
128
  name: jquery-rails
178
- requirement: !ruby/object:Gem::Requirement
129
+ requirement: &70345801589120 !ruby/object:Gem::Requirement
179
130
  none: false
180
131
  requirements:
181
132
  - - ~>
182
133
  - !ruby/object:Gem::Version
183
- version: 1.0.16
134
+ version: 2.0.0
184
135
  type: :runtime
185
136
  prerelease: false
186
- version_requirements: !ruby/object:Gem::Requirement
187
- none: false
188
- requirements:
189
- - - ~>
190
- - !ruby/object:Gem::Version
191
- version: 1.0.16
137
+ version_requirements: *70345801589120
192
138
  - !ruby/object:Gem::Dependency
193
139
  name: attachment_magic
194
- requirement: !ruby/object:Gem::Requirement
140
+ requirement: &70345801588220 !ruby/object:Gem::Requirement
195
141
  none: false
196
142
  requirements:
197
143
  - - ~>
@@ -199,31 +145,21 @@ dependencies:
199
145
  version: 0.2.1
200
146
  type: :runtime
201
147
  prerelease: false
202
- version_requirements: !ruby/object:Gem::Requirement
203
- none: false
204
- requirements:
205
- - - ~>
206
- - !ruby/object:Gem::Version
207
- version: 0.2.1
148
+ version_requirements: *70345801588220
208
149
  - !ruby/object:Gem::Dependency
209
150
  name: sass-rails
210
- requirement: !ruby/object:Gem::Requirement
151
+ requirement: &70345801586560 !ruby/object:Gem::Requirement
211
152
  none: false
212
153
  requirements:
213
154
  - - ~>
214
155
  - !ruby/object:Gem::Version
215
- version: 3.1.4
156
+ version: 3.2.3
216
157
  type: :runtime
217
158
  prerelease: false
218
- version_requirements: !ruby/object:Gem::Requirement
219
- none: false
220
- requirements:
221
- - - ~>
222
- - !ruby/object:Gem::Version
223
- version: 3.1.4
159
+ version_requirements: *70345801586560
224
160
  - !ruby/object:Gem::Dependency
225
161
  name: rspec-rails
226
- requirement: !ruby/object:Gem::Requirement
162
+ requirement: &70345801585780 !ruby/object:Gem::Requirement
227
163
  none: false
228
164
  requirements:
229
165
  - - ~>
@@ -231,15 +167,10 @@ dependencies:
231
167
  version: '2.8'
232
168
  type: :development
233
169
  prerelease: false
234
- version_requirements: !ruby/object:Gem::Requirement
235
- none: false
236
- requirements:
237
- - - ~>
238
- - !ruby/object:Gem::Version
239
- version: '2.8'
170
+ version_requirements: *70345801585780
240
171
  - !ruby/object:Gem::Dependency
241
172
  name: sqlite3
242
- requirement: !ruby/object:Gem::Requirement
173
+ requirement: &70345801585100 !ruby/object:Gem::Requirement
243
174
  none: false
244
175
  requirements:
245
176
  - - ! '>='
@@ -247,12 +178,18 @@ dependencies:
247
178
  version: '0'
248
179
  type: :development
249
180
  prerelease: false
250
- version_requirements: !ruby/object:Gem::Requirement
181
+ version_requirements: *70345801585100
182
+ - !ruby/object:Gem::Dependency
183
+ name: jasminerice
184
+ requirement: &70345801584240 !ruby/object:Gem::Requirement
251
185
  none: false
252
186
  requirements:
253
187
  - - ! '>='
254
188
  - !ruby/object:Gem::Version
255
189
  version: '0'
190
+ type: :development
191
+ prerelease: false
192
+ version_requirements: *70345801584240
256
193
  description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
257
194
  email:
258
195
  - alchemy@magiclabs.de
@@ -295,18 +232,21 @@ files:
295
232
  - app/assets/javascripts/alchemy/alchemy.dragndrop.js
296
233
  - app/assets/javascripts/alchemy/alchemy.element_editor_selector.js
297
234
  - app/assets/javascripts/alchemy/alchemy.elements_window.js
235
+ - app/assets/javascripts/alchemy/alchemy.file_progress.js
298
236
  - app/assets/javascripts/alchemy/alchemy.growler.js
237
+ - app/assets/javascripts/alchemy/alchemy.html5.js
299
238
  - app/assets/javascripts/alchemy/alchemy.image_cropper.js
300
239
  - app/assets/javascripts/alchemy/alchemy.jquery_loader.js
301
240
  - app/assets/javascripts/alchemy/alchemy.js
302
241
  - app/assets/javascripts/alchemy/alchemy.js_extensions.js
303
- - app/assets/javascripts/alchemy/alchemy.link_overlay.js
242
+ - app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee
304
243
  - app/assets/javascripts/alchemy/alchemy.menubar.js
305
244
  - app/assets/javascripts/alchemy/alchemy.page_sorter.js
306
245
  - app/assets/javascripts/alchemy/alchemy.preview.js
307
246
  - app/assets/javascripts/alchemy/alchemy.preview_window.js
308
247
  - app/assets/javascripts/alchemy/alchemy.routes.js.erb
309
248
  - app/assets/javascripts/alchemy/alchemy.swf_upload.js
249
+ - app/assets/javascripts/alchemy/alchemy.uploader.js
310
250
  - app/assets/javascripts/alchemy/alchemy.windows.js
311
251
  - app/assets/javascripts/alchemy/menubar.js
312
252
  - app/assets/javascripts/alchemy/preview.js
@@ -373,6 +313,7 @@ files:
373
313
  - app/helpers/alchemy/elements_helper.rb
374
314
  - app/helpers/alchemy/essences_helper.rb
375
315
  - app/helpers/alchemy/pages_helper.rb
316
+ - app/helpers/alchemy/pictures_helper.rb
376
317
  - app/mailers/alchemy/messages.rb
377
318
  - app/mailers/alchemy/notifications.rb
378
319
  - app/models/alchemy.rb
@@ -474,6 +415,7 @@ files:
474
415
  - app/views/alchemy/admin/pages/update.js.erb
475
416
  - app/views/alchemy/admin/partials/_flash.html.erb
476
417
  - app/views/alchemy/admin/partials/_flash_notices.html.erb
418
+ - app/views/alchemy/admin/partials/_flash_upload.html.erb
477
419
  - app/views/alchemy/admin/partials/_language_tree_select.html.erb
478
420
  - app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
479
421
  - app/views/alchemy/admin/partials/_pagination_links.html.erb
@@ -671,6 +613,8 @@ files:
671
613
  - lib/alchemy/modules.rb
672
614
  - lib/alchemy/mount_point.rb
673
615
  - lib/alchemy/page_layout.rb
616
+ - lib/alchemy/resource.rb
617
+ - lib/alchemy/resources_helper.rb
674
618
  - lib/alchemy/scoped_pagination_url_helper.rb
675
619
  - lib/alchemy/seeder.rb
676
620
  - lib/alchemy/tinymce.rb
@@ -705,7 +649,6 @@ files:
705
649
  - lib/tasks/ferret.rake
706
650
  - lib/tasks/fleximage.rake
707
651
  - lib/tasks/install.rake
708
- - lib/tasks/routes.rake
709
652
  - lib/tasks/upgrade.rake
710
653
  - script/rails
711
654
  - spec/alchemy_spec.rb
@@ -713,20 +656,26 @@ files:
713
656
  - spec/controllers/admin/clipboard_controller_spec.rb
714
657
  - spec/controllers/admin/contents_controller_spec.rb
715
658
  - spec/controllers/admin/elements_controller_spec.rb
659
+ - spec/controllers/admin/languages_controller_spec.rb
716
660
  - spec/controllers/admin/pages_controller_spec.rb
661
+ - spec/controllers/admin/resources_controller_spec.rb
717
662
  - spec/controllers/admin/trash_controller_spec.rb
718
663
  - spec/controllers/base_controller_spec.rb
719
664
  - spec/controllers/pages_controller_spec.rb
720
665
  - spec/dummy/Rakefile
721
666
  - spec/dummy/app/assets/javascripts/application.js
722
667
  - spec/dummy/app/assets/stylesheets/application.css
668
+ - spec/dummy/app/controllers/admin/events_controller.rb
723
669
  - spec/dummy/app/controllers/application_controller.rb
670
+ - spec/dummy/app/controllers/errors_controller.rb
724
671
  - spec/dummy/app/helpers/application_helper.rb
725
672
  - spec/dummy/app/mailers/.gitkeep
726
673
  - spec/dummy/app/models/.gitkeep
674
+ - spec/dummy/app/models/event.rb
727
675
  - spec/dummy/app/views/layouts/.gitkeep
728
676
  - spec/dummy/config.ru
729
677
  - spec/dummy/config/application.rb
678
+ - spec/dummy/config/authorization_rules.rb
730
679
  - spec/dummy/config/boot.rb
731
680
  - spec/dummy/config/database.yml
732
681
  - spec/dummy/config/environment.rb
@@ -744,6 +693,7 @@ files:
744
693
  - spec/dummy/db/schema.rb
745
694
  - spec/dummy/lib/assets/.gitkeep
746
695
  - spec/dummy/public/404.html
696
+ - spec/dummy/public/404.html.bak
747
697
  - spec/dummy/public/422.html
748
698
  - spec/dummy/public/500.html
749
699
  - spec/dummy/public/favicon.ico
@@ -757,12 +707,24 @@ files:
757
707
  - spec/helpers/elements_helper_spec.rb
758
708
  - spec/helpers/essences_helper_spec.rb
759
709
  - spec/helpers/pages_helper_spec.rb
710
+ - spec/helpers/pictures_helper_spec.rb
760
711
  - spec/helpers/url_helpers_spec.rb
761
712
  - spec/integration/admin/pages_controller_spec.rb
762
- - spec/integration/admin/resources_spec.rb
713
+ - spec/integration/admin/resources_integration_spec.rb
763
714
  - spec/integration/navigation_spec.rb
764
715
  - spec/integration/pages_controller_spec.rb
765
716
  - spec/integration/security_spec.rb
717
+ - spec/javascripts/alchemy/link_overlay_spec.js.coffee
718
+ - spec/javascripts/alchemy_integration_spec.coffee
719
+ - spec/javascripts/fixtures/select.html
720
+ - spec/javascripts/helpers/.gitkeep
721
+ - spec/javascripts/helpers/jasmine-jquery-1.3.1.js
722
+ - spec/javascripts/helpers/mock-ajax.js
723
+ - spec/javascripts/helpers/test_responses/test_responses.js
724
+ - spec/javascripts/spec.css
725
+ - spec/javascripts/spec.js
726
+ - spec/libraries/resource_spec.rb
727
+ - spec/libraries/resources_helper_spec.rb
766
728
  - spec/models/content_spec.rb
767
729
  - spec/models/element_spec.rb
768
730
  - spec/models/essence_picture_spec.rb
@@ -776,8 +738,10 @@ files:
776
738
  - spec/spec_helper.rb
777
739
  - spec/support/alchemy/controller_hacks.rb
778
740
  - spec/support/alchemy/specs_helpers.rb
741
+ - spec/support/integration_spec_helper.rb
779
742
  - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
780
743
  - vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js
744
+ - vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js
781
745
  - vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js
782
746
  - vendor/assets/javascripts/jquery_plugins/jquery.sb.min.js
783
747
  - vendor/assets/javascripts/jquery_plugins/jquery.scrollTo-1.4.2-min.js
@@ -889,39 +853,48 @@ required_ruby_version: !ruby/object:Gem::Requirement
889
853
  - - ! '>='
890
854
  - !ruby/object:Gem::Version
891
855
  version: '0'
856
+ segments:
857
+ - 0
858
+ hash: 802306676812212571
892
859
  required_rubygems_version: !ruby/object:Gem::Requirement
893
860
  none: false
894
861
  requirements:
895
- - - ! '>='
862
+ - - ! '>'
896
863
  - !ruby/object:Gem::Version
897
- version: '0'
864
+ version: 1.3.1
898
865
  requirements:
899
866
  - ImageMagick (libmagick), v6.6 or greater.
900
867
  rubyforge_project:
901
- rubygems_version: 1.8.24
868
+ rubygems_version: 1.8.15
902
869
  signing_key:
903
870
  specification_version: 3
904
- summary: An extremly flexbile CMS for Rails 3.1.
871
+ summary: An extremly flexbile CMS for Rails 3.2
905
872
  test_files:
906
873
  - spec/alchemy_spec.rb
907
874
  - spec/config_spec.rb
908
875
  - spec/controllers/admin/clipboard_controller_spec.rb
909
876
  - spec/controllers/admin/contents_controller_spec.rb
910
877
  - spec/controllers/admin/elements_controller_spec.rb
878
+ - spec/controllers/admin/languages_controller_spec.rb
911
879
  - spec/controllers/admin/pages_controller_spec.rb
880
+ - spec/controllers/admin/resources_controller_spec.rb
912
881
  - spec/controllers/admin/trash_controller_spec.rb
913
882
  - spec/controllers/base_controller_spec.rb
914
883
  - spec/controllers/pages_controller_spec.rb
915
884
  - spec/dummy/Rakefile
916
885
  - spec/dummy/app/assets/javascripts/application.js
917
886
  - spec/dummy/app/assets/stylesheets/application.css
887
+ - spec/dummy/app/controllers/admin/events_controller.rb
918
888
  - spec/dummy/app/controllers/application_controller.rb
889
+ - spec/dummy/app/controllers/errors_controller.rb
919
890
  - spec/dummy/app/helpers/application_helper.rb
920
891
  - spec/dummy/app/mailers/.gitkeep
921
892
  - spec/dummy/app/models/.gitkeep
893
+ - spec/dummy/app/models/event.rb
922
894
  - spec/dummy/app/views/layouts/.gitkeep
923
895
  - spec/dummy/config.ru
924
896
  - spec/dummy/config/application.rb
897
+ - spec/dummy/config/authorization_rules.rb
925
898
  - spec/dummy/config/boot.rb
926
899
  - spec/dummy/config/database.yml
927
900
  - spec/dummy/config/environment.rb
@@ -939,6 +912,7 @@ test_files:
939
912
  - spec/dummy/db/schema.rb
940
913
  - spec/dummy/lib/assets/.gitkeep
941
914
  - spec/dummy/public/404.html
915
+ - spec/dummy/public/404.html.bak
942
916
  - spec/dummy/public/422.html
943
917
  - spec/dummy/public/500.html
944
918
  - spec/dummy/public/favicon.ico
@@ -952,12 +926,24 @@ test_files:
952
926
  - spec/helpers/elements_helper_spec.rb
953
927
  - spec/helpers/essences_helper_spec.rb
954
928
  - spec/helpers/pages_helper_spec.rb
929
+ - spec/helpers/pictures_helper_spec.rb
955
930
  - spec/helpers/url_helpers_spec.rb
956
931
  - spec/integration/admin/pages_controller_spec.rb
957
- - spec/integration/admin/resources_spec.rb
932
+ - spec/integration/admin/resources_integration_spec.rb
958
933
  - spec/integration/navigation_spec.rb
959
934
  - spec/integration/pages_controller_spec.rb
960
935
  - spec/integration/security_spec.rb
936
+ - spec/javascripts/alchemy/link_overlay_spec.js.coffee
937
+ - spec/javascripts/alchemy_integration_spec.coffee
938
+ - spec/javascripts/fixtures/select.html
939
+ - spec/javascripts/helpers/.gitkeep
940
+ - spec/javascripts/helpers/jasmine-jquery-1.3.1.js
941
+ - spec/javascripts/helpers/mock-ajax.js
942
+ - spec/javascripts/helpers/test_responses/test_responses.js
943
+ - spec/javascripts/spec.css
944
+ - spec/javascripts/spec.js
945
+ - spec/libraries/resource_spec.rb
946
+ - spec/libraries/resources_helper_spec.rb
961
947
  - spec/models/content_spec.rb
962
948
  - spec/models/element_spec.rb
963
949
  - spec/models/essence_picture_spec.rb
@@ -971,4 +957,5 @@ test_files:
971
957
  - spec/spec_helper.rb
972
958
  - spec/support/alchemy/controller_hacks.rb
973
959
  - spec/support/alchemy/specs_helpers.rb
960
+ - spec/support/integration_spec_helper.rb
974
961
  has_rdoc: