alchemy_cms 2.6.3 → 2.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (246) hide show
  1. checksums.yaml +4 -4
  2. data/.simplecov +14 -0
  3. data/.travis.yml +1 -1
  4. data/Gemfile +7 -6
  5. data/README.md +15 -5
  6. data/alchemy_cms.gemspec +3 -2
  7. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +9 -17
  8. data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +70 -0
  9. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +80 -0
  10. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +43 -19
  11. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
  12. data/app/assets/javascripts/alchemy/alchemy.js +4 -2
  13. data/app/assets/javascripts/alchemy/alchemy.onload.js.coffee +1 -1
  14. data/app/assets/javascripts/alchemy/alchemy.spinner.js.coffee +14 -0
  15. data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee.erb +96 -0
  16. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +22 -0
  17. data/app/assets/javascripts/alchemy/alchemy.windows.js.coffee +28 -17
  18. data/app/assets/stylesheets/alchemy/base.scss +6 -0
  19. data/app/assets/stylesheets/alchemy/elements.scss +2 -28
  20. data/app/assets/stylesheets/alchemy/errors.scss +1 -1
  21. data/app/assets/stylesheets/alchemy/menubar.css.scss +2 -0
  22. data/app/assets/stylesheets/alchemy/sitemap.scss +21 -34
  23. data/app/assets/stylesheets/alchemy/tables.scss +13 -3
  24. data/app/controllers/alchemy/admin/attachments_controller.rb +10 -5
  25. data/app/controllers/alchemy/admin/base_controller.rb +19 -0
  26. data/app/controllers/alchemy/admin/contents_controller.rb +1 -4
  27. data/app/controllers/alchemy/admin/dashboard_controller.rb +2 -1
  28. data/app/controllers/alchemy/admin/elements_controller.rb +1 -1
  29. data/app/controllers/alchemy/admin/essence_files_controller.rb +1 -1
  30. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +70 -56
  31. data/app/controllers/alchemy/admin/pages_controller.rb +37 -114
  32. data/app/controllers/alchemy/admin/pictures_controller.rb +5 -12
  33. data/app/controllers/alchemy/admin/resources_controller.rb +3 -1
  34. data/app/controllers/alchemy/admin/trash_controller.rb +1 -1
  35. data/app/controllers/alchemy/attachments_controller.rb +1 -1
  36. data/app/controllers/alchemy/base_controller.rb +3 -15
  37. data/app/controllers/alchemy/messages_controller.rb +4 -10
  38. data/app/controllers/alchemy/pages_controller.rb +6 -6
  39. data/app/controllers/alchemy/passwords_controller.rb +1 -1
  40. data/app/controllers/alchemy/user_sessions_controller.rb +1 -1
  41. data/app/helpers/alchemy/admin/base_helper.rb +49 -230
  42. data/app/helpers/alchemy/admin/contents_helper.rb +5 -1
  43. data/app/helpers/alchemy/admin/elements_helper.rb +19 -47
  44. data/app/helpers/alchemy/admin/essences_helper.rb +59 -17
  45. data/app/helpers/alchemy/admin/navigation_helper.rb +204 -0
  46. data/app/helpers/alchemy/admin/pages_helper.rb +22 -79
  47. data/app/helpers/alchemy/admin/pictures_helper.rb +1 -1
  48. data/app/helpers/alchemy/admin/tags_helper.rb +42 -0
  49. data/app/helpers/alchemy/base_helper.rb +0 -11
  50. data/app/helpers/alchemy/elements_helper.rb +48 -25
  51. data/app/helpers/alchemy/essences_helper.rb +0 -20
  52. data/app/helpers/alchemy/pages_helper.rb +18 -14
  53. data/app/helpers/alchemy/url_helper.rb +1 -0
  54. data/app/mailers/alchemy/messages.rb +4 -6
  55. data/app/models/alchemy/attachment.rb +3 -0
  56. data/app/models/alchemy/cell.rb +33 -35
  57. data/app/models/alchemy/content.rb +20 -111
  58. data/app/models/alchemy/content/factory.rb +188 -0
  59. data/app/models/alchemy/element.rb +51 -200
  60. data/app/models/alchemy/element/definitions.rb +52 -0
  61. data/app/models/alchemy/element/presenters.rb +87 -0
  62. data/app/models/alchemy/essence_date.rb +1 -1
  63. data/app/models/alchemy/essence_file.rb +6 -7
  64. data/app/models/alchemy/essence_picture.rb +19 -4
  65. data/app/models/alchemy/message.rb +18 -14
  66. data/app/models/alchemy/page.rb +120 -214
  67. data/app/models/alchemy/page/elements.rb +145 -36
  68. data/app/models/alchemy/page/natures.rb +90 -0
  69. data/app/models/alchemy/page/scopes.rb +93 -0
  70. data/app/models/alchemy/page/users.rb +25 -0
  71. data/app/models/alchemy/picture.rb +15 -0
  72. data/app/models/alchemy/site.rb +15 -1
  73. data/app/models/alchemy/site/layout.rb +38 -0
  74. data/app/models/alchemy/user.rb +13 -3
  75. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +7 -7
  76. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +8 -8
  77. data/app/views/alchemy/admin/attachments/_tag_list.html.erb +1 -16
  78. data/app/views/alchemy/admin/attachments/destroy.js.erb +1 -4
  79. data/app/views/alchemy/admin/contents/create.js.erb +1 -1
  80. data/app/views/alchemy/admin/dashboard/index.html.erb +14 -13
  81. data/app/views/alchemy/admin/elements/_element_head.html.erb +7 -7
  82. data/app/views/alchemy/admin/elements/_refresh_editor.js.erb +10 -0
  83. data/app/views/alchemy/admin/elements/create.js.erb +44 -44
  84. data/app/views/alchemy/admin/elements/fold.js.erb +22 -26
  85. data/app/views/alchemy/admin/elements/trash.js.erb +1 -1
  86. data/app/views/alchemy/admin/elements/update.js.erb +22 -25
  87. data/app/views/alchemy/admin/essence_files/assign.js.erb +8 -3
  88. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +14 -12
  89. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +22 -39
  90. data/app/views/alchemy/admin/pages/_page.html.erb +73 -80
  91. data/app/views/alchemy/admin/pages/destroy.js.erb +2 -2
  92. data/app/views/alchemy/admin/pages/edit.html.erb +21 -18
  93. data/app/views/alchemy/admin/pages/fold.js.erb +1 -0
  94. data/app/views/alchemy/admin/pages/info.html.erb +32 -0
  95. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +11 -13
  96. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +20 -20
  97. data/app/views/alchemy/admin/partials/_sub_navigation.html.erb +8 -0
  98. data/app/views/alchemy/admin/partials/_toolbar_button.html.erb +25 -0
  99. data/app/views/alchemy/admin/partials/_upload_form.html.erb +15 -15
  100. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +39 -39
  101. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +10 -10
  102. data/app/views/alchemy/admin/pictures/_tag_list.html.erb +1 -16
  103. data/app/views/alchemy/admin/resources/destroy.js.erb +1 -1
  104. data/app/views/alchemy/base/500.html.erb +1 -1
  105. data/app/views/alchemy/base/permission_denied.js.erb +1 -1
  106. data/app/views/alchemy/base/redirect.js.erb +1 -1
  107. data/app/views/alchemy/essences/_essence_link_editor.html.erb +1 -1
  108. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +1 -1
  109. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
  110. data/app/views/alchemy/essences/_essence_text_editor.html.erb +1 -1
  111. data/app/views/alchemy/essences/{_essence_picture_tools.html.erb → shared/_essence_picture_tools.html.erb} +5 -5
  112. data/app/views/alchemy/essences/{_linkable_essence_tools.html.erb → shared/_linkable_essence_tools.html.erb} +0 -0
  113. data/app/views/alchemy/messages/contact_form_mail.de.text.erb +12 -0
  114. data/app/views/alchemy/messages/contact_form_mail.en.text.erb +12 -0
  115. data/app/views/alchemy/notifications/reset_password_instructions.de.text.erb +1 -1
  116. data/app/views/alchemy/notifications/reset_password_instructions.en.text.erb +2 -2
  117. data/app/views/alchemy/pages/sitemap.xml.erb +3 -5
  118. data/app/views/alchemy/user_sessions/leave.html.erb +1 -1
  119. data/app/views/layouts/alchemy/admin.html.erb +4 -2
  120. data/app/views/layouts/alchemy/sitemap.xml.erb +1 -1
  121. data/bin/alchemy +7 -13
  122. data/config/alchemy/config.yml +1 -0
  123. data/config/authorization_rules.rb +2 -3
  124. data/config/initializers/dragonfly.rb +2 -0
  125. data/config/locales/alchemy.de.yml +8 -9
  126. data/config/locales/alchemy.en.yml +7 -4
  127. data/config/routes.rb +3 -0
  128. data/db/migrate/{20130214233001_alchemy_two_point_five.rb → 20130827094554_alchemy_two_point_six.rb} +29 -6
  129. data/lib/alchemy/auth/engine.rb +9 -0
  130. data/lib/alchemy/capistrano.rb +37 -12
  131. data/lib/alchemy/config.rb +48 -35
  132. data/lib/alchemy/engine.rb +35 -6
  133. data/lib/alchemy/essence.rb +25 -29
  134. data/lib/alchemy/ferret/search.rb +86 -0
  135. data/lib/alchemy/{scoped_pagination_url_helper.rb → kaminari/scoped_pagination_url_helper.rb} +0 -0
  136. data/lib/alchemy/logger.rb +3 -4
  137. data/lib/alchemy/page_layout.rb +124 -55
  138. data/lib/alchemy/resource.rb +0 -10
  139. data/lib/alchemy/resources_helper.rb +0 -5
  140. data/lib/alchemy/seeder.rb +1 -32
  141. data/lib/alchemy/shell.rb +6 -1
  142. data/lib/alchemy/tinymce.rb +41 -32
  143. data/lib/alchemy/upgrader.rb +3 -1
  144. data/lib/alchemy/upgrader/two_point_five.rb +15 -8
  145. data/lib/alchemy/upgrader/two_point_one.rb +10 -10
  146. data/lib/alchemy/upgrader/two_point_two.rb +96 -51
  147. data/lib/alchemy/version.rb +1 -1
  148. data/lib/alchemy_cms.rb +5 -46
  149. data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +1 -1
  150. data/lib/rails/generators/alchemy/devise/devise_generator.rb +9 -4
  151. data/lib/rails/generators/alchemy/essence/essence_generator.rb +7 -6
  152. data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +1 -1
  153. data/lib/rails/generators/alchemy/scaffold/files/_standard.html.erb +1 -0
  154. data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +1 -0
  155. data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb +23 -0
  156. data/lib/rails/generators/alchemy/site_layouts/templates/layout.html.erb +1 -0
  157. data/lib/rails/generators/alchemy/site_layouts/templates/layout.html.haml +1 -0
  158. data/lib/rails/generators/alchemy/site_layouts/templates/layout.html.slim +1 -0
  159. data/lib/rails/templates/alchemy.rb +2 -2
  160. data/lib/tasks/alchemy/db.rake +3 -1
  161. data/lib/tasks/alchemy/tidy.rake +82 -0
  162. data/lib/tasks/alchemy/upgrade.rake +2 -1
  163. data/spec/controllers/admin/attachments_controller_spec.rb +124 -0
  164. data/spec/controllers/admin/base_controller_spec.rb +35 -0
  165. data/spec/controllers/admin/clipboard_controller_spec.rb +1 -1
  166. data/spec/controllers/admin/contents_controller_spec.rb +17 -26
  167. data/spec/controllers/admin/dashboard_controller_spec.rb +121 -0
  168. data/spec/controllers/admin/elements_controller_spec.rb +1 -1
  169. data/spec/controllers/admin/essence_files_controller_spec.rb +67 -0
  170. data/spec/controllers/admin/essence_pictures_controller_spec.rb +161 -0
  171. data/spec/controllers/admin/languages_controller_spec.rb +1 -1
  172. data/spec/controllers/admin/layoutpages_controller_spec.rb +28 -0
  173. data/spec/controllers/admin/pages_controller_spec.rb +164 -118
  174. data/spec/controllers/admin/pictures_controller_spec.rb +89 -0
  175. data/spec/controllers/admin/trash_controller_spec.rb +21 -31
  176. data/spec/controllers/admin/users_controller_spec.rb +114 -85
  177. data/spec/controllers/attachments_controller_spec.rb +6 -2
  178. data/spec/controllers/base_controller_spec.rb +22 -0
  179. data/spec/controllers/elements_controller_spec.rb +1 -1
  180. data/spec/controllers/messages_controller_spec.rb +200 -0
  181. data/spec/controllers/pictures_controller_spec.rb +1 -1
  182. data/spec/controllers/user_sessions_controller_spec.rb +7 -6
  183. data/spec/controllers/users_controller_spec.rb +2 -2
  184. data/spec/dummy/config/alchemy/cells.yml +2 -0
  185. data/spec/dummy/config/application.rb +19 -8
  186. data/spec/dummy/db/migrate/{20130214233001_alchemy_two_point_five.rb → 20130827094554_alchemy_two_point_six.rb} +29 -6
  187. data/spec/dummy/db/schema.rb +1 -1
  188. data/spec/fast_specs.rb +15 -0
  189. data/spec/helpers/admin/base_helper_spec.rb +53 -34
  190. data/spec/helpers/admin/contents_helper_spec.rb +15 -7
  191. data/spec/helpers/admin/elements_helper_spec.rb +79 -34
  192. data/spec/helpers/admin/essences_helper_spec.rb +45 -31
  193. data/spec/helpers/admin/navigation_helper_spec.rb +204 -0
  194. data/spec/helpers/admin/pages_helper_spec.rb +25 -15
  195. data/spec/helpers/admin/tags_helper_spec.rb +62 -2
  196. data/spec/helpers/elements_helper_spec.rb +202 -138
  197. data/spec/helpers/pages_helper_spec.rb +48 -0
  198. data/spec/helpers/url_helper_spec.rb +7 -0
  199. data/spec/libraries/config_spec.rb +110 -3
  200. data/spec/libraries/essence_spec.rb +29 -9
  201. data/spec/libraries/page_layout_spec.rb +134 -0
  202. data/spec/libraries/resource_spec.rb +3 -16
  203. data/spec/libraries/resources_helper_spec.rb +4 -8
  204. data/spec/libraries/shell_spec.rb +1 -0
  205. data/spec/libraries/tinymce_spec.rb +61 -0
  206. data/spec/mailers/messages_spec.rb +23 -0
  207. data/spec/models/attachment_spec.rb +45 -0
  208. data/spec/models/cell_spec.rb +62 -9
  209. data/spec/models/content_spec.rb +110 -28
  210. data/spec/models/element_spec.rb +275 -253
  211. data/spec/models/essence_date_spec.rb +25 -0
  212. data/spec/models/essence_file_spec.rb +23 -0
  213. data/spec/models/essence_html_spec.rb +13 -0
  214. data/spec/models/essence_picture_spec.rb +16 -0
  215. data/spec/models/essence_text_spec.rb +29 -0
  216. data/spec/models/language_spec.rb +34 -0
  217. data/spec/models/message_spec.rb +43 -0
  218. data/spec/models/page_spec.rb +726 -567
  219. data/spec/models/picture_spec.rb +98 -0
  220. data/spec/models/site_spec.rb +60 -2
  221. data/spec/models/tag_spec.rb +31 -0
  222. data/spec/models/user_spec.rb +4 -4
  223. data/spec/spec_helper.rb +49 -58
  224. data/spec/support/alchemy/controller_helpers.rb +35 -0
  225. data/spec/support/alchemy/{specs_helpers.rb → integration_helpers.rb} +4 -8
  226. data/spec/{factories.rb → support/factories.rb} +11 -1
  227. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +2 -8
  228. metadata +166 -106
  229. data/Guardfile +0 -16
  230. data/app/assets/javascripts/alchemy/alchemy.dirty.js +0 -93
  231. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +0 -122
  232. data/app/models/alchemy/tree_node.rb +0 -4
  233. data/app/views/alchemy/admin/pages/_page_infos.html.erb +0 -3
  234. data/app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb +0 -8
  235. data/app/views/alchemy/messages/contact_form_mail.text.erb +0 -12
  236. data/config/initializers/kaminari_config.rb +0 -9
  237. data/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb +0 -21
  238. data/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb +0 -11
  239. data/lib/alchemy/auth_engine.rb +0 -7
  240. data/lib/alchemy/authentication_helpers.rb +0 -9
  241. data/lib/alchemy/ferret_search.rb +0 -84
  242. data/lib/extensions/array.rb +0 -25
  243. data/lib/extensions/hash.rb +0 -34
  244. data/spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb +0 -21
  245. data/spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb +0 -11
  246. data/spec/models/page_layout_spec.rb +0 -60
@@ -255,14 +255,8 @@
255
255
 
256
256
  function _recursiveItems(li) {
257
257
  var id = ($(li).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
258
-
259
- var restricted = $(li).data("restricted");
260
- var slug = $(li).data("slug");
261
- var external = $(li).data("external");
262
- var visible = $(li).data("visible");
263
-
264
258
  if (id) {
265
- var item = {"id": id[2], "slug": slug, "restricted": restricted, "external": external, "visible": visible};
259
+ var item = {"id":id[2]};
266
260
  if ($(li).children(o.listType).children('li').length > 0) {
267
261
  item.children = [];
268
262
  $(li).children(o.listType).children('li').each(function () {
@@ -397,4 +391,4 @@
397
391
  }));
398
392
 
399
393
  $.ui.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.ui.nestedSortable.prototype.options);
400
- })(jQuery);
394
+ })(jQuery);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.3
4
+ version: 2.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -12,370 +12,384 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2014-06-12 00:00:00.000000000 Z
15
+ date: 2013-10-16 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: rails
19
19
  requirement: !ruby/object:Gem::Requirement
20
20
  requirements:
21
- - - "~>"
21
+ - - ~>
22
22
  - !ruby/object:Gem::Version
23
23
  version: 3.2.13
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - "~>"
28
+ - - ~>
29
29
  - !ruby/object:Gem::Version
30
30
  version: 3.2.13
31
31
  - !ruby/object:Gem::Dependency
32
32
  name: devise
33
33
  requirement: !ruby/object:Gem::Requirement
34
34
  requirements:
35
- - - "~>"
35
+ - - ~>
36
36
  - !ruby/object:Gem::Version
37
37
  version: 2.2.3
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  requirements:
42
- - - "~>"
42
+ - - ~>
43
43
  - !ruby/object:Gem::Version
44
44
  version: 2.2.3
45
- - !ruby/object:Gem::Dependency
46
- name: devise-encryptable
47
- requirement: !ruby/object:Gem::Requirement
48
- requirements:
49
- - - "~>"
50
- - !ruby/object:Gem::Version
51
- version: 0.1.1
52
- type: :runtime
53
- prerelease: false
54
- version_requirements: !ruby/object:Gem::Requirement
55
- requirements:
56
- - - "~>"
57
- - !ruby/object:Gem::Version
58
- version: 0.1.1
59
45
  - !ruby/object:Gem::Dependency
60
46
  name: awesome_nested_set
61
47
  requirement: !ruby/object:Gem::Requirement
62
48
  requirements:
63
- - - "~>"
49
+ - - ~>
64
50
  - !ruby/object:Gem::Version
65
51
  version: '2.0'
66
52
  type: :runtime
67
53
  prerelease: false
68
54
  version_requirements: !ruby/object:Gem::Requirement
69
55
  requirements:
70
- - - "~>"
56
+ - - ~>
71
57
  - !ruby/object:Gem::Version
72
58
  version: '2.0'
73
59
  - !ruby/object:Gem::Dependency
74
60
  name: acts-as-taggable-on
75
61
  requirement: !ruby/object:Gem::Requirement
76
62
  requirements:
77
- - - "~>"
63
+ - - ~>
78
64
  - !ruby/object:Gem::Version
79
65
  version: '2.1'
80
66
  type: :runtime
81
67
  prerelease: false
82
68
  version_requirements: !ruby/object:Gem::Requirement
83
69
  requirements:
84
- - - "~>"
70
+ - - ~>
85
71
  - !ruby/object:Gem::Version
86
72
  version: '2.1'
87
73
  - !ruby/object:Gem::Dependency
88
74
  name: declarative_authorization
89
75
  requirement: !ruby/object:Gem::Requirement
90
76
  requirements:
91
- - - "~>"
77
+ - - ~>
92
78
  - !ruby/object:Gem::Version
93
79
  version: 0.5.7
94
80
  type: :runtime
95
81
  prerelease: false
96
82
  version_requirements: !ruby/object:Gem::Requirement
97
83
  requirements:
98
- - - "~>"
84
+ - - ~>
99
85
  - !ruby/object:Gem::Version
100
86
  version: 0.5.7
101
87
  - !ruby/object:Gem::Dependency
102
88
  name: dragonfly
103
89
  requirement: !ruby/object:Gem::Requirement
104
90
  requirements:
105
- - - "~>"
91
+ - - ~>
106
92
  - !ruby/object:Gem::Version
107
93
  version: 0.9.14
108
94
  type: :runtime
109
95
  prerelease: false
110
96
  version_requirements: !ruby/object:Gem::Requirement
111
97
  requirements:
112
- - - "~>"
98
+ - - ~>
113
99
  - !ruby/object:Gem::Version
114
100
  version: 0.9.14
115
101
  - !ruby/object:Gem::Dependency
116
102
  name: kaminari
117
103
  requirement: !ruby/object:Gem::Requirement
118
104
  requirements:
119
- - - "~>"
105
+ - - ~>
120
106
  - !ruby/object:Gem::Version
121
107
  version: 0.14.1
122
108
  type: :runtime
123
109
  prerelease: false
124
110
  version_requirements: !ruby/object:Gem::Requirement
125
111
  requirements:
126
- - - "~>"
112
+ - - ~>
127
113
  - !ruby/object:Gem::Version
128
114
  version: 0.14.1
129
115
  - !ruby/object:Gem::Dependency
130
116
  name: acts_as_ferret
131
117
  requirement: !ruby/object:Gem::Requirement
132
118
  requirements:
133
- - - "~>"
119
+ - - ~>
134
120
  - !ruby/object:Gem::Version
135
121
  version: '0.5'
136
122
  type: :runtime
137
123
  prerelease: false
138
124
  version_requirements: !ruby/object:Gem::Requirement
139
125
  requirements:
140
- - - "~>"
126
+ - - ~>
141
127
  - !ruby/object:Gem::Version
142
128
  version: '0.5'
143
129
  - !ruby/object:Gem::Dependency
144
130
  name: acts_as_list
145
131
  requirement: !ruby/object:Gem::Requirement
146
132
  requirements:
147
- - - "~>"
133
+ - - ~>
148
134
  - !ruby/object:Gem::Version
149
135
  version: 0.2.0
150
136
  type: :runtime
151
137
  prerelease: false
152
138
  version_requirements: !ruby/object:Gem::Requirement
153
139
  requirements:
154
- - - "~>"
140
+ - - ~>
155
141
  - !ruby/object:Gem::Version
156
142
  version: 0.2.0
157
143
  - !ruby/object:Gem::Dependency
158
144
  name: magiclabs-userstamp
159
145
  requirement: !ruby/object:Gem::Requirement
160
146
  requirements:
161
- - - "~>"
147
+ - - ~>
162
148
  - !ruby/object:Gem::Version
163
149
  version: 2.0.2
164
150
  type: :runtime
165
151
  prerelease: false
166
152
  version_requirements: !ruby/object:Gem::Requirement
167
153
  requirements:
168
- - - "~>"
154
+ - - ~>
169
155
  - !ruby/object:Gem::Version
170
156
  version: 2.0.2
171
157
  - !ruby/object:Gem::Dependency
172
158
  name: dynamic_form
173
159
  requirement: !ruby/object:Gem::Requirement
174
160
  requirements:
175
- - - "~>"
161
+ - - ~>
176
162
  - !ruby/object:Gem::Version
177
163
  version: '1.1'
178
164
  type: :runtime
179
165
  prerelease: false
180
166
  version_requirements: !ruby/object:Gem::Requirement
181
167
  requirements:
182
- - - "~>"
168
+ - - ~>
183
169
  - !ruby/object:Gem::Version
184
170
  version: '1.1'
185
171
  - !ruby/object:Gem::Dependency
186
172
  name: jquery-rails
187
173
  requirement: !ruby/object:Gem::Requirement
188
174
  requirements:
189
- - - "~>"
175
+ - - ~>
190
176
  - !ruby/object:Gem::Version
191
- version: 2.2.1
177
+ version: 3.0.4
192
178
  type: :runtime
193
179
  prerelease: false
194
180
  version_requirements: !ruby/object:Gem::Requirement
195
181
  requirements:
196
- - - "~>"
182
+ - - ~>
197
183
  - !ruby/object:Gem::Version
198
- version: 2.2.1
184
+ version: 3.0.4
199
185
  - !ruby/object:Gem::Dependency
200
186
  name: jquery-ui-rails
201
187
  requirement: !ruby/object:Gem::Requirement
202
188
  requirements:
203
- - - "~>"
189
+ - - ~>
204
190
  - !ruby/object:Gem::Version
205
191
  version: 3.0.1
206
192
  type: :runtime
207
193
  prerelease: false
208
194
  version_requirements: !ruby/object:Gem::Requirement
209
195
  requirements:
210
- - - "~>"
196
+ - - ~>
211
197
  - !ruby/object:Gem::Version
212
198
  version: 3.0.1
213
199
  - !ruby/object:Gem::Dependency
214
200
  name: sass-rails
215
201
  requirement: !ruby/object:Gem::Requirement
216
202
  requirements:
217
- - - "~>"
203
+ - - ~>
218
204
  - !ruby/object:Gem::Version
219
205
  version: 3.2.3
220
206
  type: :runtime
221
207
  prerelease: false
222
208
  version_requirements: !ruby/object:Gem::Requirement
223
209
  requirements:
224
- - - "~>"
210
+ - - ~>
225
211
  - !ruby/object:Gem::Version
226
212
  version: 3.2.3
227
213
  - !ruby/object:Gem::Dependency
228
214
  name: coffee-rails
229
215
  requirement: !ruby/object:Gem::Requirement
230
216
  requirements:
231
- - - "~>"
217
+ - - ~>
232
218
  - !ruby/object:Gem::Version
233
219
  version: 3.2.1
234
220
  type: :runtime
235
221
  prerelease: false
236
222
  version_requirements: !ruby/object:Gem::Requirement
237
223
  requirements:
238
- - - "~>"
224
+ - - ~>
239
225
  - !ruby/object:Gem::Version
240
226
  version: 3.2.1
241
227
  - !ruby/object:Gem::Dependency
242
228
  name: compass-rails
243
229
  requirement: !ruby/object:Gem::Requirement
244
230
  requirements:
245
- - - "~>"
231
+ - - ~>
246
232
  - !ruby/object:Gem::Version
247
233
  version: 1.0.3
248
234
  type: :runtime
249
235
  prerelease: false
250
236
  version_requirements: !ruby/object:Gem::Requirement
251
237
  requirements:
252
- - - "~>"
238
+ - - ~>
253
239
  - !ruby/object:Gem::Version
254
240
  version: 1.0.3
255
241
  - !ruby/object:Gem::Dependency
256
242
  name: sassy-buttons
257
243
  requirement: !ruby/object:Gem::Requirement
258
244
  requirements:
259
- - - "~>"
245
+ - - ~>
260
246
  - !ruby/object:Gem::Version
261
247
  version: 0.1.3
262
248
  type: :runtime
263
249
  prerelease: false
264
250
  version_requirements: !ruby/object:Gem::Requirement
265
251
  requirements:
266
- - - "~>"
252
+ - - ~>
267
253
  - !ruby/object:Gem::Version
268
254
  version: 0.1.3
269
255
  - !ruby/object:Gem::Dependency
270
256
  name: rails3-jquery-autocomplete
271
257
  requirement: !ruby/object:Gem::Requirement
272
258
  requirements:
273
- - - "~>"
259
+ - - ~>
274
260
  - !ruby/object:Gem::Version
275
261
  version: 1.0.10
276
262
  type: :runtime
277
263
  prerelease: false
278
264
  version_requirements: !ruby/object:Gem::Requirement
279
265
  requirements:
280
- - - "~>"
266
+ - - ~>
281
267
  - !ruby/object:Gem::Version
282
268
  version: 1.0.10
283
269
  - !ruby/object:Gem::Dependency
284
270
  name: tvdeyen-handles_sortable_columns
285
271
  requirement: !ruby/object:Gem::Requirement
286
272
  requirements:
287
- - - "~>"
273
+ - - ~>
288
274
  - !ruby/object:Gem::Version
289
275
  version: 0.1.5
290
276
  type: :runtime
291
277
  prerelease: false
292
278
  version_requirements: !ruby/object:Gem::Requirement
293
279
  requirements:
294
- - - "~>"
280
+ - - ~>
295
281
  - !ruby/object:Gem::Version
296
282
  version: 0.1.5
283
+ - !ruby/object:Gem::Dependency
284
+ name: spinner.rb
285
+ requirement: !ruby/object:Gem::Requirement
286
+ requirements:
287
+ - - '>='
288
+ - !ruby/object:Gem::Version
289
+ version: '0'
290
+ type: :runtime
291
+ prerelease: false
292
+ version_requirements: !ruby/object:Gem::Requirement
293
+ requirements:
294
+ - - '>='
295
+ - !ruby/object:Gem::Version
296
+ version: '0'
297
297
  - !ruby/object:Gem::Dependency
298
298
  name: bumpy
299
299
  requirement: !ruby/object:Gem::Requirement
300
300
  requirements:
301
- - - ">="
301
+ - - '>='
302
302
  - !ruby/object:Gem::Version
303
303
  version: '0'
304
304
  type: :development
305
305
  prerelease: false
306
306
  version_requirements: !ruby/object:Gem::Requirement
307
307
  requirements:
308
- - - ">="
308
+ - - '>='
309
309
  - !ruby/object:Gem::Version
310
310
  version: '0'
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: capybara
313
313
  requirement: !ruby/object:Gem::Requirement
314
314
  requirements:
315
- - - "~>"
315
+ - - ~>
316
316
  - !ruby/object:Gem::Version
317
317
  version: 2.0.3
318
318
  type: :development
319
319
  prerelease: false
320
320
  version_requirements: !ruby/object:Gem::Requirement
321
321
  requirements:
322
- - - "~>"
322
+ - - ~>
323
323
  - !ruby/object:Gem::Version
324
324
  version: 2.0.3
325
325
  - !ruby/object:Gem::Dependency
326
326
  name: factory_girl_rails
327
327
  requirement: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - ">="
329
+ - - '>='
330
330
  - !ruby/object:Gem::Version
331
331
  version: '0'
332
332
  type: :development
333
333
  prerelease: false
334
334
  version_requirements: !ruby/object:Gem::Requirement
335
335
  requirements:
336
- - - ">="
336
+ - - '>='
337
337
  - !ruby/object:Gem::Version
338
338
  version: '0'
339
339
  - !ruby/object:Gem::Dependency
340
340
  name: rspec-rails
341
341
  requirement: !ruby/object:Gem::Requirement
342
342
  requirements:
343
- - - "~>"
343
+ - - ~>
344
344
  - !ruby/object:Gem::Version
345
345
  version: 2.13.1
346
346
  type: :development
347
347
  prerelease: false
348
348
  version_requirements: !ruby/object:Gem::Requirement
349
349
  requirements:
350
- - - "~>"
350
+ - - ~>
351
351
  - !ruby/object:Gem::Version
352
352
  version: 2.13.1
353
+ - !ruby/object:Gem::Dependency
354
+ name: sqlite3
355
+ requirement: !ruby/object:Gem::Requirement
356
+ requirements:
357
+ - - '>='
358
+ - !ruby/object:Gem::Version
359
+ version: '0'
360
+ type: :development
361
+ prerelease: false
362
+ version_requirements: !ruby/object:Gem::Requirement
363
+ requirements:
364
+ - - '>='
365
+ - !ruby/object:Gem::Version
366
+ version: '0'
353
367
  - !ruby/object:Gem::Dependency
354
368
  name: yard
355
369
  requirement: !ruby/object:Gem::Requirement
356
370
  requirements:
357
- - - ">="
371
+ - - '>='
358
372
  - !ruby/object:Gem::Version
359
373
  version: '0'
360
374
  type: :development
361
375
  prerelease: false
362
376
  version_requirements: !ruby/object:Gem::Requirement
363
377
  requirements:
364
- - - ">="
378
+ - - '>='
365
379
  - !ruby/object:Gem::Version
366
380
  version: '0'
367
381
  - !ruby/object:Gem::Dependency
368
382
  name: redcarpet
369
383
  requirement: !ruby/object:Gem::Requirement
370
384
  requirements:
371
- - - ">="
385
+ - - '>='
372
386
  - !ruby/object:Gem::Version
373
387
  version: '0'
374
388
  type: :development
375
389
  prerelease: false
376
390
  version_requirements: !ruby/object:Gem::Requirement
377
391
  requirements:
378
- - - ">="
392
+ - - '>='
379
393
  - !ruby/object:Gem::Version
380
394
  version: '0'
381
395
  description: Alchemy is a powerful, userfriendly and flexible Rails 3 CMS.
@@ -386,12 +400,12 @@ executables:
386
400
  extensions: []
387
401
  extra_rdoc_files: []
388
402
  files:
389
- - ".gitignore"
390
- - ".rspec"
391
- - ".travis.yml"
392
- - ".yardopts"
403
+ - .gitignore
404
+ - .rspec
405
+ - .simplecov
406
+ - .travis.yml
407
+ - .yardopts
393
408
  - Gemfile
394
- - Guardfile
395
409
  - LICENSE
396
410
  - README.md
397
411
  - Rakefile
@@ -411,8 +425,8 @@ files:
411
425
  - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
412
426
  - app/assets/javascripts/alchemy/alchemy.custom.js
413
427
  - app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee
414
- - app/assets/javascripts/alchemy/alchemy.dirty.js
415
- - app/assets/javascripts/alchemy/alchemy.dragndrop.js
428
+ - app/assets/javascripts/alchemy/alchemy.dirty.js.coffee
429
+ - app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee
416
430
  - app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee
417
431
  - app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee
418
432
  - app/assets/javascripts/alchemy/alchemy.file_progress.js
@@ -435,6 +449,8 @@ files:
435
449
  - app/assets/javascripts/alchemy/alchemy.spinner.js.coffee
436
450
  - app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee
437
451
  - app/assets/javascripts/alchemy/alchemy.swf_upload.js
452
+ - app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee.erb
453
+ - app/assets/javascripts/alchemy/alchemy.translations.js.coffee
438
454
  - app/assets/javascripts/alchemy/alchemy.uploader.js
439
455
  - app/assets/javascripts/alchemy/alchemy.windows.js.coffee
440
456
  - app/assets/javascripts/alchemy/menubar.js
@@ -503,6 +519,7 @@ files:
503
519
  - app/helpers/alchemy/admin/contents_helper.rb
504
520
  - app/helpers/alchemy/admin/elements_helper.rb
505
521
  - app/helpers/alchemy/admin/essences_helper.rb
522
+ - app/helpers/alchemy/admin/navigation_helper.rb
506
523
  - app/helpers/alchemy/admin/pages_helper.rb
507
524
  - app/helpers/alchemy/admin/pictures_helper.rb
508
525
  - app/helpers/alchemy/admin/tags_helper.rb
@@ -519,7 +536,10 @@ files:
519
536
  - app/models/alchemy/cell.rb
520
537
  - app/models/alchemy/clipboard.rb
521
538
  - app/models/alchemy/content.rb
539
+ - app/models/alchemy/content/factory.rb
522
540
  - app/models/alchemy/element.rb
541
+ - app/models/alchemy/element/definitions.rb
542
+ - app/models/alchemy/element/presenters.rb
523
543
  - app/models/alchemy/essence_boolean.rb
524
544
  - app/models/alchemy/essence_date.rb
525
545
  - app/models/alchemy/essence_file.rb
@@ -538,10 +558,13 @@ files:
538
558
  - app/models/alchemy/page/cells.rb
539
559
  - app/models/alchemy/page/elements.rb
540
560
  - app/models/alchemy/page/naming.rb
561
+ - app/models/alchemy/page/natures.rb
562
+ - app/models/alchemy/page/scopes.rb
563
+ - app/models/alchemy/page/users.rb
541
564
  - app/models/alchemy/picture.rb
542
565
  - app/models/alchemy/site.rb
566
+ - app/models/alchemy/site/layout.rb
543
567
  - app/models/alchemy/tag.rb
544
- - app/models/alchemy/tree_node.rb
545
568
  - app/models/alchemy/user.rb
546
569
  - app/sweepers/alchemy/content_sweeper.rb
547
570
  - app/sweepers/alchemy/pages_sweeper.rb
@@ -581,6 +604,7 @@ files:
581
604
  - app/views/alchemy/admin/elements/_elements_select.html.erb
582
605
  - app/views/alchemy/admin/elements/_new_element_form.html.erb
583
606
  - app/views/alchemy/admin/elements/_picture_gallery_editor.html.erb
607
+ - app/views/alchemy/admin/elements/_refresh_editor.js.erb
584
608
  - app/views/alchemy/admin/elements/create.js.erb
585
609
  - app/views/alchemy/admin/elements/fold.js.erb
586
610
  - app/views/alchemy/admin/elements/index.html.erb
@@ -611,7 +635,6 @@ files:
611
635
  - app/views/alchemy/admin/pages/_new_page_form.html.erb
612
636
  - app/views/alchemy/admin/pages/_page.html.erb
613
637
  - app/views/alchemy/admin/pages/_page_for_links.html.erb
614
- - app/views/alchemy/admin/pages/_page_infos.html.erb
615
638
  - app/views/alchemy/admin/pages/_page_status.html.erb
616
639
  - app/views/alchemy/admin/pages/_sitemap.html.erb
617
640
  - app/views/alchemy/admin/pages/configure.html.erb
@@ -621,6 +644,7 @@ files:
621
644
  - app/views/alchemy/admin/pages/flush.js.erb
622
645
  - app/views/alchemy/admin/pages/fold.js.erb
623
646
  - app/views/alchemy/admin/pages/index.html.erb
647
+ - app/views/alchemy/admin/pages/info.html.erb
624
648
  - app/views/alchemy/admin/pages/link.html.erb
625
649
  - app/views/alchemy/admin/pages/locked.html.erb
626
650
  - app/views/alchemy/admin/pages/new.html.erb
@@ -637,7 +661,8 @@ files:
637
661
  - app/views/alchemy/admin/partials/_pagination_links.html.erb
638
662
  - app/views/alchemy/admin/partials/_remote_search_form.html.erb
639
663
  - app/views/alchemy/admin/partials/_search_form.html.erb
640
- - app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb
664
+ - app/views/alchemy/admin/partials/_sub_navigation.html.erb
665
+ - app/views/alchemy/admin/partials/_toolbar_button.html.erb
641
666
  - app/views/alchemy/admin/partials/_upload_form.html.erb
642
667
  - app/views/alchemy/admin/pictures/_archive.html.erb
643
668
  - app/views/alchemy/admin/pictures/_archive_overlay.html.erb
@@ -708,7 +733,6 @@ files:
708
733
  - app/views/alchemy/essences/_essence_link_editor.html.erb
709
734
  - app/views/alchemy/essences/_essence_link_view.html.erb
710
735
  - app/views/alchemy/essences/_essence_picture_editor.html.erb
711
- - app/views/alchemy/essences/_essence_picture_tools.html.erb
712
736
  - app/views/alchemy/essences/_essence_picture_view.html.erb
713
737
  - app/views/alchemy/essences/_essence_richtext_editor.html.erb
714
738
  - app/views/alchemy/essences/_essence_richtext_view.html.erb
@@ -716,10 +740,12 @@ files:
716
740
  - app/views/alchemy/essences/_essence_select_view.html.erb
717
741
  - app/views/alchemy/essences/_essence_text_editor.html.erb
718
742
  - app/views/alchemy/essences/_essence_text_view.html.erb
719
- - app/views/alchemy/essences/_linkable_essence_tools.html.erb
743
+ - app/views/alchemy/essences/shared/_essence_picture_tools.html.erb
744
+ - app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb
720
745
  - app/views/alchemy/language_links/_language.html.erb
721
746
  - app/views/alchemy/language_links/_spacer.html.erb
722
- - app/views/alchemy/messages/contact_form_mail.text.erb
747
+ - app/views/alchemy/messages/contact_form_mail.de.text.erb
748
+ - app/views/alchemy/messages/contact_form_mail.en.text.erb
723
749
  - app/views/alchemy/messages/new.html.erb
724
750
  - app/views/alchemy/navigation/_image_link.html.erb
725
751
  - app/views/alchemy/navigation/_link.html.erb
@@ -758,25 +784,22 @@ files:
758
784
  - config/initializers/cache_storage.rb
759
785
  - config/initializers/devise.rb
760
786
  - config/initializers/dragonfly.rb
761
- - config/initializers/kaminari_config.rb
762
787
  - config/locales/alchemy.de.yml
763
788
  - config/locales/alchemy.en.yml
764
789
  - config/locales/devise.de.yml
765
790
  - config/locales/devise.en.yml
766
791
  - config/routes.rb
767
- - db/migrate/20130214233001_alchemy_two_point_five.rb
768
- - db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb
769
- - db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb
770
- - lib/alchemy/auth_engine.rb
771
- - lib/alchemy/authentication_helpers.rb
792
+ - db/migrate/20130827094554_alchemy_two_point_six.rb
793
+ - lib/alchemy/auth/engine.rb
772
794
  - lib/alchemy/capistrano.rb
773
795
  - lib/alchemy/config.rb
774
796
  - lib/alchemy/engine.rb
775
797
  - lib/alchemy/errors.rb
776
798
  - lib/alchemy/essence.rb
777
- - lib/alchemy/ferret_search.rb
799
+ - lib/alchemy/ferret/search.rb
778
800
  - lib/alchemy/filetypes.rb
779
801
  - lib/alchemy/i18n.rb
802
+ - lib/alchemy/kaminari/scoped_pagination_url_helper.rb
780
803
  - lib/alchemy/logger.rb
781
804
  - lib/alchemy/modules.rb
782
805
  - lib/alchemy/mount_point.rb
@@ -785,7 +808,6 @@ files:
785
808
  - lib/alchemy/picture_attributes.rb
786
809
  - lib/alchemy/resource.rb
787
810
  - lib/alchemy/resources_helper.rb
788
- - lib/alchemy/scoped_pagination_url_helper.rb
789
811
  - lib/alchemy/seeder.rb
790
812
  - lib/alchemy/shell.rb
791
813
  - lib/alchemy/tinymce.rb
@@ -800,8 +822,6 @@ files:
800
822
  - lib/alchemy/version.rb
801
823
  - lib/alchemy_cms.rb
802
824
  - lib/extensions/action_view.rb
803
- - lib/extensions/array.rb
804
- - lib/extensions/hash.rb
805
825
  - lib/middleware/flash_session_cookie.rb
806
826
  - lib/rails/generators/alchemy/base.rb
807
827
  - lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb
@@ -822,28 +842,42 @@ files:
822
842
  - lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb
823
843
  - lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml
824
844
  - lib/rails/generators/alchemy/page_layouts/templates/layout.html.slim
845
+ - lib/rails/generators/alchemy/scaffold/files/_standard.html.erb
825
846
  - lib/rails/generators/alchemy/scaffold/files/application.html.erb
826
847
  - lib/rails/generators/alchemy/scaffold/files/elements.yml
827
848
  - lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
828
849
  - lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt
850
+ - lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb
851
+ - lib/rails/generators/alchemy/site_layouts/templates/layout.html.erb
852
+ - lib/rails/generators/alchemy/site_layouts/templates/layout.html.haml
853
+ - lib/rails/generators/alchemy/site_layouts/templates/layout.html.slim
829
854
  - lib/rails/templates/alchemy.rb
830
855
  - lib/tasks/alchemy/convert.rake
831
856
  - lib/tasks/alchemy/db.rake
832
857
  - lib/tasks/alchemy/install.rake
858
+ - lib/tasks/alchemy/tidy.rake
833
859
  - lib/tasks/alchemy/upgrade.rake
834
860
  - lib/tasks/ferret.rake
835
861
  - script/rails
862
+ - spec/controllers/admin/attachments_controller_spec.rb
863
+ - spec/controllers/admin/base_controller_spec.rb
836
864
  - spec/controllers/admin/clipboard_controller_spec.rb
837
865
  - spec/controllers/admin/contents_controller_spec.rb
866
+ - spec/controllers/admin/dashboard_controller_spec.rb
838
867
  - spec/controllers/admin/elements_controller_spec.rb
868
+ - spec/controllers/admin/essence_files_controller_spec.rb
869
+ - spec/controllers/admin/essence_pictures_controller_spec.rb
839
870
  - spec/controllers/admin/languages_controller_spec.rb
871
+ - spec/controllers/admin/layoutpages_controller_spec.rb
840
872
  - spec/controllers/admin/pages_controller_spec.rb
873
+ - spec/controllers/admin/pictures_controller_spec.rb
841
874
  - spec/controllers/admin/resources_controller_spec.rb
842
875
  - spec/controllers/admin/trash_controller_spec.rb
843
876
  - spec/controllers/admin/users_controller_spec.rb
844
877
  - spec/controllers/attachments_controller_spec.rb
845
878
  - spec/controllers/base_controller_spec.rb
846
879
  - spec/controllers/elements_controller_spec.rb
880
+ - spec/controllers/messages_controller_spec.rb
847
881
  - spec/controllers/pages_controller_spec.rb
848
882
  - spec/controllers/passwords_controller_spec.rb
849
883
  - spec/controllers/pictures_controller_spec.rb
@@ -867,6 +901,7 @@ files:
867
901
  - spec/dummy/app/views/alchemy/page_layouts/_standard.html.erb
868
902
  - spec/dummy/app/views/layouts/application.html.erb
869
903
  - spec/dummy/config.ru
904
+ - spec/dummy/config/alchemy/cells.yml
870
905
  - spec/dummy/config/alchemy/elements.yml
871
906
  - spec/dummy/config/alchemy/page_layouts.yml
872
907
  - spec/dummy/config/application.rb
@@ -885,10 +920,8 @@ files:
885
920
  - spec/dummy/config/initializers/wrap_parameters.rb
886
921
  - spec/dummy/config/routes.rb
887
922
  - spec/dummy/db/migrate/20121026104128_create_events.rb
888
- - spec/dummy/db/migrate/20130214233001_alchemy_two_point_five.rb
889
- - spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb
890
- - spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb
891
923
  - spec/dummy/db/migrate/20130328101418_create_locations.rb
924
+ - spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb
892
925
  - spec/dummy/db/schema.rb
893
926
  - spec/dummy/lib/assets/.gitkeep
894
927
  - spec/dummy/public/404.html
@@ -897,7 +930,7 @@ files:
897
930
  - spec/dummy/public/favicon.ico
898
931
  - spec/dummy/public/stylesheets/.gitkeep
899
932
  - spec/dummy/script/rails
900
- - spec/factories.rb
933
+ - spec/fast_specs.rb
901
934
  - spec/features/admin/link_overlay_spec.rb
902
935
  - spec/features/admin/modules_integration_spec.rb
903
936
  - spec/features/admin/pages_controller_spec.rb
@@ -912,6 +945,7 @@ files:
912
945
  - spec/helpers/admin/contents_helper_spec.rb
913
946
  - spec/helpers/admin/elements_helper_spec.rb
914
947
  - spec/helpers/admin/essences_helper_spec.rb
948
+ - spec/helpers/admin/navigation_helper_spec.rb
915
949
  - spec/helpers/admin/pages_helper_spec.rb
916
950
  - spec/helpers/admin/tags_helper_spec.rb
917
951
  - spec/helpers/base_helper_spec.rb
@@ -933,9 +967,12 @@ files:
933
967
  - spec/libraries/config_spec.rb
934
968
  - spec/libraries/essence_spec.rb
935
969
  - spec/libraries/mount_point_spec.rb
970
+ - spec/libraries/page_layout_spec.rb
936
971
  - spec/libraries/resource_spec.rb
937
972
  - spec/libraries/resources_helper_spec.rb
938
973
  - spec/libraries/shell_spec.rb
974
+ - spec/libraries/tinymce_spec.rb
975
+ - spec/mailers/messages_spec.rb
939
976
  - spec/mailers/notifications_spec.rb
940
977
  - spec/models/attachment_spec.rb
941
978
  - spec/models/cell_spec.rb
@@ -943,24 +980,30 @@ files:
943
980
  - spec/models/content_spec.rb
944
981
  - spec/models/element_spec.rb
945
982
  - spec/models/essence_boolean_spec.rb
983
+ - spec/models/essence_date_spec.rb
984
+ - spec/models/essence_file_spec.rb
985
+ - spec/models/essence_html_spec.rb
946
986
  - spec/models/essence_picture_spec.rb
947
987
  - spec/models/essence_richtext_spec.rb
948
988
  - spec/models/essence_select_spec.rb
949
989
  - spec/models/essence_text_spec.rb
950
990
  - spec/models/language_spec.rb
951
- - spec/models/page_layout_spec.rb
991
+ - spec/models/message_spec.rb
952
992
  - spec/models/page_spec.rb
953
993
  - spec/models/picture_spec.rb
954
994
  - spec/models/resource_spec.rb
955
995
  - spec/models/site_spec.rb
996
+ - spec/models/tag_spec.rb
956
997
  - spec/models/user_spec.rb
957
998
  - spec/routing/routing_spec.rb
958
999
  - spec/spec_helper.rb
959
1000
  - spec/support/80x60.png
960
1001
  - spec/support/alchemy/controller_hacks.rb
961
- - spec/support/alchemy/specs_helpers.rb
1002
+ - spec/support/alchemy/controller_helpers.rb
1003
+ - spec/support/alchemy/integration_helpers.rb
962
1004
  - spec/support/alchemy/test_tweaks.rb
963
1005
  - spec/support/ci/install_phantomjs
1006
+ - spec/support/factories.rb
964
1007
  - spec/support/image with spaces.png
965
1008
  - spec/support/image.png
966
1009
  - spec/support/image2.PNG
@@ -1091,33 +1134,41 @@ require_paths:
1091
1134
  - lib
1092
1135
  required_ruby_version: !ruby/object:Gem::Requirement
1093
1136
  requirements:
1094
- - - ">="
1137
+ - - '>='
1095
1138
  - !ruby/object:Gem::Version
1096
1139
  version: 1.9.3
1097
1140
  required_rubygems_version: !ruby/object:Gem::Requirement
1098
1141
  requirements:
1099
- - - ">="
1142
+ - - '>='
1100
1143
  - !ruby/object:Gem::Version
1101
1144
  version: '0'
1102
1145
  requirements:
1103
1146
  - ImageMagick (libmagick), v6.6 or greater.
1104
1147
  rubyforge_project:
1105
- rubygems_version: 2.2.2
1148
+ rubygems_version: 2.0.7
1106
1149
  signing_key:
1107
1150
  specification_version: 4
1108
1151
  summary: A powerful, userfriendly and flexible CMS for Rails 3
1109
1152
  test_files:
1153
+ - spec/controllers/admin/attachments_controller_spec.rb
1154
+ - spec/controllers/admin/base_controller_spec.rb
1110
1155
  - spec/controllers/admin/clipboard_controller_spec.rb
1111
1156
  - spec/controllers/admin/contents_controller_spec.rb
1157
+ - spec/controllers/admin/dashboard_controller_spec.rb
1112
1158
  - spec/controllers/admin/elements_controller_spec.rb
1159
+ - spec/controllers/admin/essence_files_controller_spec.rb
1160
+ - spec/controllers/admin/essence_pictures_controller_spec.rb
1113
1161
  - spec/controllers/admin/languages_controller_spec.rb
1162
+ - spec/controllers/admin/layoutpages_controller_spec.rb
1114
1163
  - spec/controllers/admin/pages_controller_spec.rb
1164
+ - spec/controllers/admin/pictures_controller_spec.rb
1115
1165
  - spec/controllers/admin/resources_controller_spec.rb
1116
1166
  - spec/controllers/admin/trash_controller_spec.rb
1117
1167
  - spec/controllers/admin/users_controller_spec.rb
1118
1168
  - spec/controllers/attachments_controller_spec.rb
1119
1169
  - spec/controllers/base_controller_spec.rb
1120
1170
  - spec/controllers/elements_controller_spec.rb
1171
+ - spec/controllers/messages_controller_spec.rb
1121
1172
  - spec/controllers/pages_controller_spec.rb
1122
1173
  - spec/controllers/passwords_controller_spec.rb
1123
1174
  - spec/controllers/pictures_controller_spec.rb
@@ -1141,6 +1192,7 @@ test_files:
1141
1192
  - spec/dummy/app/views/alchemy/page_layouts/_standard.html.erb
1142
1193
  - spec/dummy/app/views/layouts/application.html.erb
1143
1194
  - spec/dummy/config.ru
1195
+ - spec/dummy/config/alchemy/cells.yml
1144
1196
  - spec/dummy/config/alchemy/elements.yml
1145
1197
  - spec/dummy/config/alchemy/page_layouts.yml
1146
1198
  - spec/dummy/config/application.rb
@@ -1159,10 +1211,8 @@ test_files:
1159
1211
  - spec/dummy/config/initializers/wrap_parameters.rb
1160
1212
  - spec/dummy/config/routes.rb
1161
1213
  - spec/dummy/db/migrate/20121026104128_create_events.rb
1162
- - spec/dummy/db/migrate/20130214233001_alchemy_two_point_five.rb
1163
- - spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb
1164
- - spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb
1165
1214
  - spec/dummy/db/migrate/20130328101418_create_locations.rb
1215
+ - spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb
1166
1216
  - spec/dummy/db/schema.rb
1167
1217
  - spec/dummy/lib/assets/.gitkeep
1168
1218
  - spec/dummy/public/404.html
@@ -1171,7 +1221,7 @@ test_files:
1171
1221
  - spec/dummy/public/favicon.ico
1172
1222
  - spec/dummy/public/stylesheets/.gitkeep
1173
1223
  - spec/dummy/script/rails
1174
- - spec/factories.rb
1224
+ - spec/fast_specs.rb
1175
1225
  - spec/features/admin/link_overlay_spec.rb
1176
1226
  - spec/features/admin/modules_integration_spec.rb
1177
1227
  - spec/features/admin/pages_controller_spec.rb
@@ -1186,6 +1236,7 @@ test_files:
1186
1236
  - spec/helpers/admin/contents_helper_spec.rb
1187
1237
  - spec/helpers/admin/elements_helper_spec.rb
1188
1238
  - spec/helpers/admin/essences_helper_spec.rb
1239
+ - spec/helpers/admin/navigation_helper_spec.rb
1189
1240
  - spec/helpers/admin/pages_helper_spec.rb
1190
1241
  - spec/helpers/admin/tags_helper_spec.rb
1191
1242
  - spec/helpers/base_helper_spec.rb
@@ -1207,9 +1258,12 @@ test_files:
1207
1258
  - spec/libraries/config_spec.rb
1208
1259
  - spec/libraries/essence_spec.rb
1209
1260
  - spec/libraries/mount_point_spec.rb
1261
+ - spec/libraries/page_layout_spec.rb
1210
1262
  - spec/libraries/resource_spec.rb
1211
1263
  - spec/libraries/resources_helper_spec.rb
1212
1264
  - spec/libraries/shell_spec.rb
1265
+ - spec/libraries/tinymce_spec.rb
1266
+ - spec/mailers/messages_spec.rb
1213
1267
  - spec/mailers/notifications_spec.rb
1214
1268
  - spec/models/attachment_spec.rb
1215
1269
  - spec/models/cell_spec.rb
@@ -1217,24 +1271,30 @@ test_files:
1217
1271
  - spec/models/content_spec.rb
1218
1272
  - spec/models/element_spec.rb
1219
1273
  - spec/models/essence_boolean_spec.rb
1274
+ - spec/models/essence_date_spec.rb
1275
+ - spec/models/essence_file_spec.rb
1276
+ - spec/models/essence_html_spec.rb
1220
1277
  - spec/models/essence_picture_spec.rb
1221
1278
  - spec/models/essence_richtext_spec.rb
1222
1279
  - spec/models/essence_select_spec.rb
1223
1280
  - spec/models/essence_text_spec.rb
1224
1281
  - spec/models/language_spec.rb
1225
- - spec/models/page_layout_spec.rb
1282
+ - spec/models/message_spec.rb
1226
1283
  - spec/models/page_spec.rb
1227
1284
  - spec/models/picture_spec.rb
1228
1285
  - spec/models/resource_spec.rb
1229
1286
  - spec/models/site_spec.rb
1287
+ - spec/models/tag_spec.rb
1230
1288
  - spec/models/user_spec.rb
1231
1289
  - spec/routing/routing_spec.rb
1232
1290
  - spec/spec_helper.rb
1233
1291
  - spec/support/80x60.png
1234
1292
  - spec/support/alchemy/controller_hacks.rb
1235
- - spec/support/alchemy/specs_helpers.rb
1293
+ - spec/support/alchemy/controller_helpers.rb
1294
+ - spec/support/alchemy/integration_helpers.rb
1236
1295
  - spec/support/alchemy/test_tweaks.rb
1237
1296
  - spec/support/ci/install_phantomjs
1297
+ - spec/support/factories.rb
1238
1298
  - spec/support/image with spaces.png
1239
1299
  - spec/support/image.png
1240
1300
  - spec/support/image2.PNG