refinerycms 0.9.5.13 → 0.9.5.14

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 (294) hide show
  1. data/Rakefile +6 -1
  2. data/app/controllers/admin/base_controller.rb +2 -2
  3. data/app/controllers/application.rb +1 -1
  4. data/app/controllers/application_controller.rb +2 -2
  5. data/app/helpers/application_helper.rb +2 -2
  6. data/config/environment.rb +6 -6
  7. data/config/environments/development.rb +1 -1
  8. data/config/initializers/inflections.rb +1 -1
  9. data/config/preinitializer.rb +3 -3
  10. data/config/routes.rb +5 -5
  11. data/db/migrate/20091109012126_add_missing_indexes.rb +4 -4
  12. data/db/schema.rb +1 -2
  13. data/db/seeds.rb +35 -35
  14. data/lib/refinery_initializer.rb +2 -2
  15. data/public/404.html +15 -15
  16. data/public/422.html +8 -8
  17. data/public/500.html +8 -8
  18. data/public/images/refinery/logo-large.png +0 -0
  19. data/public/images/refinery/logo-medium.png +0 -0
  20. data/public/images/refinery/logo-small-medium.png +0 -0
  21. data/public/images/refinery/logo-small.png +0 -0
  22. data/public/images/refinery/resolve_digital_footer_logo.png +0 -0
  23. data/public/javascripts/builder.js +97 -97
  24. data/public/javascripts/controls.js +655 -655
  25. data/public/javascripts/dragdrop.js +936 -936
  26. data/public/javascripts/effects.js +713 -713
  27. data/public/javascripts/jquery/GPL-LICENSE.txt +96 -96
  28. data/public/javascripts/jquery/jquery.js +168 -168
  29. data/public/javascripts/lightbox.js +397 -397
  30. data/public/javascripts/livepipe.js +146 -146
  31. data/public/javascripts/prototype.js +2996 -2996
  32. data/public/javascripts/refinery/admin.js +20 -20
  33. data/public/javascripts/refinery/boot_wym.js +110 -110
  34. data/public/javascripts/refinery/dialog.js +1 -1
  35. data/public/javascripts/refinery/parse_url.js +27 -27
  36. data/public/javascripts/refinery/prototype.enhancements.js +17 -17
  37. data/public/javascripts/refinery/tooltips.js +34 -34
  38. data/public/javascripts/scriptaculous.js +22 -22
  39. data/public/javascripts/slider.js +239 -239
  40. data/public/javascripts/tabs.js +130 -130
  41. data/public/javascripts/thickbox.js +23 -23
  42. data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +23 -23
  43. data/public/javascripts/wymeditor/lang/ca.js +42 -42
  44. data/public/javascripts/wymeditor/lang/cs.js +42 -42
  45. data/public/javascripts/wymeditor/lang/de.js +42 -42
  46. data/public/javascripts/wymeditor/lang/en.js +44 -44
  47. data/public/javascripts/wymeditor/lang/es.js +42 -42
  48. data/public/javascripts/wymeditor/lang/fa.js +42 -42
  49. data/public/javascripts/wymeditor/lang/fr.js +42 -42
  50. data/public/javascripts/wymeditor/lang/he.js +42 -42
  51. data/public/javascripts/wymeditor/lang/hu.js +42 -42
  52. data/public/javascripts/wymeditor/lang/it.js +42 -42
  53. data/public/javascripts/wymeditor/lang/nb.js +42 -42
  54. data/public/javascripts/wymeditor/lang/nl.js +42 -42
  55. data/public/javascripts/wymeditor/lang/nn.js +42 -42
  56. data/public/javascripts/wymeditor/lang/pl.js +42 -42
  57. data/public/javascripts/wymeditor/lang/pt-br.js +42 -42
  58. data/public/javascripts/wymeditor/lang/pt.js +42 -42
  59. data/public/javascripts/wymeditor/lang/ru.js +42 -42
  60. data/public/javascripts/wymeditor/lang/sv.js +42 -42
  61. data/public/javascripts/wymeditor/lang/tr.js +42 -42
  62. data/public/javascripts/wymeditor/lang/zh_cn.js +44 -44
  63. data/public/javascripts/wymeditor/skins/refinery/skin.js +31 -31
  64. data/public/stylesheets/application.css +3 -3
  65. data/public/stylesheets/formatting.css +3 -3
  66. data/public/stylesheets/home.css +2 -2
  67. data/public/stylesheets/lightbox.css +1 -1
  68. data/public/stylesheets/refinery/application.css +13 -13
  69. data/public/stylesheets/refinery/formatting.css +3 -3
  70. data/public/stylesheets/refinery/refinery.css +49 -44
  71. data/public/stylesheets/refinery/theme.css +1 -1
  72. data/public/stylesheets/refinery/thickbox.css +4 -4
  73. data/public/stylesheets/wymeditor/skins/refinery/skin.css +115 -115
  74. data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +66 -66
  75. data/public/wymeditor/GPL-license.txt +96 -96
  76. data/script/performance/benchmarker +3 -0
  77. data/vendor/plugins/acts_as_indexed/lib/acts_as_indexed.rb +12 -12
  78. data/vendor/plugins/acts_as_indexed/lib/search_atom.rb +7 -7
  79. data/vendor/plugins/acts_as_indexed/lib/search_index.rb +7 -7
  80. data/vendor/plugins/acts_as_indexed/lib/will_paginate_search.rb +1 -1
  81. data/vendor/plugins/acts_as_indexed/test/abstract_unit.rb +5 -5
  82. data/vendor/plugins/acts_as_indexed/test/acts_as_indexed_test.rb +2 -2
  83. data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +140 -140
  84. data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +18 -18
  85. data/vendor/plugins/attachment_fu/install.rb +1 -1
  86. data/vendor/plugins/attachment_fu/lib/geometry.rb +2 -2
  87. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb +3 -3
  88. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb +4 -4
  89. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb +11 -11
  90. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb +7 -7
  91. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb +5 -5
  92. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb +4 -4
  93. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb +1 -1
  94. data/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb +11 -11
  95. data/vendor/plugins/attachment_fu/test/backends/db_file_test.rb +2 -2
  96. data/vendor/plugins/attachment_fu/test/backends/file_system_test.rb +24 -24
  97. data/vendor/plugins/attachment_fu/test/backends/remote/cloudfiles_test.rb +14 -14
  98. data/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb +7 -7
  99. data/vendor/plugins/attachment_fu/test/base_attachment_tests.rb +10 -10
  100. data/vendor/plugins/attachment_fu/test/basic_test.rb +10 -10
  101. data/vendor/plugins/attachment_fu/test/extra_attachment_test.rb +9 -9
  102. data/vendor/plugins/attachment_fu/test/fixtures/attachment.rb +10 -10
  103. data/vendor/plugins/attachment_fu/test/geometry_test.rb +12 -12
  104. data/vendor/plugins/attachment_fu/test/processors/core_image_test.rb +6 -6
  105. data/vendor/plugins/attachment_fu/test/processors/gd2_test.rb +4 -4
  106. data/vendor/plugins/attachment_fu/test/processors/image_science_test.rb +4 -4
  107. data/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb +13 -13
  108. data/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb +33 -33
  109. data/vendor/plugins/attachment_fu/test/schema.rb +14 -14
  110. data/vendor/plugins/attachment_fu/test/test_helper.rb +11 -11
  111. data/vendor/plugins/attachment_fu/test/validation_test.rb +7 -7
  112. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb +7 -7
  113. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb +7 -7
  114. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb +5 -5
  115. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb +7 -7
  116. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb +5 -5
  117. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb +6 -6
  118. data/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb +16 -16
  119. data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +30 -30
  120. data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +4 -4
  121. data/vendor/plugins/authentication/app/controllers/users_controller.rb +7 -7
  122. data/vendor/plugins/authentication/app/helpers/sessions_helper.rb +1 -1
  123. data/vendor/plugins/authentication/app/helpers/users_helper.rb +1 -1
  124. data/vendor/plugins/authentication/app/models/user.rb +56 -56
  125. data/vendor/plugins/authentication/app/models/user_mailer.rb +6 -6
  126. data/vendor/plugins/authentication/app/models/user_observer.rb +2 -2
  127. data/vendor/plugins/authentication/app/models/user_plugin.rb +4 -4
  128. data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb +36 -36
  129. data/vendor/plugins/authentication/app/views/admin/users/edit.html.erb +1 -1
  130. data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
  131. data/vendor/plugins/authentication/app/views/admin/users/new.html.erb +1 -1
  132. data/vendor/plugins/authentication/app/views/sessions/new.html.erb +19 -19
  133. data/vendor/plugins/authentication/app/views/user_mailer/activation.html.erb +1 -1
  134. data/vendor/plugins/authentication/app/views/user_mailer/signup_notification.html.erb +1 -1
  135. data/vendor/plugins/authentication/app/views/users/new.html.erb +3 -3
  136. data/vendor/plugins/authentication/config/routes.rb +1 -1
  137. data/vendor/plugins/authentication/init.rb +5 -5
  138. data/vendor/plugins/authentication/lib/authenticated_system.rb +1 -1
  139. data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +2 -2
  140. data/vendor/plugins/authentication/test/functional/users_controller_test.rb +3 -3
  141. data/vendor/plugins/authentication/test/test_helper.rb +1 -1
  142. data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb +1 -1
  143. data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
  144. data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb +10 -10
  145. data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb +30 -30
  146. data/vendor/plugins/dashboard/config/routes.rb +2 -2
  147. data/vendor/plugins/dashboard/init.rb +6 -6
  148. data/vendor/plugins/images/app/controllers/admin/images_controller.rb +28 -28
  149. data/vendor/plugins/images/app/helpers/admin/images_helper.rb +14 -14
  150. data/vendor/plugins/images/app/models/image.rb +11 -11
  151. data/vendor/plugins/images/app/views/admin/images/_form.html.erb +21 -21
  152. data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb +13 -13
  153. data/vendor/plugins/images/app/views/admin/images/_list_view.html.erb +1 -1
  154. data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb +2 -2
  155. data/vendor/plugins/images/app/views/admin/images/edit.html.erb +1 -1
  156. data/vendor/plugins/images/app/views/admin/images/index.html.erb +15 -15
  157. data/vendor/plugins/images/app/views/admin/images/insert.html.erb +91 -91
  158. data/vendor/plugins/images/app/views/admin/images/new.html.erb +1 -1
  159. data/vendor/plugins/images/config/routes.rb +2 -2
  160. data/vendor/plugins/images/init.rb +7 -7
  161. data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +4 -4
  162. data/vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb +5 -5
  163. data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb +3 -3
  164. data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +3 -3
  165. data/vendor/plugins/inquiries/app/models/inquiry.rb +6 -6
  166. data/vendor/plugins/inquiries/app/models/inquiry_mailer.rb +1 -1
  167. data/vendor/plugins/inquiries/app/models/inquiry_setting.rb +3 -3
  168. data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +19 -19
  169. data/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb +27 -27
  170. data/vendor/plugins/inquiries/app/views/admin/inquiries/show.html.erb +59 -59
  171. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_confirmation_email_form.html.erb +44 -44
  172. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/_notification_recipients_form.html.erb +15 -15
  173. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/edit.html.erb +3 -3
  174. data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb +29 -29
  175. data/vendor/plugins/inquiries/app/views/inquiries/new.html.erb +32 -32
  176. data/vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb +8 -8
  177. data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
  178. data/vendor/plugins/inquiries/app/views/inquiry_mailer/notification.html.erb +1 -1
  179. data/vendor/plugins/inquiries/config/routes.rb +3 -3
  180. data/vendor/plugins/inquiries/init.rb +10 -10
  181. data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +3 -3
  182. data/vendor/plugins/news/app/controllers/news_items_controller.rb +2 -2
  183. data/vendor/plugins/news/app/models/news_item.rb +5 -5
  184. data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +16 -16
  185. data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +14 -14
  186. data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +1 -1
  187. data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +25 -25
  188. data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +1 -1
  189. data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +6 -6
  190. data/vendor/plugins/news/app/views/news_items/index.html.erb +20 -20
  191. data/vendor/plugins/news/app/views/news_items/show.html.erb +16 -16
  192. data/vendor/plugins/news/config/routes.rb +3 -3
  193. data/vendor/plugins/news/init.rb +7 -7
  194. data/vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb +10 -10
  195. data/vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb +4 -4
  196. data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +4 -4
  197. data/vendor/plugins/pages/app/controllers/pages_controller.rb +3 -3
  198. data/vendor/plugins/pages/app/helpers/pages_helper.rb +1 -1
  199. data/vendor/plugins/pages/app/models/page.rb +95 -95
  200. data/vendor/plugins/pages/app/models/page_part.rb +5 -5
  201. data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb +1 -1
  202. data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb +222 -222
  203. data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb +232 -232
  204. data/vendor/plugins/pages/app/views/admin/pages/_list.html.erb +26 -26
  205. data/vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb +3 -3
  206. data/vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb +2 -2
  207. data/vendor/plugins/pages/app/views/admin/pages/edit.html.erb +1 -1
  208. data/vendor/plugins/pages/app/views/admin/pages/index.html.erb +37 -37
  209. data/vendor/plugins/pages/app/views/admin/pages/new.html.erb +1 -1
  210. data/vendor/plugins/pages/app/views/pages/home.html.erb +8 -8
  211. data/vendor/plugins/pages/app/views/pages/show.html.erb +11 -11
  212. data/vendor/plugins/pages/config/routes.rb +5 -5
  213. data/vendor/plugins/pages/init.rb +7 -7
  214. data/vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb +7 -7
  215. data/vendor/plugins/refinery/app/views/admin/_head.html.erb +30 -30
  216. data/vendor/plugins/refinery/app/views/admin/_menu.html.erb +61 -61
  217. data/vendor/plugins/refinery/app/views/layouts/admin.html.erb +32 -32
  218. data/vendor/plugins/refinery/app/views/layouts/application.html.erb +28 -28
  219. data/vendor/plugins/refinery/app/views/shared/_footer.html.erb +4 -4
  220. data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb +11 -11
  221. data/vendor/plugins/refinery/app/views/shared/_header.html.erb +3 -3
  222. data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +1 -1
  223. data/vendor/plugins/refinery/app/views/shared/_menu.html.erb +14 -14
  224. data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb +21 -21
  225. data/vendor/plugins/refinery/app/views/shared/_message.html.erb +8 -8
  226. data/vendor/plugins/refinery/app/views/shared/_submenu.html.erb +2 -2
  227. data/vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb +7 -7
  228. data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb +41 -41
  229. data/vendor/plugins/refinery/app/views/shared/admin/_error_messages_for.html.erb +1 -1
  230. data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb +13 -13
  231. data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb +31 -31
  232. data/vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb +65 -65
  233. data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb +16 -16
  234. data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb +5 -5
  235. data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb +8 -8
  236. data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
  237. data/vendor/plugins/refinery/app/views/wymiframe.html.erb +6 -6
  238. data/vendor/plugins/refinery/config/routes.rb +5 -5
  239. data/vendor/plugins/refinery/init.rb +8 -8
  240. data/vendor/plugins/refinery/lib/crud.rb +17 -17
  241. data/vendor/plugins/refinery/lib/generators/refinery/install.rb +1 -1
  242. data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb +17 -17
  243. data/vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb +3 -3
  244. data/vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb +2 -2
  245. data/vendor/plugins/refinery/lib/generators/refinery/templates/init.rb +6 -6
  246. data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +22 -22
  247. data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -4
  248. data/vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb +10 -10
  249. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +3 -3
  250. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb +15 -15
  251. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb +1 -1
  252. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/edit.html.erb +1 -1
  253. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb +33 -33
  254. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/new.html.erb +1 -1
  255. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb +14 -14
  256. data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +21 -21
  257. data/vendor/plugins/refinery/lib/indexer.rb +29 -29
  258. data/vendor/plugins/refinery/lib/refinery.rb +10 -10
  259. data/vendor/plugins/refinery/lib/refinery/activity.rb +5 -5
  260. data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb +15 -15
  261. data/vendor/plugins/refinery/lib/refinery/application_controller.rb +39 -39
  262. data/vendor/plugins/refinery/lib/refinery/application_helper.rb +69 -69
  263. data/vendor/plugins/refinery/lib/refinery/form_helpers.rb +18 -18
  264. data/vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb +5 -5
  265. data/vendor/plugins/refinery/lib/refinery/initializer.rb +2 -2
  266. data/vendor/plugins/refinery/lib/refinery/link_renderer.rb +13 -13
  267. data/vendor/plugins/refinery/lib/refinery/plugin.rb +24 -24
  268. data/vendor/plugins/refinery/lib/refinery/plugins.rb +2 -2
  269. data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb +8 -8
  270. data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb +19 -19
  271. data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb +29 -29
  272. data/vendor/plugins/refinery_dialogs/config/routes.rb +2 -2
  273. data/vendor/plugins/refinery_dialogs/init.rb +7 -7
  274. data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb +2 -2
  275. data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +52 -52
  276. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb +11 -11
  277. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_make_sortable.html.erb +3 -3
  278. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb +12 -12
  279. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/edit.html.erb +2 -2
  280. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb +19 -19
  281. data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/new.html.erb +1 -1
  282. data/vendor/plugins/refinery_settings/config/routes.rb +3 -3
  283. data/vendor/plugins/refinery_settings/init.rb +8 -8
  284. data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb +48 -48
  285. data/vendor/plugins/resources/app/models/resource.rb +12 -12
  286. data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb +21 -21
  287. data/vendor/plugins/resources/app/views/admin/resources/_resource.html.erb +15 -15
  288. data/vendor/plugins/resources/app/views/admin/resources/edit.html.erb +1 -1
  289. data/vendor/plugins/resources/app/views/admin/resources/index.html.erb +19 -19
  290. data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb +86 -86
  291. data/vendor/plugins/resources/app/views/admin/resources/new.html.erb +1 -1
  292. data/vendor/plugins/resources/config/routes.rb +2 -2
  293. data/vendor/plugins/resources/init.rb +6 -6
  294. metadata +31 -23
@@ -5,7 +5,7 @@ class CloudfilesTest < Test::Unit::TestCase
5
5
  def self.test_CloudFiles?
6
6
  true unless ENV["TEST_CLOUDFILES"] == "false"
7
7
  end
8
-
8
+
9
9
  if test_CloudFiles? && File.exist?(File.join(File.dirname(__FILE__), '../../rackspace_cloudfiles.yml'))
10
10
  include BaseAttachmentTests
11
11
  attachment_model CloudFilesAttachment
@@ -17,7 +17,7 @@ class CloudfilesTest < Test::Unit::TestCase
17
17
  end
18
18
 
19
19
  test_against_subclass :test_should_create_correct_container_name, CloudFilesAttachment
20
-
20
+
21
21
  def test_should_create_default_path_prefix(klass = CloudFilesAttachment)
22
22
  attachment_model klass
23
23
  attachment = upload_file :filename => '/files/rails.png'
@@ -25,7 +25,7 @@ class CloudfilesTest < Test::Unit::TestCase
25
25
  end
26
26
 
27
27
  test_against_subclass :test_should_create_default_path_prefix, CloudFilesAttachment
28
-
28
+
29
29
  def test_should_create_custom_path_prefix(klass = CloudFilesWithPathPrefixAttachment)
30
30
  attachment_model klass
31
31
  attachment = upload_file :filename => '/files/rails.png'
@@ -33,16 +33,16 @@ class CloudfilesTest < Test::Unit::TestCase
33
33
  end
34
34
 
35
35
  test_against_subclass :test_should_create_custom_path_prefix, CloudFilesWithPathPrefixAttachment
36
-
37
-
36
+
37
+
38
38
  def test_should_create_valid_url(klass = CloudFilesAttachment)
39
39
  attachment_model klass
40
40
  attachment = upload_file :filename => '/files/rails.png'
41
41
  assert_match(%r!http://cdn.cloudfiles.mosso.com/(.*?)/cloud_files_attachments/1/rails.png!, attachment.cloudfiles_url)
42
42
  end
43
-
43
+
44
44
  test_against_subclass :test_should_create_valid_url, CloudFilesAttachment
45
-
45
+
46
46
  def test_should_save_attachment(klass = CloudFilesAttachment)
47
47
  attachment_model klass
48
48
  assert_created do
@@ -55,7 +55,7 @@ class CloudfilesTest < Test::Unit::TestCase
55
55
  end
56
56
 
57
57
  test_against_subclass :test_should_save_attachment, CloudFilesAttachment
58
-
58
+
59
59
  def test_should_delete_attachment_from_cloud_files_when_attachment_record_destroyed(klass = CloudFilesAttachment)
60
60
  attachment_model klass
61
61
  attachment = upload_file :filename => '/files/rails.png'
@@ -74,19 +74,19 @@ class CloudfilesTest < Test::Unit::TestCase
74
74
  end
75
75
 
76
76
  test_against_subclass :test_should_delete_attachment_from_cloud_files_when_attachment_record_destroyed, CloudFilesAttachment
77
-
78
-
79
-
77
+
78
+
79
+
80
80
  protected
81
81
  def http_response_for(url)
82
82
  url = URI.parse(url)
83
83
  Net::HTTP.start(url.host, url.port) {|http| http.request_head(url.path) }
84
84
  end
85
-
85
+
86
86
  def s3_protocol
87
87
  Technoweenie::AttachmentFu::Backends::S3Backend.protocol
88
88
  end
89
-
89
+
90
90
  def s3_hostname
91
91
  Technoweenie::AttachmentFu::Backends::S3Backend.hostname
92
92
  end
@@ -99,4 +99,4 @@ class CloudfilesTest < Test::Unit::TestCase
99
99
  puts "s3 config file not loaded, tests not running"
100
100
  end
101
101
  end
102
- end
102
+ end
@@ -5,7 +5,7 @@ class S3Test < Test::Unit::TestCase
5
5
  def self.test_S3?
6
6
  true unless ENV["TEST_S3"] == "false"
7
7
  end
8
-
8
+
9
9
  if test_S3? && File.exist?(File.join(File.dirname(__FILE__), '../../amazon_s3.yml'))
10
10
  include BaseAttachmentTests
11
11
  attachment_model S3Attachment
@@ -49,14 +49,14 @@ class S3Test < Test::Unit::TestCase
49
49
  end
50
50
 
51
51
  test_against_subclass :test_should_create_authenticated_url, S3Attachment
52
-
52
+
53
53
  def test_should_create_authenticated_url_for_thumbnail(klass = S3Attachment)
54
54
  attachment_model klass
55
55
  attachment = upload_file :filename => '/files/rails.png'
56
56
  ['large', :large].each do |thumbnail|
57
57
  assert_match(
58
- /^http.+rails_large\.png.+AWSAccessKeyId.+Expires.+Signature/,
59
- attachment.authenticated_s3_url(thumbnail),
58
+ /^http.+rails_large\.png.+AWSAccessKeyId.+Expires.+Signature/,
59
+ attachment.authenticated_s3_url(thumbnail),
60
60
  "authenticated_s3_url failed with #{thumbnail.class} parameter"
61
61
  )
62
62
  end
@@ -99,11 +99,11 @@ class S3Test < Test::Unit::TestCase
99
99
  url = URI.parse(url)
100
100
  Net::HTTP.start(url.host, url.port) {|http| http.request_head(url.path) }
101
101
  end
102
-
102
+
103
103
  def s3_protocol
104
104
  Technoweenie::AttachmentFu::Backends::S3Backend.protocol
105
105
  end
106
-
106
+
107
107
  def s3_hostname
108
108
  Technoweenie::AttachmentFu::Backends::S3Backend.hostname
109
109
  end
@@ -116,4 +116,4 @@ class S3Test < Test::Unit::TestCase
116
116
  puts "s3 config file not loaded, tests not running"
117
117
  end
118
118
  end
119
- end
119
+ end
@@ -11,7 +11,7 @@ module BaseAttachmentTests
11
11
  assert_nil attachment.height
12
12
  end
13
13
  end
14
-
14
+
15
15
  def test_should_create_file_from_merb_temp_file
16
16
  assert_created do
17
17
  attachment = upload_merb_file :filename => '/files/foo.txt'
@@ -24,32 +24,32 @@ module BaseAttachmentTests
24
24
  assert_nil attachment.height
25
25
  end
26
26
  end
27
-
27
+
28
28
  def test_reassign_attribute_data
29
29
  assert_created 1 do
30
30
  attachment = upload_file :filename => '/files/rails.png'
31
31
  assert_valid attachment
32
32
  assert attachment.size > 0, "no data was set"
33
-
33
+
34
34
  attachment.set_temp_data 'wtf'
35
35
  assert attachment.save_attachment?
36
36
  attachment.save!
37
-
37
+
38
38
  assert_equal 'wtf', attachment_model.find(attachment.id).send(:current_data)
39
39
  end
40
40
  end
41
-
41
+
42
42
  def test_no_reassign_attribute_data_on_nil
43
43
  assert_created 1 do
44
44
  attachment = upload_file :filename => '/files/rails.png'
45
45
  assert_valid attachment
46
46
  assert attachment.size > 0, "no data was set"
47
-
47
+
48
48
  attachment.set_temp_data nil
49
49
  assert !attachment.save_attachment?
50
50
  end
51
51
  end
52
-
52
+
53
53
  def test_should_overwrite_old_contents_when_updating
54
54
  attachment = upload_file :filename => '/files/rails.png'
55
55
  assert_not_created do # no new db_file records
@@ -60,18 +60,18 @@ module BaseAttachmentTests
60
60
  end
61
61
  end
62
62
  end
63
-
63
+
64
64
  def test_should_save_without_updating_file
65
65
  attachment = upload_file :filename => '/files/foo.txt'
66
66
  assert_valid attachment
67
67
  assert !attachment.save_attachment?
68
68
  assert_nothing_raised { attachment.save! }
69
69
  end
70
-
70
+
71
71
  def test_should_handle_nil_file_upload
72
72
  attachment = attachment_model.create :uploaded_data => ''
73
73
  assert_raise ActiveRecord::RecordInvalid do
74
74
  attachment.save!
75
75
  end
76
76
  end
77
- end
77
+ end
@@ -4,15 +4,15 @@ class BasicTest < Test::Unit::TestCase
4
4
  def test_should_set_default_min_size
5
5
  assert_equal 1, Attachment.attachment_options[:min_size]
6
6
  end
7
-
7
+
8
8
  def test_should_set_default_max_size
9
9
  assert_equal 1.megabyte, Attachment.attachment_options[:max_size]
10
10
  end
11
-
11
+
12
12
  def test_should_set_default_size
13
13
  assert_equal (1..1.megabyte), Attachment.attachment_options[:size]
14
14
  end
15
-
15
+
16
16
  def test_should_set_default_thumbnails_option
17
17
  assert_equal Hash.new, Attachment.attachment_options[:thumbnails]
18
18
  end
@@ -20,19 +20,19 @@ class BasicTest < Test::Unit::TestCase
20
20
  def test_should_set_default_thumbnail_class
21
21
  assert_equal Attachment, Attachment.attachment_options[:thumbnail_class]
22
22
  end
23
-
23
+
24
24
  def test_should_normalize_content_types_to_array
25
25
  assert_equal %w(pdf), PdfAttachment.attachment_options[:content_type]
26
26
  assert_equal %w(pdf doc txt), DocAttachment.attachment_options[:content_type]
27
27
  assert_equal Technoweenie::AttachmentFu.content_types, ImageAttachment.attachment_options[:content_type]
28
28
  assert_equal ['pdf'] + Technoweenie::AttachmentFu.content_types, ImageOrPdfAttachment.attachment_options[:content_type]
29
29
  end
30
-
30
+
31
31
  def test_should_sanitize_content_type
32
32
  @attachment = Attachment.new :content_type => ' foo '
33
33
  assert_equal 'foo', @attachment.content_type
34
34
  end
35
-
35
+
36
36
  def test_should_sanitize_filenames
37
37
  @attachment = Attachment.new :filename => 'blah/foo.bar'
38
38
  assert_equal 'foo.bar', @attachment.filename
@@ -42,25 +42,25 @@ class BasicTest < Test::Unit::TestCase
42
42
 
43
43
  @attachment.filename = 'f o!O-.bar'
44
44
  assert_equal 'f_o_O-.bar', @attachment.filename
45
-
45
+
46
46
  @attachment.filename = 'sheeps_says_bææ'
47
47
  assert_equal 'sheeps_says_b__', @attachment.filename
48
48
 
49
49
  @attachment.filename = nil
50
50
  assert_nil @attachment.filename
51
51
  end
52
-
52
+
53
53
  def test_should_convert_thumbnail_name
54
54
  @attachment = FileAttachment.new :filename => 'foo.bar'
55
55
  assert_equal 'foo.bar', @attachment.thumbnail_name_for(nil)
56
56
  assert_equal 'foo.bar', @attachment.thumbnail_name_for('')
57
57
  assert_equal 'foo_blah.bar', @attachment.thumbnail_name_for(:blah)
58
58
  assert_equal 'foo_blah.blah.bar', @attachment.thumbnail_name_for('blah.blah')
59
-
59
+
60
60
  @attachment.filename = 'foo.bar.baz'
61
61
  assert_equal 'foo.bar_blah.baz', @attachment.thumbnail_name_for(:blah)
62
62
  end
63
-
63
+
64
64
  def test_should_require_valid_thumbnails_option
65
65
  klass = Class.new(ActiveRecord::Base)
66
66
  assert_raise ArgumentError do
@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
3
3
  class OrphanAttachmentTest < Test::Unit::TestCase
4
4
  include BaseAttachmentTests
5
5
  attachment_model OrphanAttachment
6
-
6
+
7
7
  def test_should_create_image_from_uploaded_file
8
8
  assert_created do
9
9
  attachment = upload_file :filename => '/files/rails.png'
@@ -13,7 +13,7 @@ class OrphanAttachmentTest < Test::Unit::TestCase
13
13
  assert !attachment.size.zero?
14
14
  end
15
15
  end
16
-
16
+
17
17
  def test_should_create_file_from_uploaded_file
18
18
  assert_created do
19
19
  attachment = upload_file :filename => '/files/foo.txt'
@@ -23,7 +23,7 @@ class OrphanAttachmentTest < Test::Unit::TestCase
23
23
  assert !attachment.size.zero?
24
24
  end
25
25
  end
26
-
26
+
27
27
  def test_should_create_file_from_merb_temp_file
28
28
  assert_created do
29
29
  attachment = upload_merb_file :filename => '/files/foo.txt'
@@ -33,7 +33,7 @@ class OrphanAttachmentTest < Test::Unit::TestCase
33
33
  assert !attachment.size.zero?
34
34
  end
35
35
  end
36
-
36
+
37
37
  def test_should_create_image_from_uploaded_file_with_custom_content_type
38
38
  assert_created do
39
39
  attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
@@ -44,18 +44,18 @@ class OrphanAttachmentTest < Test::Unit::TestCase
44
44
  #assert_equal 1784, attachment.size
45
45
  end
46
46
  end
47
-
47
+
48
48
  def test_should_create_thumbnail
49
49
  attachment = upload_file :filename => '/files/rails.png'
50
-
50
+
51
51
  assert_raise Technoweenie::AttachmentFu::ThumbnailError do
52
52
  attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 50, 50)
53
53
  end
54
54
  end
55
-
55
+
56
56
  def test_should_create_thumbnail_with_geometry_string
57
57
  attachment = upload_file :filename => '/files/rails.png'
58
-
58
+
59
59
  assert_raise Technoweenie::AttachmentFu::ThumbnailError do
60
60
  attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 'x50')
61
61
  end
@@ -64,4 +64,4 @@ end
64
64
 
65
65
  class MinimalAttachmentTest < OrphanAttachmentTest
66
66
  attachment_model MinimalAttachment
67
- end
67
+ end
@@ -48,11 +48,11 @@ class FileAttachmentWithStringId < ActiveRecord::Base
48
48
  set_table_name 'file_attachments_with_string_id'
49
49
  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
50
50
  validates_as_attachment
51
-
51
+
52
52
  before_validation :auto_generate_id
53
53
  before_save :auto_generate_id
54
54
  @@last_id = 0
55
-
55
+
56
56
  private
57
57
  def auto_generate_id
58
58
  @@last_id += 1
@@ -64,11 +64,11 @@ class FileAttachmentWithUuid < ActiveRecord::Base
64
64
  set_table_name 'file_attachments_with_string_id'
65
65
  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick, :uuid_primary_key => true
66
66
  validates_as_attachment
67
-
67
+
68
68
  before_validation :auto_generate_id
69
69
  before_save :auto_generate_id
70
70
  @@last_id = 0
71
-
71
+
72
72
  private
73
73
  def auto_generate_id
74
74
  @@last_id += 1
@@ -110,7 +110,7 @@ end
110
110
  class MinimalAttachment < ActiveRecord::Base
111
111
  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
112
112
  validates_as_attachment
113
-
113
+
114
114
  def filename
115
115
  "#{id}.file"
116
116
  end
@@ -165,7 +165,7 @@ begin
165
165
  class ImageThumbnailCrop < MiniMagickAttachment
166
166
  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
167
167
  :thumbnails => { :square => "50x50c", :vertical => "30x60c", :horizontal => "60x30c"}
168
-
168
+
169
169
  # TODO this is a bad duplication, this method is in the MiniMagick Processor
170
170
  def self.calculate_offset(image_width,image_height,image_aspect,thumb_width,thumb_height,thumb_aspect)
171
171
  # only crop if image is not smaller in both dimensions
@@ -179,7 +179,7 @@ begin
179
179
  command = "#{thumb_width}x#{image_height}+#{offset}+0"
180
180
 
181
181
  # normal thumbnail generation
182
- # calculate height and offset y, width is fixed
182
+ # calculate height and offset y, width is fixed
183
183
  elsif (image_aspect <= thumb_aspect or image_width < thumb_width) and image_height > thumb_height
184
184
  height = image_width / thumb_aspect
185
185
  offset = (image_height / 2) - (height / 2)
@@ -205,7 +205,7 @@ begin
205
205
  has_attachment :storage => :s3, :processor => :rmagick, :s3_config_path => File.join(File.dirname(__FILE__), '../amazon_s3.yml')
206
206
  validates_as_attachment
207
207
  end
208
-
208
+
209
209
  class CloudFilesAttachment < ActiveRecord::Base
210
210
  has_attachment :storage => :cloud_files, :processor => :rmagick, :cloudfiles_config_path => File.join(File.dirname(__FILE__), '../rackspace_cloudfiles.yml')
211
211
  validates_as_attachment
@@ -215,12 +215,12 @@ begin
215
215
  has_attachment :storage => :s3, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
216
216
  validates_as_attachment
217
217
  end
218
-
218
+
219
219
  class CloudFilesWithPathPrefixAttachment < CloudFilesAttachment
220
220
  has_attachment :storage => :cloud_files, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
221
221
  validates_as_attachment
222
222
  end
223
-
223
+
224
224
  rescue
225
225
  puts "S3 error: #{$!}"
226
226
  end
@@ -8,49 +8,49 @@ class GeometryTest < Test::Unit::TestCase
8
8
  "60x60" => [47, 60],
9
9
  "100x100" => [78, 100]
10
10
  end
11
-
11
+
12
12
  def test_should_resize_no_width
13
13
  assert_geometry 50, 64,
14
14
  "x50" => [39, 50],
15
15
  "x60" => [47, 60],
16
16
  "x100" => [78, 100]
17
17
  end
18
-
18
+
19
19
  def test_should_resize_no_height
20
20
  assert_geometry 50, 64,
21
21
  "50" => [50, 64],
22
22
  "60" => [60, 77],
23
23
  "100" => [100, 128]
24
24
  end
25
-
25
+
26
26
  def test_should_resize_no_height_with_x
27
27
  assert_geometry 50, 64,
28
28
  "50x" => [50, 64],
29
29
  "60x" => [60, 77],
30
30
  "100x" => [100, 128]
31
31
  end
32
-
32
+
33
33
  def test_should_resize_with_percent
34
34
  assert_geometry 50, 64,
35
35
  "50x50%" => [25, 32],
36
36
  "60x60%" => [30, 38],
37
37
  "120x112%" => [60, 72]
38
38
  end
39
-
39
+
40
40
  def test_should_resize_with_percent_and_no_width
41
41
  assert_geometry 50, 64,
42
42
  "x50%" => [50, 32],
43
43
  "x60%" => [50, 38],
44
44
  "x112%" => [50, 72]
45
45
  end
46
-
46
+
47
47
  def test_should_resize_with_percent_and_no_height
48
48
  assert_geometry 50, 64,
49
49
  "50%" => [25, 32],
50
50
  "60%" => [30, 38],
51
51
  "120%" => [60, 77]
52
52
  end
53
-
53
+
54
54
  def test_should_resize_with_less
55
55
  assert_geometry 50, 64,
56
56
  "50x50<" => [50, 64],
@@ -59,14 +59,14 @@ class GeometryTest < Test::Unit::TestCase
59
59
  "100x112<" => [88, 112],
60
60
  "40x70<" => [50, 64]
61
61
  end
62
-
62
+
63
63
  def test_should_resize_with_less_and_no_width
64
64
  assert_geometry 50, 64,
65
65
  "x50<" => [50, 64],
66
66
  "x60<" => [50, 64],
67
67
  "x100<" => [78, 100]
68
68
  end
69
-
69
+
70
70
  def test_should_resize_with_less_and_no_height
71
71
  assert_geometry 50, 64,
72
72
  "50<" => [50, 64],
@@ -82,14 +82,14 @@ class GeometryTest < Test::Unit::TestCase
82
82
  "100x112>" => [50, 64],
83
83
  "40x70>" => [40, 51]
84
84
  end
85
-
85
+
86
86
  def test_should_resize_with_greater_and_no_width
87
87
  assert_geometry 50, 64,
88
88
  "x40>" => [31, 40],
89
89
  "x60>" => [47, 60],
90
90
  "x100>" => [50, 64]
91
91
  end
92
-
92
+
93
93
  def test_should_resize_with_greater_and_no_height
94
94
  assert_geometry 50, 64,
95
95
  "40>" => [40, 51],
@@ -105,4 +105,4 @@ class GeometryTest < Test::Unit::TestCase
105
105
  2.times { assert_equal result, [width, height] / geo }
106
106
  end
107
107
  end
108
- end
108
+ end