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
@@ -2,352 +2,315 @@
2
2
 
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
+ describe "Publishing" do
5
6
 
6
- class PublishingTest < MiniTest::Spec
7
-
8
- def self.site_root
9
- @site_root
10
- end
11
-
12
- def self.startup
13
- @site_root = Dir.mktmpdir
7
+ start do
8
+ site_root = Dir.mktmpdir
14
9
  template_source = File.expand_path(File.dirname(__FILE__) / "../fixtures/templates/publishing/templates")
15
- FileUtils.cp_r(template_source, @site_root)
10
+ FileUtils.cp_r(template_source, site_root)
11
+ let(:site_root) { site_root }
16
12
  end
17
13
 
18
- def self.shutdown
14
+ finish do
19
15
  ::Content.delete_all_revisions! rescue nil
20
16
  teardown_site(true)
21
17
  end
22
18
 
23
- @@now = Time.now
19
+ before do
20
+ @now = Time.now
21
+ stub_time(@now)
24
22
 
25
- def setup
26
- @site = setup_site(self.class.site_root)
27
- @now = @@now
23
+ @site = setup_site(site_root)
28
24
  Site.background_mode = :immediate
25
+
26
+ Content.delete
27
+
28
+ class Page
29
+ field :title, :string, :default => "New Page"
30
+ box :things
31
+ end
32
+ class Piece
33
+ box :things
34
+ end
29
35
  end
30
36
 
31
- def teardown
37
+ after do
38
+ Object.send(:remove_const, :Page) rescue nil
39
+ Object.send(:remove_const, :Piece) rescue nil
40
+ Content.delete
32
41
  teardown_site(false)
33
42
  end
34
43
 
35
- context "publishing" do
36
-
37
- setup do
38
- stub_time(@@now)
39
-
44
+ describe "site publishing" do
45
+ before do
40
46
  Content.delete
47
+ @revision = 3
48
+ S::State.delete
49
+ S::State.create(:revision => @revision, :published_revision => 2)
50
+ S::State.revision.must_equal @revision
51
+ end
41
52
 
42
- class Page < ::Page
43
- field :title, :string, :default => "New Page"
44
- box :things
45
- end
46
- class Piece < ::Piece
47
- box :things
48
- end
53
+ after do
54
+ Content.delete_revision(@revision)
55
+ S::PublishedRevision.delete
56
+ end
49
57
 
50
- count = 0
51
- 2.times do |i|
52
- c = Page.new(:uid => i)
53
- count += 1
54
- 2.times do |j|
55
- d = Piece.new(:uid => "#{i}.#{j}")
56
- c.things << d
57
- count += 1
58
- 2.times do |k|
59
- d.things << Page.new(:uid => "#{i}.#{j}.#{k}")
60
- d.save
61
- count += 1
62
- end
63
- end
64
- c.save
65
- end
58
+ it "delete any conflicting revision tables" do
59
+ S::Publishing::Revision.create(Content, 3)
60
+ S::Site.publish_all
66
61
  end
67
62
 
68
- teardown do
69
- PublishingTest.send(:remove_const, :Page) rescue nil
70
- PublishingTest.send(:remove_const, :Piece) rescue nil
71
- Content.delete
63
+ it "issue a publish_all if passed page id list including all pages (in any order)" do
64
+ skip "Implement after scheduled publishes"
72
65
  end
73
66
 
67
+ it "publish all" do
68
+ Content.expects(:publish).with(@revision, nil)
69
+ S::Site.publish_all
70
+ end
74
71
 
72
+ it "record date and time of publish" do
73
+ Content.expects(:publish).with(@revision, nil)
74
+ S::PublishedRevision.expects(:create).with(:revision => @revision, :published_at => @now)
75
+ S::Site.publish_all
76
+ end
75
77
 
78
+ it "bump revision after a publish" do
79
+ S::Site.publish_all
80
+ S::Site.revision.must_equal @revision + 1
81
+ S::Site.published_revision.must_equal @revision
82
+ end
76
83
 
77
- context "site publishing" do
78
- setup do
79
- Content.delete
80
- @revision = 3
81
- S::State.delete
82
- S::State.create(:revision => @revision, :published_revision => 2)
83
- S::State.revision.should == @revision
84
- end
84
+ it "not delete scheduled changes after an exception during publish" do
85
+ skip "Implement after scheduled publishes"
86
+ end
85
87
 
86
- teardown do
87
- Content.delete_revision(@revision)
88
- S::Revision.delete
89
- end
88
+ it "set Site.pending_revision before publishing" do
89
+ Content.expects(:publish).with(@revision, nil) { Site.pending_revision == @revision }
90
+ Site.publish_all
91
+ end
90
92
 
91
- should "delete any conflicting revision tables" do
92
- S::Publishing::Revision.create(Content, 3)
93
- S::Site.publish_all
94
- end
93
+ it "reset Site.pending_revision after publishing" do
94
+ Site.publish_all
95
+ Site.pending_revision.must_be_nil
96
+ end
95
97
 
96
- should "issue a publish_all if passed page id list including all pages (in any order)" do
97
- skip "Implement after scheduled publishes"
98
+ it "not update first_published or last_published if rendering fails" do
99
+ c = Content.create
100
+ c.first_published_at.must_be_nil
101
+ Spontaneous::Site.expects(:pages).returns([c])
102
+ # c.expects(:render).raises(Exception)
103
+ begin
104
+ silence_logger { Site.publish_all }
105
+ # Site.publish_all
106
+ rescue Exception; end
107
+ c.reload
108
+ Content.with_editable do
109
+ c.first_published_at.must_be_nil
98
110
  end
111
+ end
99
112
 
100
- should "publish all" do
101
- Content.expects(:publish).with(@revision, nil)
102
- S::Site.publish_all
103
- end
113
+ it "clean up state on publishing failure" do
114
+ Site.pending_revision.must_be_nil
115
+ refute Content.revision_exists?(@revision)
116
+ # don't like peeking into implementation here but don't know how else
117
+ # to simulate the right error
118
+ root = Page.create()
119
+ Spontaneous::Site.expects(:pages).returns([root])
120
+ output = root.output(:html)
121
+ output.expects(:render_using).raises(Exception)
122
+ root.expects(:outputs).at_least_once.returns([output])
123
+ begin
124
+ silence_logger { Site.publish_all }
125
+ rescue Exception; end
126
+ Site.pending_revision.must_be_nil
127
+ refute Content.revision_exists?(@revision)
128
+ begin
129
+ silence_logger { Site.publish_pages([change1]) }
130
+ rescue Exception; end
131
+ Site.pending_revision.must_be_nil
132
+ refute Content.revision_exists?(@revision)
133
+ end
134
+ end
104
135
 
105
- should "record date and time of publish" do
106
- Content.expects(:publish).with(@revision, nil)
107
- S::Revision.expects(:create).with(:revision => @revision, :published_at => @now)
108
- S::Site.publish_all
109
- end
110
136
 
111
- should "bump revision after a publish" do
112
- S::Site.publish_all
113
- S::Site.revision.should == @revision + 1
114
- S::Site.published_revision.should == @revision
115
- end
137
+ describe "rendering" do
138
+ before do
139
+ @revision = 2
140
+ Content.delete_revision(@revision)
141
+ Content.delete
142
+ S::State.delete
143
+ S::State.create(:revision => @revision, :published_revision => 2)
144
+ S::Site.revision.must_equal @revision
145
+
146
+
147
+ class ::PublishablePage < Page; end
148
+ class ::DynamicPublishablePage < Page; end
149
+ PublishablePage.box :box1
150
+ DynamicPublishablePage.box :box1
151
+ PublishablePage.layout :"static"
152
+ PublishablePage.layout :"dynamic"
153
+
154
+ DynamicPublishablePage.layout :"static"
155
+ DynamicPublishablePage.layout :"dynamic"
156
+
157
+ DynamicPublishablePage.request { show "/about" }
158
+
159
+ @home = PublishablePage.create(:title => 'Home')
160
+ @home.layout = :"dynamic"
161
+ @about = PublishablePage.create(:title => "About", :slug => "about")
162
+ @blog = PublishablePage.create(:title => "Blog", :slug => "blog")
163
+ @post1 = PublishablePage.create(:title => "Post 1", :slug => "post-1")
164
+ @post2 = PublishablePage.create(:title => "Post 2", :slug => "post-2")
165
+ @post3 = PublishablePage.create(:title => "Post 3", :slug => "post-3")
166
+ @news = DynamicPublishablePage.create(:title => "News", :slug => "news")
167
+ @contact = DynamicPublishablePage.create(:title => "Contact", :slug => "contact")
168
+ @contact.layout = :dynamic
169
+ @home.box1 << @about
170
+ @home.box1 << @blog
171
+ @home.box1 << @news
172
+ @home.box1 << @contact
173
+ @blog.box1 << @post1
174
+ @blog.box1 << @post2
175
+ @blog.box1 << @post3
176
+ @pages = [@home, @about, @blog, @news, @post1, @post2, @post3]
177
+ @pages.each { |p| p.save }
178
+ Site.publish_all
179
+ end
116
180
 
117
- should "not delete scheduled changes after an exception during publish" do
118
- skip "Implement after scheduled publishes"
119
- end
181
+ after do
182
+ Content.delete_revision(@revision)
183
+ Content.delete_revision(@revision+1)
184
+ Content.delete
185
+ S::State.delete
186
+ Object.send(:remove_const, :PublishablePage) rescue nil
187
+ Object.send(:remove_const, :DynamicPublishablePage) rescue nil
188
+ end
120
189
 
121
- should "set Site.pending_revision before publishing" do
122
- Content.expects(:publish).with(@revision, nil) { Site.pending_revision == @revision }
123
- Site.publish_all
124
- end
190
+ it "put its files into a numbered revision directory" do
191
+ Spontaneous.revision_dir(2).must_equal Pathname.new(@site.root / 'cache/revisions' / "00002").realpath.to_s
192
+ end
125
193
 
126
- should "reset Site.pending_revision after publishing" do
127
- Site.publish_all
128
- Site.pending_revision.should be_nil
129
- end
194
+ it "symlink the latest revision to 'current'" do
195
+ revision_dir = @site.revision_root / "00002"
196
+ current_dir = @site.revision_root / "current"
197
+ assert File.exists?(current_dir)
198
+ assert File.symlink?(current_dir)
199
+ File.readlink(current_dir).must_equal revision_dir
200
+ end
130
201
 
131
- should "not update first_published or last_published if rendering fails" do
132
- c = Content.create
133
- c.first_published_at.should be_nil
134
- Spontaneous::Site.expects(:pages).returns([c])
135
- # c.expects(:render).raises(Exception)
136
- begin
137
- silence_logger { Site.publish_all }
138
- # Site.publish_all
139
- rescue Exception; end
140
- c.reload
141
- Content.with_editable do
142
- c.first_published_at.should be_nil
202
+ it "have access to the current revision within the templates" do
203
+ revision_dir = @site.revision_root / "00002"
204
+ File.read(revision_dir / "static/about.html").must_equal "Page: 'About' 2\n"
205
+ end
206
+
207
+ it "produce rendered versions of each page" do
208
+ revision_dir = @site.revision_root / "00002"
209
+ file = result = nil
210
+ @pages.each do |page|
211
+ case page.slug
212
+ when "" # root is a dynamic page with no request handler
213
+ file = revision_dir / "dynamic/index.html.cut"
214
+ result = "Page: '#{page.title}' {{Time.now.to_i}}\n"
215
+ when "news" # news produces a static template but has a request handler
216
+ file = revision_dir / "protected/news.html"
217
+ result = "Page: 'News' 2\n"
218
+ when "contact" # contact is both dynamic and has a request handler
219
+ file = revision_dir / "dynamic/contact.html.cut"
220
+ result = "Page: 'Contact' {{Time.now.to_i}}\n"
221
+ else # the other pages are static
222
+ file = revision_dir / "static#{page.path}.html"
223
+ result = "Page: '#{page.title}' 2\n"
143
224
  end
225
+ assert File.exists?(file), "File '#{file}' should exist"
226
+ File.read(file).must_equal result
144
227
  end
145
-
146
- should "clean up state on publishing failure" do
147
- Site.pending_revision.should be_nil
148
- Content.revision_exists?(@revision).should be_false
149
- # don't like peeking into implementation here but don't know how else
150
- # to simulate the right error
151
- root = Page.create()
152
- Spontaneous::Site.expects(:pages).returns([root])
153
- output = root.output(:html)
154
- output.expects(:render_using).raises(Exception)
155
- root.expects(:outputs).at_least_once.returns([output])
156
- begin
157
- silence_logger { Site.publish_all }
158
- rescue Exception; end
159
- Site.pending_revision.should be_nil
160
- Content.revision_exists?(@revision).should be_false
161
- begin
162
- silence_logger { Site.publish_pages([change1]) }
163
- rescue Exception; end
164
- Site.pending_revision.should be_nil
165
- Content.revision_exists?(@revision).should be_false
228
+ revision_dir = @site.revision_root / "00002"
229
+ Dir[S.root / "public/**/*"].each do |public_file|
230
+ site_file = public_file.gsub(%r(^#{S.root}/), '')
231
+ publish_file = revision_dir / site_file
232
+ assert File.exists?(publish_file)
166
233
  end
167
234
  end
168
235
 
236
+ it "generate a config.ru file pointing to the current root" do
237
+ config_file = @site.revision_root / "00002/config.ru"
238
+ assert File.exists?(config_file)
239
+ File.read(config_file).must_match %r(#{Spontaneous.root})
240
+ end
169
241
 
170
- context "rendering" do
171
- setup do
172
- @revision = 2
173
- Content.delete_revision(@revision)
174
- Content.delete
175
- S::State.delete
176
- S::State.create(:revision => @revision, :published_revision => 2)
177
- S::Site.revision.should == @revision
178
-
179
-
180
- class ::PublishablePage < Page; end
181
- class ::DynamicPublishablePage < Page; end
182
- PublishablePage.box :box1
183
- DynamicPublishablePage.box :box1
184
- PublishablePage.layout :"static"
185
- PublishablePage.layout :"dynamic"
186
-
187
- DynamicPublishablePage.layout :"static"
188
- DynamicPublishablePage.layout :"dynamic"
189
-
190
- DynamicPublishablePage.request { show "/about" }
191
-
192
- @home = PublishablePage.create(:title => 'Home')
193
- @home.layout = :"dynamic"
194
- @about = PublishablePage.create(:title => "About", :slug => "about")
195
- @blog = PublishablePage.create(:title => "Blog", :slug => "blog")
196
- @post1 = PublishablePage.create(:title => "Post 1", :slug => "post-1")
197
- @post2 = PublishablePage.create(:title => "Post 2", :slug => "post-2")
198
- @post3 = PublishablePage.create(:title => "Post 3", :slug => "post-3")
199
- @news = DynamicPublishablePage.create(:title => "News", :slug => "news")
200
- @contact = DynamicPublishablePage.create(:title => "Contact", :slug => "contact")
201
- @contact.layout = :dynamic
202
- @home.box1 << @about
203
- @home.box1 << @blog
204
- @home.box1 << @news
205
- @home.box1 << @contact
206
- @blog.box1 << @post1
207
- @blog.box1 << @post2
208
- @blog.box1 << @post3
209
- @pages = [@home, @about, @blog, @news, @post1, @post2, @post3]
210
- @pages.each { |p| p.save }
211
- Site.publish_all
212
- end
213
-
214
- teardown do
215
- Content.delete_revision(@revision)
216
- Content.delete_revision(@revision+1)
217
- Content.delete
218
- S::State.delete
219
- Object.send(:remove_const, :PublishablePage) rescue nil
220
- Object.send(:remove_const, :DynamicPublishablePage) rescue nil
221
- end
242
+ it "generate a REVISION file containing the published revision number" do
243
+ rev_file = @site.revision_root / "REVISION"
244
+ result = File.read(rev_file)
245
+ result.must_equal Spontaneous::Media.pad_revision(@revision)
246
+ end
222
247
 
223
- should "put its files into a numbered revision directory" do
224
- Spontaneous.revision_dir(2).should == Pathname.new(@site.root / 'cache/revisions' / "00002").realpath.to_s
225
- end
248
+ it "transparently support previously unknown formats by assuming a simple HTML like rendering model" do
249
+ PublishablePage.add_output :rtf
250
+ Content.delete_revision(@revision+1)
251
+ Site.publish_all
252
+ File.read("#{@site.revision_root}/00003/static/index.rtf").must_equal "RICH!\n"
253
+ end
226
254
 
227
- should "symlink the latest revision to 'current'" do
228
- revision_dir = @site.revision_root / "00002"
229
- current_dir = @site.revision_root / "current"
230
- File.exists?(current_dir).should be_true
231
- File.symlink?(current_dir).should be_true
232
- File.readlink(current_dir).should == revision_dir
233
- end
255
+ it "respect a format's #dynamic? setting when deciding a rendered templates location" do
256
+ PublishablePage.add_output :rtf, :dynamic => true
257
+ Content.delete_revision(@revision+1)
258
+ Site.publish_all
259
+ File.read("#{@site.revision_root}/00003/dynamic/index.rtf.cut").must_equal "RICH!\n"
260
+ end
234
261
 
235
- should "have access to the current revision within the templates" do
236
- revision_dir = @site.revision_root / "00002"
237
- File.read(revision_dir / "static/about.html").should == "Page: 'About' 2\n"
238
- end
262
+ it "run the content revision cleanup task after the revision is live" do
263
+ Content.expects(:cleanup_revisions).with(@revision+1, 8)
264
+ Site.publish_all
265
+ end
239
266
 
240
- should "produce rendered versions of each page" do
241
- revision_dir = @site.revision_root / "00002"
242
- file = result = nil
243
- @pages.each do |page|
244
- case page.slug
245
- when "" # root is a dynamic page with no request handler
246
- file = revision_dir / "dynamic/index.html.cut"
247
- result = "Page: '#{page.title}' {{Time.now.to_i}}\n"
248
- when "news" # news produces a static template but has a request handler
249
- file = revision_dir / "protected/news.html"
250
- result = "Page: 'News' 2\n"
251
- when "contact" # contact is both dynamic and has a request handler
252
- file = revision_dir / "dynamic/contact.html.cut"
253
- result = "Page: 'Contact' {{Time.now.to_i}}\n"
254
- else # the other pages are static
255
- file = revision_dir / "static#{page.path}.html"
256
- result = "Page: '#{page.title}' 2\n"
257
- end
258
- assert File.exists?(file), "File '#{file}' should exist"
259
- File.read(file).should == result
267
+ describe "hooks & triggers" do
268
+ it "after_publish hook should be fired after publish is complete" do
269
+ publish1 = mock
270
+ publish1.expects(:finished).with(@revision+1)
271
+ publish2 = mock
272
+ publish2.expects(:finished)
273
+ Site.after_publish do |revision|
274
+ publish1.finished(revision)
260
275
  end
261
- revision_dir = @site.revision_root / "00002"
262
- Dir[S.root / "public/**/*"].each do |public_file|
263
- site_file = public_file.gsub(%r(^#{S.root}/), '')
264
- publish_file = revision_dir / site_file
265
- File.exists?(publish_file).should be_true
276
+ Site.after_publish do
277
+ publish2.finished
266
278
  end
267
- end
268
-
269
- should "generate a config.ru file pointing to the current root" do
270
- config_file = @site.revision_root / "00002/config.ru"
271
- File.exists?(config_file).should be_true
272
- File.read(config_file).should =~ %r(#{Spontaneous.root})
273
- end
274
-
275
- should "generate a REVISION file containing the published revision number" do
276
- rev_file = @site.revision_root / "REVISION"
277
- result = File.read(rev_file)
278
- result.should == Spontaneous::Media.pad_revision(@revision)
279
- end
280
-
281
- should "transparently support previously unknown formats by assuming a simple HTML like rendering model" do
282
- PublishablePage.add_output :rtf
283
279
  Content.delete_revision(@revision+1)
284
280
  Site.publish_all
285
- File.read("#{@site.revision_root}/00003/static/index.rtf").should == "RICH!\n"
281
+ Site.published_revision.must_equal @revision+1
286
282
  end
287
283
 
288
- should "respect a format's #dynamic? setting when deciding a rendered templates location" do
289
- PublishablePage.add_output :rtf, :dynamic => true
290
- Content.delete_revision(@revision+1)
291
- Site.publish_all
292
- File.read("#{@site.revision_root}/00003/dynamic/index.rtf.cut").should == "RICH!\n"
293
- end
294
-
295
- should "run the content revision cleanup task after the revision is live xxx" do
296
- Content.expects(:cleanup_revisions).with(@revision+1, 8)
297
- Site.publish_all
298
- end
284
+ it "abort publish if hook raises error" do
285
+ published_revision = @revision+1
286
+ Site.pending_revision.must_be_nil
287
+ refute Content.revision_exists?(published_revision)
299
288
 
300
- context "hooks & triggers" do
301
- setup do
289
+ Site.after_publish do |revision|
290
+ raise "Boom"
302
291
  end
303
292
 
304
- should "after_publish hook should be fired after publish is complete" do
305
- publish1 = mock
306
- publish1.expects(:finished).with(@revision+1)
307
- publish2 = mock
308
- publish2.expects(:finished)
309
- Site.after_publish do |revision|
310
- publish1.finished(revision)
311
- end
312
- Site.after_publish do
313
- publish2.finished
314
- end
315
- Content.delete_revision(@revision+1)
316
- Site.publish_all
317
- Site.published_revision.should == @revision+1
318
- end
293
+ begin
294
+ silence_logger { Site.publish_all }
295
+ rescue Exception; end
319
296
 
320
- should "abort publish if hook raises error" do
321
- published_revision = @revision+1
322
- Site.pending_revision.should be_nil
323
- Content.revision_exists?(published_revision).should be_false
324
-
325
- Site.after_publish do |revision|
326
- raise "Boom"
327
- end
328
-
329
- begin
330
- silence_logger { Site.publish_all }
331
- rescue Exception; end
332
-
333
- Site.pending_revision.should be_nil
334
- Site.published_revision.should == @revision
335
- Content.revision_exists?(published_revision).should be_false
336
- S::Revision.first(:revision => published_revision).should be_nil
337
- previous_root = Spontaneous.revision_dir(@revision)
338
- published_root = Spontaneous.revision_dir(published_revision)
339
- symlink = Pathname.new Spontaneous.revision_dir
340
- # JRuby's Pathname#realpath doesn't work properly
341
- # See: http://jira.codehaus.org/browse/JRUBY-6460
342
- #
343
- # This workaround tests that the symlink has been re-pointed
344
- #
345
- # File.read(symlink + "REVISION").realpath.to_s.should == Pathname.new(previous_root).realpath.to_s
346
- File.open(Pathname.new(previous_root) + "REVISION", "w") do |file|
347
- file.write(@revision)
348
- end
349
- File.read(symlink + "REVISION").should == @revision.to_s
297
+ Site.pending_revision.must_be_nil
298
+ Site.published_revision.must_equal @revision
299
+ refute Content.revision_exists?(published_revision)
300
+ S::PublishedRevision.first(:revision => published_revision).must_be_nil
301
+ previous_root = Spontaneous.revision_dir(@revision)
302
+ published_root = Spontaneous.revision_dir(published_revision)
303
+ symlink = Pathname.new Spontaneous.revision_dir
304
+ # JRuby's Pathname#realpath doesn't work properly
305
+ # See: http://jira.codehaus.org/browse/JRUBY-6460
306
+ #
307
+ # This workaround tests that the symlink has been re-pointed
308
+ #
309
+ # File.read(symlink + "REVISION").realpath.to_s.must_equal Pathname.new(previous_root).realpath.to_s
310
+ File.open(Pathname.new(previous_root) + "REVISION", "w") do |file|
311
+ file.write(@revision)
350
312
  end
313
+ File.read(symlink + "REVISION").must_equal @revision.to_s
351
314
  end
352
315
  end
353
316
  end