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,21 +3,16 @@
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
5
 
6
- class VisibilityTest < MiniTest::Spec
6
+ describe "Visibility" do
7
7
 
8
-
9
-
10
- def self.startup
8
+ start do
11
9
  @site = setup_site
12
10
  Object.const_set :R, Class.new(Page)
13
11
  Object.const_set :P, Class.new(Page)
14
12
  Object.const_set :E, Class.new(Piece)
15
13
  Object.const_set :MyAlias, Class.new(Piece)
16
14
  ::R.box :pages
17
- # class ::R < Page; end
18
- # class ::P < Page; end
19
15
  P.box :things
20
- # class ::E < Piece; end
21
16
  E.box :pages
22
17
  MyAlias.alias_of ::E
23
18
 
@@ -44,7 +39,7 @@ class VisibilityTest < MiniTest::Spec
44
39
  @root.reload
45
40
  end
46
41
 
47
- def self.shutdown
42
+ finish do
48
43
  Content.delete
49
44
  Object.send(:remove_const, :R)
50
45
  Object.send(:remove_const, :P)
@@ -57,307 +52,294 @@ class VisibilityTest < MiniTest::Spec
57
52
  @site
58
53
  end
59
54
 
60
- def setup
61
- Content.count.should == 59
55
+ before do
56
+ Content.count.must_equal 59
62
57
  @site = self.class.site
63
58
  @root = Content.root
64
59
  @child = Page.uid("0")
65
60
  end
66
61
 
67
- def teardown
62
+ after do
68
63
  Content.update(:hidden => false, :hidden_origin => nil)
69
64
  teardown_site(false, false)
70
65
  end
71
66
 
72
- context "Content" do
73
- setup do
74
- end
75
-
76
- teardown do
77
- # [:R, :P, :E].each do |k|
78
- # Object.send(:remove_const, k)
79
- # end
80
- # Spontaneous.database.logger = nil
81
- # Content.delete
82
- end
83
-
84
- should "be visible by default" do
85
- @child.visible?.should be_true
86
- end
67
+ it "be visible by default" do
68
+ assert @child.visible?
69
+ end
87
70
 
88
- should "be hidable using #hide!" do
89
- @child.hide!
90
- @child.visible?.should be_false
91
- @child.hidden?.should be_true
92
- end
71
+ it "be hidable using #hide!" do
72
+ @child.hide!
73
+ refute @child.visible?
74
+ assert @child.hidden?
75
+ end
93
76
 
94
- should "be hidable using #visible=" do
95
- @child.visible = false
96
- @child.visible?.should be_false
97
- @child.hidden?.should be_true
98
- end
77
+ it "be hidable using #visible=" do
78
+ @child.visible = false
79
+ refute @child.visible?
80
+ assert @child.hidden?
81
+ end
99
82
 
100
- should "hide child pages" do
101
- @child.page?.should be_true
102
- @child.hide!
103
- @child.children.each do |child1|
104
- child1.visible?.should be_false
105
- child1.hidden_origin.should == @child.id
106
- child1.children.each do |child2|
107
- child2.visible?.should be_false
108
- child2.hidden_origin.should == @child.id
109
- end
83
+ it "hide child pages" do
84
+ assert @child.page?
85
+ @child.hide!
86
+ @child.children.each do |child1|
87
+ refute child1.visible?
88
+ child1.hidden_origin.must_equal @child.id
89
+ child1.children.each do |child2|
90
+ refute child2.visible?
91
+ child2.hidden_origin.must_equal @child.id
110
92
  end
111
93
  end
94
+ end
112
95
 
113
- should "hide page content xxx" do
114
- @child.hide!
115
- @child.reload
116
- Content::Piece.all.select { |f| f.visible? }.length.should == 20
117
- Piece.all.select do |f|
118
- f.page.ancestors.include?(@child) || f.page == @child
119
- end.each do |f|
120
- f.visible?.should be_false
121
- f.hidden_origin.should == @child.id
122
- end
123
- Piece.all.select do | f |
124
- !f.page.ancestors.include?(@child) && f.page != @child
125
- end.each do |f|
126
- f.visible?.should be_true
127
- f.hidden_origin.should be_nil
128
- end
96
+ it "hide page content" do
97
+ @child.hide!
98
+ @child.reload
99
+ Content::Piece.all.select { |f| f.visible? }.length.must_equal 20
100
+ Piece.all.select do |f|
101
+ f.page.ancestors.include?(@child) || f.page == @child
102
+ end.each do |f|
103
+ refute f.visible?
104
+ f.hidden_origin.must_equal @child.id
105
+ end
106
+ Piece.all.select do | f |
107
+ !f.page.ancestors.include?(@child) && f.page != @child
108
+ end.each do |f|
109
+ assert f.visible?
110
+ f.hidden_origin.must_be_nil
129
111
  end
112
+ end
130
113
 
131
- should "re-show all page content" do
132
- @child.hide!
133
- @child.show!
134
- @child.reload
135
- Content.all.each do |c|
136
- c.visible?.should be_true
137
- c.hidden_origin.should be_nil
138
- end
114
+ it "re-show all page content" do
115
+ @child.hide!
116
+ @child.show!
117
+ @child.reload
118
+ Content.all.each do |c|
119
+ assert c.visible?
120
+ c.hidden_origin.must_be_nil
139
121
  end
122
+ end
140
123
 
141
- should "hide all descendents of page content" do
142
- piece = Content.first(:uid => "0.0")
143
- f = E.new(:uid => "0.0.X")
144
- piece.pages << f
145
- piece.save
146
- piece.reload
147
- piece.hide!
148
-
149
- Content.all.each do |c|
150
- if c.uid =~ /^0\.0/
151
- c.hidden?.should be_true
152
- if c.uid == "0.0"
153
- c.visible?.should be_false
154
- c.hidden_origin.should be_nil
155
- else
156
- c.visible?.should be_false
157
- c.hidden_origin.should == piece.id
158
- end
124
+ it "hide all descendents of page content" do
125
+ piece = Content.first(:uid => "0.0")
126
+ f = E.new(:uid => "0.0.X")
127
+ piece.pages << f
128
+ piece.save
129
+ piece.reload
130
+ piece.hide!
131
+
132
+ Content.all.each do |c|
133
+ if c.uid =~ /^0\.0/
134
+ assert c.hidden?
135
+ if c.uid == "0.0"
136
+ refute c.visible?
137
+ c.hidden_origin.must_be_nil
159
138
  else
160
- c.hidden?.should be_false
161
- c.hidden_origin.should be_nil
139
+ refute c.visible?
140
+ c.hidden_origin.must_equal piece.id
162
141
  end
142
+ else
143
+ refute c.hidden?
144
+ c.hidden_origin.must_be_nil
163
145
  end
164
- f.destroy
165
146
  end
147
+ f.destroy
148
+ end
166
149
 
167
- should "re-show all descendents of page content" do
168
- piece = Content.first(:uid => "0.0")
169
- piece.hide!
170
- piece.show!
171
- Content.all.each do |c|
172
- c.visible?.should be_true
173
- c.hidden_origin.should be_nil
174
- end
150
+ it "re-show all descendents of page content" do
151
+ piece = Content.first(:uid => "0.0")
152
+ piece.hide!
153
+ piece.show!
154
+ Content.all.each do |c|
155
+ assert c.visible?
156
+ c.hidden_origin.must_be_nil
175
157
  end
158
+ end
176
159
 
177
- should "know if something is hidden because its ancestor is hidden" do
178
- piece = Content.first(:uid => "0.0")
179
- piece.hide!
180
- piece.showable?.should be_true
181
- child = Content.first(:uid => "0.0.0.0")
182
- child.visible?.should be_false
183
- child.showable?.should be_false
184
- end
160
+ it "know if something is hidden because its ancestor is hidden" do
161
+ piece = Content.first(:uid => "0.0")
162
+ piece.hide!
163
+ assert piece.showable?
164
+ child = Content.first(:uid => "0.0.0.0")
165
+ refute child.visible?
166
+ refute child.showable?
167
+ end
185
168
 
186
- # showing something that is hidden because its ancestor is hidden shouldn't be possible
187
- should "stop hidden child content from being hidden" do
188
- piece = Content.first(:uid => "0.0")
189
- piece.hide!
190
- child = Content.first(:uid => "0.0.0.0")
191
- child.visible?.should be_false
192
- lambda { child.show! }.must_raise(Spontaneous::NotShowable)
193
- end
169
+ # showing something that is hidden because its ancestor is hidden shouldn't be possible
170
+ it "stop hidden child content from being hidden" do
171
+ piece = Content.first(:uid => "0.0")
172
+ piece.hide!
173
+ child = Content.first(:uid => "0.0.0.0")
174
+ refute child.visible?
175
+ lambda { child.show! }.must_raise(Spontaneous::NotShowable)
176
+ end
194
177
 
195
- should "not reveal child content that was hidden before its parent" do
196
- piece1 = Content.first(:uid => "0.0.0.0")
197
- piece2 = Content.first(:uid => "0.0.0.1")
198
- parent = Content.first(:uid => "0.0.0")
199
- piece1.owner.should == parent
200
- piece2.owner.should == parent
201
- piece1.container.should == parent.things
202
- piece2.container.should == parent.things
203
- piece1.hide!
204
- parent.hide!
205
- parent.reload.visible?.should be_false
206
- piece1.reload.visible?.should be_false
207
- piece2.reload.visible?.should be_false
208
- piece1.hidden_origin.should be_blank
209
- piece2.hidden_origin.should == parent.id
210
- parent.show!
211
- parent.reload.visible?.should be_true
212
- piece2.reload.visible?.should be_true
213
- piece1.reload.visible?.should be_false
214
- end
178
+ it "not reveal child content that was hidden before its parent" do
179
+ piece1 = Content.first(:uid => "0.0.0.0")
180
+ piece2 = Content.first(:uid => "0.0.0.1")
181
+ parent = Content.first(:uid => "0.0.0")
182
+ piece1.owner.must_equal parent
183
+ piece2.owner.must_equal parent
184
+ piece1.container.must_equal parent.things
185
+ piece2.container.must_equal parent.things
186
+ piece1.hide!
187
+ parent.hide!
188
+ refute parent.reload.visible?
189
+ refute piece1.reload.visible?
190
+ refute piece2.reload.visible?
191
+ piece1.hidden_origin.must_be :blank?
192
+ piece2.hidden_origin.must_equal parent.id
193
+ parent.show!
194
+ assert parent.reload.visible?
195
+ assert piece2.reload.visible?
196
+ refute piece1.reload.visible?
197
+ end
215
198
 
216
199
 
217
- should "add child content with a visibility inherited from their parent" do
218
- page = P.first
219
- page.hide!
220
- page.reload
221
- piece = E.new
222
- page.things << piece
223
- page.save
224
- piece.reload
225
- piece.hidden?.should be_true
226
- page.show!
227
- piece.reload.hidden?.should be_false
228
- piece.destroy
229
- end
200
+ it "add child content with a visibility inherited from their parent" do
201
+ page = P.first
202
+ page.hide!
203
+ page.reload
204
+ piece = E.new
205
+ page.things << piece
206
+ page.save
207
+ piece.reload
208
+ assert piece.hidden?
209
+ page.show!
210
+ refute piece.reload.hidden?
211
+ piece.destroy
212
+ end
230
213
 
231
- context "root" do
232
- should "should not be hidable" do
233
- @root.is_root?.should be_true
234
- lambda { @root.visible = false }.must_raise(RuntimeError)
235
- lambda { @root.hide! }.must_raise(RuntimeError)
236
- @root.visible?.should be_true
237
- end
214
+ describe "root" do
215
+ it "should not be hidable" do
216
+ assert @root.is_root?
217
+ lambda { @root.visible = false }.must_raise(RuntimeError)
218
+ lambda { @root.hide! }.must_raise(RuntimeError)
219
+ assert @root.visible?
238
220
  end
221
+ end
239
222
 
240
- context "top-level searches" do
241
- should "return a list of visible pages" do
242
- @root.pages.first.hide!
243
- P.visible.count.should == 9
244
- end
223
+ describe "top-level searches" do
224
+ it "return a list of visible pages" do
225
+ @root.pages.first.hide!
226
+ P.visible.count.must_equal 9
245
227
  end
246
- context "visibility scoping" do
247
- should "prevent inclusion of hidden content" do
248
- @uid = '0'
249
- @page = Page.uid(@uid)
250
- @page.hide!
251
- @page.reload
252
- Page.path("/0").should == @page
253
- Content.with_visible do
254
- Content.visible_only?.should be_true
255
- Page.uid(@uid).should be_blank
256
- Page.path("/0").should be_blank
257
- Page.uid('0.0.0').should be_blank
258
- end
228
+ end
229
+ describe "visibility scoping" do
230
+ it "prevent inclusion of hidden content" do
231
+ @uid = '0'
232
+ @page = Page.uid(@uid)
233
+ @page.hide!
234
+ @page.reload
235
+ Page.path("/0").must_equal @page
236
+ Content.with_visible do
237
+ assert Content.visible_only?
238
+ Page.uid(@uid).must_be :blank?
239
+ Page.path("/0").must_be :blank?
240
+ Page.uid('0.0.0').must_be :blank?
259
241
  end
242
+ end
260
243
 
261
- should "only show visible pieces" do
262
- page = Content.first(:uid => "1")
263
- page.contents.length.should == 4
264
- page.things.contents.length.should == 4
265
- page.things.count.should == 4
266
- page.contents.first.hide!
267
- page.reload
268
- Content.with_visible do
269
- page.contents.length.should == 3
270
- page.contents.first.id.should_not == page.id
271
- page.contents.first.first?.should be_true
272
- end
244
+ it "only show visible pieces" do
245
+ page = Content.first(:uid => "1")
246
+ page.contents.length.must_equal 4
247
+ page.things.contents.length.must_equal 4
248
+ page.things.count.must_equal 4
249
+ page.contents.first.hide!
250
+ page.reload
251
+ Content.with_visible do
252
+ page.contents.length.must_equal 3
253
+ page.contents.first.id.wont_equal page.id
254
+ assert page.contents.first.first?
273
255
  end
256
+ end
274
257
 
275
- should "stop modification of pieces" do
276
- page = Content.first(:uid => "1")
277
- Content.with_visible do
278
- # would like to make sure we're raising a predictable error
279
- # but 1.9 changes the typeerror to a runtime error
280
- p = Piece.new
281
- lambda { page.things << p }.must_raise(TypeError, RuntimeError)
282
- p.destroy
283
- end
258
+ it "stop modification of pieces" do
259
+ page = Content.first(:uid => "1")
260
+ Content.with_visible do
261
+ # would like to make sure we're raising a predictable error
262
+ # but 1.9 changes the typeerror to a runtime error
263
+ p = Piece.new
264
+ lambda { page.things << p }.must_raise(TypeError, RuntimeError)
265
+ p.destroy
284
266
  end
267
+ end
285
268
 
286
- should "ensure that no hidden content can be returned" do
287
- @root.reload
288
- @root.children.first.children.length.should == 8
289
- @root.children.first.contents.first.hide!
290
- @root.reload
291
- Content.with_visible do
292
- @root.children.first.children.length.should == 6
293
- end
269
+ it "ensure that no hidden content can be returned" do
270
+ @root.reload
271
+ @root.children.first.children.length.must_equal 8
272
+ @root.children.first.contents.first.hide!
273
+ @root.reload
274
+ Content.with_visible do
275
+ @root.children.first.children.length.must_equal 6
294
276
  end
277
+ end
295
278
 
296
- should "hide pages without error" do
297
- @root.pages.first.hide!
298
- @root.reload
299
- Content.with_visible do
300
- pieces = @root.pages.contents.map { |p| p }
301
- end
279
+ it "hide pages without error" do
280
+ @root.pages.first.hide!
281
+ @root.reload
282
+ Content.with_visible do
283
+ pieces = @root.pages.contents.map { |p| p }
302
284
  end
303
285
  end
286
+ end
304
287
 
305
- context "aliases" do
306
- setup do
307
- end
288
+ describe "aliases" do
289
+ before do
290
+ end
308
291
 
309
- teardown do
310
- MyAlias.delete
311
- end
292
+ after do
293
+ MyAlias.delete
294
+ end
312
295
 
313
- should "be initalized as invisible if their target is invisible" do
314
- target = E.create(:uid => "X")
315
- target.destroy
316
- target.hide!
317
- al = MyAlias.create(:target => target)
318
- al.visible?.should be_false
319
- end
296
+ it "be initalized as invisible if their target is invisible" do
297
+ target = E.create(:uid => "X")
298
+ target.destroy
299
+ target.hide!
300
+ al = MyAlias.create(:target => target)
301
+ refute al.visible?
302
+ end
320
303
 
321
304
 
322
- should "be made visible along with their target if added when target is hidden" do
323
- target = E.first(:uid => "1.1")
324
- target.hide!
325
- al = MyAlias.create(:target => target)
326
- al.reload.visible?.should be_false
327
- target.show!
328
- al.reload.visible?.should be_true
329
- end
305
+ it "be made visible along with their target if added when target is hidden" do
306
+ target = E.first(:uid => "1.1")
307
+ target.hide!
308
+ al = MyAlias.create(:target => target)
309
+ refute al.reload.visible?
310
+ target.show!
311
+ assert al.reload.visible?
312
+ end
330
313
 
331
- should "be filtered by visibility when doing reverse lookup" do
332
- page = P.first(:uid => "1")
333
- target = E.first(:uid => "1.1")
334
- al1 = MyAlias.create(:target => target)
335
- page.things << al1
336
- al2 = MyAlias.create(:target => target).reload
337
- page.things << al2
338
- al1.hide!
339
- al1.reload
340
- al2.reload
341
- target.reload
342
- sort = proc { |e1, e2| e1.id <=> e2.id }
343
- al = target.aliases.sort(&sort)
344
- Set.new(target.aliases).should == Set.new([al1, al2])
345
- target.reload
346
- Content.with_visible do
347
- target.aliases.should == [al2]
348
- end
314
+ it "be filtered by visibility when doing reverse lookup" do
315
+ page = P.first(:uid => "1")
316
+ target = E.first(:uid => "1.1")
317
+ al1 = MyAlias.create(:target => target)
318
+ page.things << al1
319
+ al2 = MyAlias.create(:target => target).reload
320
+ page.things << al2
321
+ al1.hide!
322
+ al1.reload
323
+ al2.reload
324
+ target.reload
325
+ sort = proc { |e1, e2| e1.id <=> e2.id }
326
+ al = target.aliases.sort(&sort)
327
+ Set.new(target.aliases).must_equal Set.new([al1, al2])
328
+ target.reload
329
+ Content.with_visible do
330
+ target.aliases.must_equal [al2]
349
331
  end
332
+ end
350
333
 
351
- should "show as 'hidden' if their target is deleted" do
352
- parent = E.first(:uid => "1.1")
353
- target = P.new
354
- parent.pages << target
355
- parent.save
356
- al1 = MyAlias.create(:target => target)
357
- P.filter(:id => target.id).delete
358
- al1.reload.visible?.should be_false
359
- target.destroy
360
- end
334
+ it "show as 'hidden' if their target is deleted" do
335
+ parent = E.first(:uid => "1.1")
336
+ target = P.new
337
+ parent.pages << target
338
+ parent.save
339
+ al1 = MyAlias.create(:target => target)
340
+ P.filter(:id => target.id).delete
341
+ refute al1.reload.visible?
342
+ target.destroy
361
343
  end
362
344
  end
363
345
  end