spontaneous 0.2.0.beta1 → 0.2.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (335) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +24 -0
  3. data/.locat +42 -0
  4. data/.travis/gemfiles/Gemfile.empty +7 -0
  5. data/.travis.yml +18 -0
  6. data/Gemfile +12 -8
  7. data/LICENSE +1 -1
  8. data/Rakefile +15 -157
  9. data/Readme.markdown +1 -1
  10. data/application/css/core.css.scss +22 -146
  11. data/application/css/definitions.css.scss +7 -3
  12. data/application/css/dialogue.css.scss +26 -1
  13. data/application/css/editing.css.scss +70 -28
  14. data/application/css/font.css.scss +1 -1
  15. data/application/css/popover.css.scss +2 -0
  16. data/application/css/top.css.scss +231 -0
  17. data/application/js/add_alias_dialogue.js +1 -1
  18. data/application/js/add_home_dialogue.js +1 -1
  19. data/application/js/ajax.js +61 -31
  20. data/application/js/box.js +4 -4
  21. data/application/js/conflicted_field_dialogue.js +1 -1
  22. data/application/js/content.js +5 -5
  23. data/application/js/dom.js +5 -0
  24. data/application/js/edit_panel.js +1 -0
  25. data/application/js/editing.js +1 -1
  26. data/application/js/extensions.js +8 -0
  27. data/application/js/field/boolean.js +31 -0
  28. data/application/js/field/file.js +32 -4
  29. data/application/js/field/image.js +24 -9
  30. data/application/js/field/markdown.js +87 -59
  31. data/application/js/field/select.js +1 -1
  32. data/application/js/field/webvideo.js +6 -1
  33. data/application/js/init.js +2 -2
  34. data/application/js/jquery-selection-position.js +130 -0
  35. data/application/js/location.js +4 -25
  36. data/application/js/meta_view/user_admin.js +2 -2
  37. data/application/js/metadata.js +2 -2
  38. data/application/js/page_browser.js +1 -1
  39. data/application/js/panel/root_menu.js +0 -1
  40. data/application/js/popover.js +27 -12
  41. data/application/js/popover_view.js +20 -4
  42. data/application/js/preview.js +31 -16
  43. data/application/js/progress.js +22 -21
  44. data/application/js/publish.js +18 -7
  45. data/application/js/sharded_upload.js +9 -6
  46. data/application/js/spontaneous.js +3 -1
  47. data/application/js/top_bar.js +264 -173
  48. data/application/js/upload.js +12 -5
  49. data/application/js/upload_manager.js +4 -3
  50. data/application/js/user.js +1 -2
  51. data/application/js/views/box_view.js +1 -1
  52. data/application/js/views/page_view.js +16 -5
  53. data/application/js/views/piece_view.js +5 -4
  54. data/application/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf +0 -0
  55. data/application/views/index.erb +6 -14
  56. data/application/views/login.erb +6 -25
  57. data/application/views/schema_modification_error.html.erb +3 -7
  58. data/db/migrations/20130114120000_create_revision_tables.rb +2 -2
  59. data/db/migrations/20130813111009_increase_path_length.rb +14 -0
  60. data/gem-public_cert.pem +20 -0
  61. data/lib/spontaneous/asset/app_compiler.rb +44 -0
  62. data/lib/spontaneous/asset/environment.rb +225 -0
  63. data/lib/spontaneous/asset.rb +2 -67
  64. data/lib/spontaneous/box.rb +0 -1
  65. data/lib/spontaneous/capistrano/deploy.rb +2 -2
  66. data/lib/spontaneous/capistrano/sync.rb +1 -1
  67. data/lib/spontaneous/cli/init.rb +36 -13
  68. data/lib/spontaneous/cli/server.rb +0 -1
  69. data/lib/spontaneous/cli/site.rb +2 -1
  70. data/lib/spontaneous/cli.rb +3 -1
  71. data/lib/spontaneous/collections/entry_set.rb +4 -12
  72. data/lib/spontaneous/collections/hash_with_fallback.rb +20 -0
  73. data/lib/spontaneous/collections/prototype_set.rb +6 -5
  74. data/lib/spontaneous/crypt.rb +2 -2
  75. data/lib/spontaneous/data_mapper/content_model/associations.rb +115 -63
  76. data/lib/spontaneous/data_mapper.rb +1 -1
  77. data/lib/spontaneous/errors.rb +6 -0
  78. data/lib/spontaneous/extensions/object_space.rb +6 -0
  79. data/lib/spontaneous/facet.rb +1 -0
  80. data/lib/spontaneous/field/base.rb +86 -13
  81. data/lib/spontaneous/field/boolean.rb +65 -0
  82. data/lib/spontaneous/field/file.rb +17 -6
  83. data/lib/spontaneous/field/html.rb +13 -0
  84. data/lib/spontaneous/field/image/size.rb +76 -0
  85. data/lib/spontaneous/field/image.rb +99 -414
  86. data/lib/spontaneous/field/tags.rb +36 -0
  87. data/lib/spontaneous/field/update.rb +1 -1
  88. data/lib/spontaneous/field/webvideo/fallback.rb +41 -0
  89. data/lib/spontaneous/field/webvideo/vimeo.rb +113 -0
  90. data/lib/spontaneous/field/webvideo/vine.rb +94 -0
  91. data/lib/spontaneous/field/webvideo/youtube.rb +133 -0
  92. data/lib/spontaneous/field/webvideo.rb +100 -250
  93. data/lib/spontaneous/field.rb +1 -1
  94. data/lib/spontaneous/generators/site/Gemfile.tt +5 -14
  95. data/lib/spontaneous/generators/site/assets/README.md +20 -0
  96. data/lib/spontaneous/generators/site/assets/css/site.scss +8 -0
  97. data/lib/spontaneous/generators/site/assets/js/site.js +6 -0
  98. data/lib/spontaneous/generators/site/config/deploy.rb.tt +9 -0
  99. data/lib/spontaneous/generators/site/config/user_levels.yml +14 -3
  100. data/lib/spontaneous/generators/site/public/README.md +12 -0
  101. data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +2 -2
  102. data/lib/spontaneous/generators/site.rb +77 -35
  103. data/lib/spontaneous/layout.rb +6 -7
  104. data/lib/spontaneous/loader.rb +21 -13
  105. data/lib/spontaneous/media/file.rb +22 -9
  106. data/lib/spontaneous/media/image/attributes.rb +33 -0
  107. data/lib/spontaneous/media/image/format/gif.rb +4 -0
  108. data/lib/spontaneous/media/image/format/jpg.rb +17 -0
  109. data/lib/spontaneous/media/image/format/png.rb +4 -0
  110. data/lib/spontaneous/media/image/format/webp.rb +26 -0
  111. data/lib/spontaneous/media/image/format.rb +79 -0
  112. data/lib/spontaneous/media/image/optimizer.rb +69 -0
  113. data/lib/spontaneous/media/image/processor.rb +17 -0
  114. data/lib/spontaneous/media/image/renderable.rb +52 -0
  115. data/lib/spontaneous/media/image/skeptick.rb +70 -0
  116. data/lib/spontaneous/media/image.rb +50 -0
  117. data/lib/spontaneous/media/temp_file.rb +4 -0
  118. data/lib/spontaneous/media.rb +1 -0
  119. data/lib/spontaneous/model/core/aliases.rb +14 -8
  120. data/lib/spontaneous/model/core/boxes.rb +5 -2
  121. data/lib/spontaneous/model/core/entries.rb +4 -0
  122. data/lib/spontaneous/model/core/entry.rb +1 -0
  123. data/lib/spontaneous/model/core/fields.rb +5 -2
  124. data/lib/spontaneous/model/core/locks.rb +16 -0
  125. data/lib/spontaneous/model/core/media.rb +1 -15
  126. data/lib/spontaneous/model/core.rb +31 -1
  127. data/lib/spontaneous/model/page/controllers.rb +2 -2
  128. data/lib/spontaneous/model/page/formats.rb +1 -4
  129. data/lib/spontaneous/model/page/layouts.rb +6 -2
  130. data/lib/spontaneous/model/page/locks.rb +8 -2
  131. data/lib/spontaneous/model/page/page_tree.rb +2 -2
  132. data/lib/spontaneous/model/page/paths.rb +74 -9
  133. data/lib/spontaneous/model/page.rb +11 -3
  134. data/lib/spontaneous/model.rb +6 -6
  135. data/lib/spontaneous/output/context/render_cache.rb +23 -0
  136. data/lib/spontaneous/output/context.rb +56 -30
  137. data/lib/spontaneous/output/helpers/script_helper.rb +9 -53
  138. data/lib/spontaneous/output/helpers/stylesheet_helper.rb +8 -40
  139. data/lib/spontaneous/output/template/renderer.rb +17 -5
  140. data/lib/spontaneous/output.rb +0 -1
  141. data/lib/spontaneous/paths.rb +6 -2
  142. data/lib/spontaneous/permissions/access_key.rb +18 -0
  143. data/lib/spontaneous/permissions/user.rb +1 -1
  144. data/lib/spontaneous/permissions.rb +4 -1
  145. data/lib/spontaneous/plugins/application/state.rb +19 -12
  146. data/lib/spontaneous/prototypes/field_prototype.rb +14 -8
  147. data/lib/spontaneous/published_revision.rb +7 -0
  148. data/lib/spontaneous/publishing/immediate.rb +43 -34
  149. data/lib/spontaneous/publishing/revision.rb +9 -6
  150. data/lib/spontaneous/rack/asset_server.rb +20 -0
  151. data/lib/spontaneous/rack/back/alias.rb +46 -0
  152. data/lib/spontaneous/rack/back/application_assets.rb +28 -0
  153. data/lib/spontaneous/rack/back/base.rb +34 -0
  154. data/lib/spontaneous/rack/back/changes.rb +19 -0
  155. data/lib/spontaneous/rack/back/content.rb +54 -0
  156. data/lib/spontaneous/rack/back/events.rb +38 -0
  157. data/lib/spontaneous/rack/back/field.rb +37 -0
  158. data/lib/spontaneous/rack/back/file.rb +118 -0
  159. data/lib/spontaneous/rack/back/helpers.rb +71 -0
  160. data/lib/spontaneous/rack/back/index.rb +16 -0
  161. data/lib/spontaneous/rack/back/login.rb +47 -0
  162. data/lib/spontaneous/rack/back/map.rb +24 -0
  163. data/lib/spontaneous/rack/back/page.rb +46 -0
  164. data/lib/spontaneous/rack/back/preview.rb +43 -0
  165. data/lib/spontaneous/rack/back/schema.rb +30 -0
  166. data/lib/spontaneous/rack/back/site.rb +25 -0
  167. data/lib/spontaneous/rack/back/site_assets.rb +13 -0
  168. data/lib/spontaneous/rack/back/unsupported_browser.rb +7 -0
  169. data/lib/spontaneous/rack/{user_admin.rb → back/user_admin.rb} +2 -5
  170. data/lib/spontaneous/rack/back.rb +85 -764
  171. data/lib/spontaneous/rack/cacheable_file.rb +3 -3
  172. data/lib/spontaneous/rack/front.rb +16 -9
  173. data/lib/spontaneous/rack/middleware/authenticate.rb +65 -0
  174. data/lib/spontaneous/rack/middleware/csrf.rb +66 -0
  175. data/lib/spontaneous/rack/middleware/reloader.rb +52 -0
  176. data/lib/spontaneous/rack/middleware/scope.rb +60 -0
  177. data/lib/spontaneous/rack/middleware.rb +6 -0
  178. data/lib/spontaneous/rack/page_controller.rb +18 -5
  179. data/lib/spontaneous/rack/public.rb +17 -11
  180. data/lib/spontaneous/rack.rb +34 -24
  181. data/lib/spontaneous/revision.rb +29 -2
  182. data/lib/spontaneous/schema/uid.rb +4 -3
  183. data/lib/spontaneous/schema/uid_map.rb +5 -24
  184. data/lib/spontaneous/schema.rb +1 -0
  185. data/lib/spontaneous/search/database.rb +8 -0
  186. data/lib/spontaneous/search/field.rb +1 -1
  187. data/lib/spontaneous/search/index.rb +3 -5
  188. data/lib/spontaneous/server.rb +1 -1
  189. data/lib/spontaneous/simultaneous.rb +1 -1
  190. data/lib/spontaneous/site/features.rb +4 -5
  191. data/lib/spontaneous/site/helpers.rb +22 -5
  192. data/lib/spontaneous/site/instance.rb +2 -2
  193. data/lib/spontaneous/site/selectors.rb +22 -3
  194. data/lib/spontaneous/storage/cloud.rb +13 -9
  195. data/lib/spontaneous/storage/local.rb +11 -6
  196. data/lib/spontaneous/style.rb +40 -23
  197. data/lib/spontaneous/utils/database/mysql_dumper.rb +1 -1
  198. data/lib/spontaneous/utils/smush_it.rb +1 -1
  199. data/lib/spontaneous/version.rb +1 -1
  200. data/lib/spontaneous.rb +35 -33
  201. data/spontaneous.gemspec +53 -787
  202. data/test/experimental/test_crypt.rb +56 -56
  203. data/test/experimental/test_features.rb +16 -27
  204. data/test/fixtures/assets/public1/css/data.css.scss +3 -0
  205. data/test/fixtures/assets/public1/css/image1.css.scss +4 -0
  206. data/test/fixtures/assets/public1/css/import.css.scss +1 -0
  207. data/test/fixtures/assets/public1/css/urlhash.css.scss +3 -0
  208. data/test/fixtures/assets/public1/js/a.js +1 -1
  209. data/test/fixtures/assets/public1/js/all.js +4 -0
  210. data/test/fixtures/assets/public1/js/{m.coffee → m.js.coffee} +1 -0
  211. data/test/fixtures/assets/public1/x.js +1 -0
  212. data/test/fixtures/assets/public2/css/all.css +4 -0
  213. data/test/fixtures/assets/public2/css/missing.css.scss +3 -0
  214. data/test/fixtures/assets/public2/i/y.png +0 -0
  215. data/test/fixtures/assets/public2/js/b.js +1 -1
  216. data/test/fixtures/assets/public2/js/c.js +1 -1
  217. data/test/fixtures/images/size.extended.webp +0 -0
  218. data/test/fixtures/images/size.lossless.webp +0 -0
  219. data/test/fixtures/images/size.lossy.webp +0 -0
  220. data/test/fixtures/schema/before.yml +4 -4
  221. data/test/fixtures/schema/schema.yml +1 -1
  222. data/test/fixtures/templates/aliases/aaa.html.cut +0 -0
  223. data/test/fixtures/templates/extended/partial_with_renderer.html.cut +1 -0
  224. data/test/fixtures/templates/extended/with_includes_and_renderer.html.cut +2 -0
  225. data/test/functional/test_application.rb +108 -106
  226. data/test/functional/test_back.rb +924 -930
  227. data/test/functional/test_front.rb +285 -238
  228. data/test/functional/test_user_manager.rb +75 -100
  229. data/test/integration/test_installation.rb +1 -1
  230. data/test/support/matchers.rb +12 -0
  231. data/test/support/minitest.rb +121 -0
  232. data/test/support/rack.rb +45 -0
  233. data/test/support/test_start_finish.rb +103 -0
  234. data/test/test_helper.rb +21 -68
  235. data/test/test_integration_helper.rb +1 -3
  236. data/test/unit/test_alias.rb +432 -408
  237. data/test/unit/test_asset_bundler.rb +58 -58
  238. data/test/unit/test_assets.rb +485 -155
  239. data/test/unit/test_async.rb +16 -37
  240. data/test/unit/test_authentication.rb +425 -457
  241. data/test/unit/test_boxes.rb +191 -191
  242. data/test/unit/test_changesets.rb +244 -254
  243. data/test/unit/test_config.rb +128 -142
  244. data/test/unit/test_content.rb +313 -359
  245. data/test/unit/test_content_inheritance.rb +29 -30
  246. data/test/unit/test_datamapper.rb +1205 -1080
  247. data/test/unit/test_datamapper_content.rb +49 -51
  248. data/test/unit/test_extensions.rb +23 -23
  249. data/test/unit/test_fields.rb +1488 -1180
  250. data/test/unit/test_formats.rb +158 -158
  251. data/test/unit/test_generators.rb +98 -40
  252. data/test/unit/test_helpers.rb +73 -76
  253. data/test/unit/test_image_size.rb +53 -22
  254. data/test/unit/test_images.rb +164 -165
  255. data/test/unit/test_layouts.rb +133 -122
  256. data/test/unit/test_logger.rb +14 -17
  257. data/test/unit/test_media.rb +69 -84
  258. data/test/unit/test_modifications.rb +513 -525
  259. data/test/unit/test_page.rb +462 -361
  260. data/test/unit/test_permissions.rb +379 -364
  261. data/test/unit/test_piece.rb +67 -75
  262. data/test/unit/test_plugins.rb +82 -89
  263. data/test/unit/test_prototype_set.rb +215 -216
  264. data/test/unit/test_prototypes.rb +114 -124
  265. data/test/unit/test_publishing.rb +252 -289
  266. data/test/unit/test_render.rb +167 -115
  267. data/test/unit/test_revisions.rb +436 -444
  268. data/test/unit/test_schema.rb +339 -309
  269. data/test/unit/test_search.rb +577 -574
  270. data/test/unit/test_serialisation.rb +136 -147
  271. data/test/unit/test_site.rb +252 -227
  272. data/test/unit/test_skeptick.rb +130 -0
  273. data/test/unit/test_storage.rb +46 -40
  274. data/test/unit/test_structure.rb +57 -66
  275. data/test/unit/test_styles.rb +104 -104
  276. data/test/unit/test_templates.rb +72 -57
  277. data/test/unit/test_type_hierarchy.rb +15 -16
  278. data/test/unit/test_visibility.rb +239 -257
  279. metadata +455 -326
  280. data/application/js/vendor/JS.Class-2.1.5/CHANGELOG +0 -283
  281. data/application/js/vendor/JS.Class-2.1.5/MIT-LICENSE +0 -30
  282. data/application/js/vendor/JS.Class-2.1.5/README +0 -30
  283. data/application/js/vendor/JS.Class-2.1.5/min/command.js +0 -1
  284. data/application/js/vendor/JS.Class-2.1.5/min/comparable.js +0 -1
  285. data/application/js/vendor/JS.Class-2.1.5/min/constant_scope.js +0 -1
  286. data/application/js/vendor/JS.Class-2.1.5/min/decorator.js +0 -1
  287. data/application/js/vendor/JS.Class-2.1.5/min/enumerable.js +0 -1
  288. data/application/js/vendor/JS.Class-2.1.5/min/forwardable.js +0 -1
  289. data/application/js/vendor/JS.Class-2.1.5/min/hash.js +0 -1
  290. data/application/js/vendor/JS.Class-2.1.5/min/linked_list.js +0 -1
  291. data/application/js/vendor/JS.Class-2.1.5/min/loader.js +0 -1
  292. data/application/js/vendor/JS.Class-2.1.5/min/method_chain.js +0 -1
  293. data/application/js/vendor/JS.Class-2.1.5/min/observable.js +0 -1
  294. data/application/js/vendor/JS.Class-2.1.5/min/package.js +0 -1
  295. data/application/js/vendor/JS.Class-2.1.5/min/proxy.js +0 -1
  296. data/application/js/vendor/JS.Class-2.1.5/min/ruby.js +0 -1
  297. data/application/js/vendor/JS.Class-2.1.5/min/set.js +0 -1
  298. data/application/js/vendor/JS.Class-2.1.5/min/stack_trace.js +0 -1
  299. data/application/js/vendor/JS.Class-2.1.5/min/state.js +0 -1
  300. data/application/js/vendor/JS.Class-2.1.5/min/stdlib.js +0 -16
  301. data/application/js/vendor/jquery-1.6.2.min.js +0 -18
  302. data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +0 -791
  303. data/application/js/vendor/jquery-ui-1.8.9.custom.min.js +0 -415
  304. data/application/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf +0 -0
  305. data/application/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png +0 -0
  306. data/bin/limit-upload +0 -5
  307. data/bin/unlimit-upload +0 -3
  308. data/lib/spontaneous/asset/file.rb +0 -25
  309. data/lib/spontaneous/asset/source.rb +0 -28
  310. data/lib/spontaneous/image_size.rb +0 -123
  311. data/lib/spontaneous/output/assets/compression.rb +0 -58
  312. data/lib/spontaneous/output/assets.rb +0 -32
  313. data/lib/spontaneous/rack/around_back.rb +0 -20
  314. data/lib/spontaneous/rack/around_front.rb +0 -27
  315. data/lib/spontaneous/rack/around_preview.rb +0 -22
  316. data/lib/spontaneous/rack/assets.rb +0 -126
  317. data/lib/spontaneous/rack/authentication.rb +0 -20
  318. data/lib/spontaneous/rack/cookie_authentication.rb +0 -38
  319. data/lib/spontaneous/rack/helpers.rb +0 -52
  320. data/lib/spontaneous/rack/http.rb +0 -18
  321. data/lib/spontaneous/rack/media.rb +0 -30
  322. data/lib/spontaneous/rack/query_authentication.rb +0 -35
  323. data/lib/spontaneous/rack/reloader.rb +0 -45
  324. data/lib/spontaneous/rack/user_helpers.rb +0 -28
  325. /data/{README → application/js/field/markdown/text_command.js} +0 -0
  326. /data/application/js/vendor/{JS.Class-2.1.5/min/core.js → js.class-2.1.5.min.js} +0 -0
  327. /data/test/fixtures/assets/public1/css/{a.scss → a.css.scss} +0 -0
  328. /data/{lib/spontaneous/generators/site/public/css/site.scss → test/fixtures/assets/public1/x.css} +0 -0
  329. /data/{lib/spontaneous/generators/site/public/js/.empty_directory → test/fixtures/assets/public1/x.png} +0 -0
  330. /data/test/fixtures/assets/public2/css/{b.scss → b.css.scss} +0 -0
  331. /data/test/fixtures/assets/public2/js/{n.coffee → n.js.coffee} +0 -0
  332. /data/test/fixtures/back/{public → assets}/css/sass_include.scss +0 -0
  333. /data/test/fixtures/back/{public → assets}/css/sass_template.scss +0 -0
  334. /data/test/fixtures/back/{public → assets}/js/coffeescript.coffee +0 -0
  335. /data/{lib/spontaneous/generators/site/public/js/site.js → test/fixtures/templates/aliases/aa_alias.html.cut} +0 -0
@@ -3,304 +3,294 @@
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
5
 
6
- class ChangeTest < MiniTest::Spec
6
+ describe "Change" do
7
7
 
8
- def setup
8
+ before do
9
9
  @now = Time.now
10
10
  @site = setup_site
11
- end
12
-
13
- def teardown
14
- teardown_site
15
- end
16
11
 
17
- context "Changes" do
18
- setup do
19
- stub_time(@now)
20
- @revision = 1
12
+ stub_time(@now)
13
+ @revision = 1
21
14
 
22
- Content.delete
15
+ Content.delete
23
16
 
24
- class Page < ::Page
25
- field :title, :string, :default => "New Page"
26
- box :things
27
- end
28
- class Piece < ::Piece
29
- box :things
30
- end
17
+ class ::Page
18
+ field :title, :string, :default => "New Page"
19
+ box :things
31
20
  end
32
21
 
33
- teardown do
34
- ChangeTest.send(:remove_const, :Page) rescue nil
35
- ChangeTest.send(:remove_const, :Piece) rescue nil
36
- Content.delete_revision(@revision) rescue nil
37
- Content.delete_revision(@revision+1) rescue nil
38
- Content.delete
39
- DB.logger = nil
22
+ class ::Piece
23
+ box :things
40
24
  end
25
+ end
41
26
 
27
+ after do
28
+ Content.delete_revision(@revision) rescue nil
29
+ Content.delete_revision(@revision+1) rescue nil
30
+ Content.delete
31
+ teardown_site
32
+ end
42
33
 
43
- should "flag if the site has never been published" do
44
- root = Page.create(:title => "root")
45
- 5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
46
- result = S::Change.outstanding
47
- assert result.key?(:published_revision)
48
- result[:published_revision].should == 0
49
- result[:first_publish].should be_true
50
- end
34
+ it "flag if the site has never been published" do
35
+ root = Page.create(:title => "root")
36
+ 5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
37
+ result = S::Change.outstanding
38
+ assert result.key?(:published_revision)
39
+ result[:published_revision].must_equal 0
40
+ assert result[:first_publish]
41
+ end
51
42
 
52
43
 
53
- should "list all newly created pages" do
54
- root = Page.create(:title => "root")
55
- root[:first_published_at] = root[:last_published_at] = root.modified_at + 1000
56
- root.save
44
+ it "list all newly created pages" do
45
+ root = Page.create(:title => "root")
46
+ root[:first_published_at] = root[:last_published_at] = root.modified_at + 1000
47
+ root.save
57
48
 
58
- 5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
49
+ 5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
59
50
 
60
- result = S::Change.outstanding
61
- result.must_be_instance_of(Hash)
51
+ result = S::Change.outstanding
52
+ result.must_be_instance_of(Hash)
62
53
 
63
- pages = result[:changes]
64
- pages.must_be_instance_of(Array)
65
- pages.length.should == 5
54
+ pages = result[:changes]
55
+ pages.must_be_instance_of(Array)
56
+ pages.length.must_equal 5
66
57
 
67
- pages.map(&:class).should == [S::Change]*5
58
+ pages.map(&:class).must_equal [S::Change]*5
68
59
 
69
- Set.new(pages.map(&:page_id)).should == Set.new(root.things.map { |p| p.id })
70
- end
60
+ Set.new(pages.map(&:page_id)).must_equal Set.new(root.things.map { |p| p.id })
61
+ end
71
62
 
72
- should "not list new pieces as available for publish" do
73
- root = Page.create(:title => "root")
74
- Content.publish(@revision)
75
- # force root to appear in the modified lists -- need this because otherwise the changes happen
76
- # more quickly than the resolution of the timestamps can register
77
- root[:first_published_at] = root[:last_published_at] = root.modified_at - 1000
78
- root.things << Piece.new
79
- root.save.reload
80
- result = S::Change.outstanding[:changes]
81
- result.length.should == 1
82
- result.first.page.should == root
83
- end
63
+ it "not list new pieces as available for publish" do
64
+ root = Page.create(:title => "root")
65
+ Content.publish(@revision)
66
+ # force root to appear in the modified lists -- need this because otherwise the changes happen
67
+ # more quickly than the resolution of the timestamps can register
68
+ root[:first_published_at] = root[:last_published_at] = root.modified_at - 1000
69
+ root.things << Piece.new
70
+ root.save.reload
71
+ result = S::Change.outstanding[:changes]
72
+ result.length.must_equal 1
73
+ result.first.page.must_equal root
74
+ end
84
75
 
85
- should "not list pages that have been published" do
86
- root = Page.create(:title => "root")
76
+ it "not list pages that have been published" do
77
+ root = Page.create(:title => "root")
87
78
 
88
- Content.publish(@revision)
79
+ Content.publish(@revision)
89
80
 
90
- 5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
91
- root.save
81
+ 5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
82
+ root.save
92
83
 
93
- Content.publish(@revision+1, [root.id, root.things.first.id])
84
+ Content.publish(@revision+1, [root.id, root.things.first.id])
94
85
 
95
- result = S::Change.outstanding[:changes]
96
- result.length.should == 4
97
- Set.new(result.map(&:page_id).flatten).should == Set.new(root.things[1..-1].map(&:id))
98
- end
86
+ result = S::Change.outstanding[:changes]
87
+ result.length.must_equal 4
88
+ Set.new(result.map(&:page_id).flatten).must_equal Set.new(root.things[1..-1].map(&:id))
89
+ end
99
90
 
100
- should "group unpublished parents with their children" do
101
- root = Page.create(:title => "root")
102
-
103
- Content.publish(@revision)
104
-
105
- root.reload
106
- page1 = Page.new(:title => "Page 1")
107
- root.things << page1
108
- new_child1 = Page.new(:title => "New Child 1")
109
- page1.things << new_child1
110
- new_parent = Page.new(:title => "New Parent")
111
- new_child2 = Page.new(:title => "New Child 2")
112
- new_child3 = Page.new(:title => "New Child 3")
113
- root.things << new_parent
114
- new_parent.things << new_child2
115
- new_child2.things << new_child3
116
-
117
- pages = [root, page1, new_child1, new_parent, new_child2, new_child3]
118
- pages.each(&:save)
119
-
120
-
121
- Content.publish(@revision+1, [root.id])
122
- result = S::Change.outstanding[:changes]
123
-
124
- result.length.should == 5
125
-
126
- id_groups = result.map { |change|
127
- [change.page.id, change.dependent.map(&:id)]
128
- }
129
- Set.new(id_groups).should == Set.new([
130
- [page1.id, []],
131
- [new_child1.id, [page1.id]],
132
- [new_parent.id, []],
133
- [new_child2.id, [new_parent.id ]],
134
- [new_child3.id, [new_parent.id, new_child2.id]]
135
- ])
136
- end
91
+ it "group unpublished parents with their children" do
92
+ root = Page.create(:title => "root")
93
+
94
+ Content.publish(@revision)
95
+
96
+ root.reload
97
+ page1 = Page.new(:title => "Page 1")
98
+ root.things << page1
99
+ new_child1 = Page.new(:title => "New Child 1")
100
+ page1.things << new_child1
101
+ new_parent = Page.new(:title => "New Parent")
102
+ new_child2 = Page.new(:title => "New Child 2")
103
+ new_child3 = Page.new(:title => "New Child 3")
104
+ root.things << new_parent
105
+ new_parent.things << new_child2
106
+ new_child2.things << new_child3
107
+
108
+ pages = [root, page1, new_child1, new_parent, new_child2, new_child3]
109
+ pages.each(&:save)
110
+
111
+
112
+ Content.publish(@revision+1, [root.id])
113
+ result = S::Change.outstanding[:changes]
114
+
115
+ result.length.must_equal 5
116
+
117
+ id_groups = result.map { |change|
118
+ [change.page.id, change.dependent.map(&:id)]
119
+ }
120
+ Set.new(id_groups).must_equal Set.new([
121
+ [page1.id, []],
122
+ [new_child1.id, [page1.id]],
123
+ [new_parent.id, []],
124
+ [new_child2.id, [new_parent.id ]],
125
+ [new_child3.id, [new_parent.id, new_child2.id]]
126
+ ])
127
+ end
137
128
 
138
- should "successfully publish list of dependent pages" do
139
- root = Page.create(:title => "root")
140
-
141
- Content.publish(@revision)
142
-
143
- root.reload
144
- page1 = Page.new(:title => "Page 1")
145
- root.things << page1
146
- new_child1 = Page.new(:title => "New Child 1")
147
- page1.things << new_child1
148
- new_parent = Page.new(:title => "New Parent")
149
- new_child2 = Page.new(:title => "New Child 2")
150
- new_child3 = Page.new(:title => "New Child 3")
151
- root.things << new_parent
152
- new_parent.things << new_child2
153
- new_child2.things << new_child3
154
-
155
- pages = [root, page1, new_child1, new_parent, new_child2, new_child3]
156
- pages.each(&:save)
157
-
158
-
159
- Content.publish(@revision+1, [root.id])
160
- result = S::Change.outstanding[:changes]
161
-
162
- e = nil
163
- begin
164
- pages = Spontaneous::Change.include_dependencies([new_child3])
165
- Content.publish(@revision+2, pages)
166
- Content.delete_revision(@revision + 2) rescue nil
167
- rescue => e
168
- Content.delete_revision(@revision + 2) rescue nil
169
- raise
170
- end
129
+ it "successfully publish list of dependent pages" do
130
+ root = Page.create(:title => "root")
131
+
132
+ Content.publish(@revision)
133
+
134
+ root.reload
135
+ page1 = Page.new(:title => "Page 1")
136
+ root.things << page1
137
+ new_child1 = Page.new(:title => "New Child 1")
138
+ page1.things << new_child1
139
+ new_parent = Page.new(:title => "New Parent")
140
+ new_child2 = Page.new(:title => "New Child 2")
141
+ new_child3 = Page.new(:title => "New Child 3")
142
+ root.things << new_parent
143
+ new_parent.things << new_child2
144
+ new_child2.things << new_child3
145
+
146
+ pages = [root, page1, new_child1, new_parent, new_child2, new_child3]
147
+ pages.each(&:save)
148
+
149
+
150
+ Content.publish(@revision+1, [root.id])
151
+ result = S::Change.outstanding[:changes]
152
+
153
+ e = nil
154
+ begin
155
+ pages = Spontaneous::Change.include_dependencies([new_child3])
156
+ Content.publish(@revision+2, pages)
157
+ Content.delete_revision(@revision + 2) rescue nil
158
+ rescue => e
159
+ Content.delete_revision(@revision + 2) rescue nil
160
+ raise
171
161
  end
162
+ end
172
163
 
173
- should "provide page & dependency information in serializable format" do
174
- root = Page.create(:title => "root")
175
-
176
- Content.publish(@revision)
177
-
178
- root.reload
179
- page1 = Page.new(:title => "Page 1")
180
- root.things << page1
181
- new_child1 = Page.new(:title => "New Child 1")
182
- page1.things << new_child1
183
- root.save
184
-
185
- Content.publish(@revision+1, [root.id])
186
- result = S::Change.outstanding[:changes]
187
- change = result.detect { |change| change.page.id == new_child1.id }
188
- change.export.should == {
189
- :id => new_child1.id,
190
- :title => new_child1.title.value,
191
- :url => new_child1.path,
192
- :published_at => nil,
193
- :modified_at => new_child1.modified_at.httpdate,
194
- # :editor_login => "someone",
195
- :depth => new_child1.depth,
164
+ it "provide page & dependency information in serializable format" do
165
+ root = Page.create(:title => "root")
166
+
167
+ Content.publish(@revision)
168
+
169
+ root.reload
170
+ page1 = Page.new(:title => "Page 1")
171
+ root.things << page1
172
+ new_child1 = Page.new(:title => "New Child 1")
173
+ page1.things << new_child1
174
+ root.save
175
+
176
+ Content.publish(@revision+1, [root.id])
177
+ result = S::Change.outstanding[:changes]
178
+ change = result.detect { |change| change.page.id == new_child1.id }
179
+ change.export.must_equal({
180
+ :id => new_child1.id,
181
+ :title => new_child1.title.value,
182
+ :url => new_child1.path,
183
+ :published_at => nil,
184
+ :modified_at => new_child1.modified_at.httpdate,
185
+ # :editor_login => "someone",
186
+ :depth => new_child1.depth,
187
+ :side_effects => {},
188
+ :update_locks => [],
189
+ :dependent => [{
190
+ :id => page1.id,
191
+ :depth => page1.depth,
192
+ :title => page1.title.value,
193
+ :url => page1.path,
196
194
  :side_effects => {},
197
195
  :update_locks => [],
198
- :dependent => [{
199
- :id => page1.id,
200
- :depth => page1.depth,
201
- :title => page1.title.value,
202
- :url => page1.path,
203
- :side_effects => {},
204
- :update_locks => [],
205
- :published_at => nil,
206
- :modified_at => page1.modified_at.httpdate,
207
- }]
208
- }
209
- end
196
+ :published_at => nil,
197
+ :modified_at => page1.modified_at.httpdate,
198
+ }]
199
+ })
200
+ end
210
201
 
211
- should "order modified changes in reverse modification date order" do
212
- root = Page.create(:title => "root")
213
-
214
- Content.publish(@revision)
215
-
216
- root.reload
217
- page1 = Page.new(:title => "Page 1")
218
- root.things << page1
219
- new_child1 = Page.new(:title => "New Child 1")
220
- page1.things << new_child1
221
- root.save
222
- last = Time.now + 100
223
- ::Content.filter(:id => new_child1.id).update(:modified_at => last)
224
- result = S::Change.outstanding[:changes]
225
- assert result.first.modified_at > result.last.modified_at, "Change list in incorrect order"
226
- end
202
+ it "order modified changes in reverse modification date order" do
203
+ root = Page.create(:title => "root")
204
+
205
+ Content.publish(@revision)
206
+
207
+ root.reload
208
+ page1 = Page.new(:title => "Page 1")
209
+ root.things << page1
210
+ new_child1 = Page.new(:title => "New Child 1")
211
+ page1.things << new_child1
212
+ root.save
213
+ last = Time.now + 100
214
+ ::Content.filter(:id => new_child1.id).update(:modified_at => last)
215
+ result = S::Change.outstanding[:changes]
216
+ assert result.first.modified_at > result.last.modified_at, "Change list in incorrect order"
217
+ end
227
218
 
228
- should "provide information on side effects of publishing page with path changes" do
229
- root = Page.create(:title => "root")
219
+ it "provide information on side effects of publishing page with path changes" do
220
+ root = Page.create(:title => "root")
230
221
 
231
222
 
232
- root.reload
233
- page1 = Page.new(:title => "Page 1")
234
- root.things << page1
235
- new_child1 = Page.new(:title => "New Child 1")
236
- page1.things << new_child1
237
- root.save
223
+ root.reload
224
+ page1 = Page.new(:title => "Page 1")
225
+ root.things << page1
226
+ new_child1 = Page.new(:title => "New Child 1")
227
+ page1.things << new_child1
228
+ root.save
238
229
 
239
- Content.publish(@revision)
230
+ Content.publish(@revision)
240
231
 
241
- later = @now + 10
242
- stub_time(later)
243
- old_slug = page1.slug
244
- page1.slug = "changed"
245
- page1.save
232
+ later = @now + 10
233
+ stub_time(later)
234
+ old_slug = page1.slug
235
+ page1.slug = "changed"
236
+ page1.save
246
237
 
247
- result = S::Change.outstanding[:changes]
238
+ result = S::Change.outstanding[:changes]
248
239
 
249
- change = result.detect { |change| change.page.id == page1.id }
250
- change.export[:side_effects].should == {
251
- :slug => [{ :count => 1, :created_at => later.httpdate, :old_value => old_slug, :new_value => "changed"}]
252
- }
253
- end
240
+ change = result.detect { |change| change.page.id == page1.id }
241
+ change.export[:side_effects].must_equal({
242
+ :slug => [{ :count => 1, :created_at => later.httpdate, :old_value => old_slug, :new_value => "changed"}]
243
+ })
244
+ end
254
245
 
255
- should "provide information on side effects of publishing page with visibility changes" do
256
- root = Page.create(:title => "root")
246
+ it "provide information on side effects of publishing page with visibility changes" do
247
+ root = Page.create(:title => "root")
257
248
 
258
249
 
259
- root.reload
260
- page1 = Page.new(:title => "Page 1")
261
- root.things << page1
262
- new_child1 = Page.new(:title => "New Child 1")
263
- page1.things << new_child1
264
- root.save
250
+ root.reload
251
+ page1 = Page.new(:title => "Page 1")
252
+ root.things << page1
253
+ new_child1 = Page.new(:title => "New Child 1")
254
+ page1.things << new_child1
255
+ root.save
265
256
 
266
- Content.publish(@revision)
257
+ Content.publish(@revision)
267
258
 
268
- later = @now + 10
269
- stub_time(later)
270
- page1.hide!
259
+ later = @now + 10
260
+ stub_time(later)
261
+ page1.hide!
271
262
 
272
- page1.reload
273
- result = S::Change.outstanding[:changes]
274
- change = result.detect { |change| change.page.id == page1.id }
275
- change.export[:side_effects].should == {
276
- :visibility => [{ :count => 1, :created_at => later.httpdate, :old_value => false, :new_value => true}]
277
- }
278
- end
263
+ page1.reload
264
+ result = S::Change.outstanding[:changes]
265
+ change = result.detect { |change| change.page.id == page1.id }
266
+ change.export[:side_effects].must_equal({
267
+ :visibility => [{ :count => 1, :created_at => later.httpdate, :old_value => false, :new_value => true}]
268
+ })
269
+ end
279
270
 
280
- should "provide information about any update locks that exist on a page" do
281
- Piece.field :async
282
- page = Page.create(:title => "page")
283
-
284
-
285
- piece = Piece.new
286
-
287
- page.things << piece
288
- page.save
289
- piece.save
290
-
291
- lock = Spontaneous::PageLock.create(:page_id => page.id, :content_id => piece.id, :field_id => piece.async.id, :description => "Update Lock")
292
- page.locked_for_update?.should be_true
293
- result = S::Change.outstanding[:changes]
294
- change = result.detect { |change| change.page.id == page.id }
295
- change.export[:update_locks].should == [{
296
- id: lock.id,
297
- content_id: piece.id,
298
- field_id: piece.async.id,
299
- field_name: :async,
300
- location: "Field ‘async’ of entry 1 in box ‘things’",
301
- description: "Update Lock",
302
- created_at: @now.httpdate
303
- }]
304
- end
271
+ it "provide information about any update locks that exist on a page" do
272
+ Piece.field :async
273
+ page = Page.create(:title => "page")
274
+
275
+
276
+ piece = Piece.new
277
+
278
+ page.things << piece
279
+ page.save
280
+ piece.save
281
+
282
+ lock = Spontaneous::PageLock.create(:page_id => page.id, :content_id => piece.id, :field_id => piece.async.id, :description => "Update Lock")
283
+ assert page.locked_for_update?
284
+ result = S::Change.outstanding[:changes]
285
+ change = result.detect { |change| change.page.id == page.id }
286
+ change.export[:update_locks].must_equal [{
287
+ id: lock.id,
288
+ content_id: piece.id,
289
+ field_id: piece.async.id,
290
+ field_name: :async,
291
+ location: "Field ‘async’ of entry 1 in box ‘things’",
292
+ description: "Update Lock",
293
+ created_at: @now.httpdate
294
+ }]
305
295
  end
306
296
  end