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.
- checksums.yaml +7 -0
- data/.gitignore +24 -0
- data/.locat +42 -0
- data/.travis/gemfiles/Gemfile.empty +7 -0
- data/.travis.yml +18 -0
- data/Gemfile +12 -8
- data/LICENSE +1 -1
- data/Rakefile +15 -157
- data/Readme.markdown +1 -1
- data/application/css/core.css.scss +22 -146
- data/application/css/definitions.css.scss +7 -3
- data/application/css/dialogue.css.scss +26 -1
- data/application/css/editing.css.scss +70 -28
- data/application/css/font.css.scss +1 -1
- data/application/css/popover.css.scss +2 -0
- data/application/css/top.css.scss +231 -0
- data/application/js/add_alias_dialogue.js +1 -1
- data/application/js/add_home_dialogue.js +1 -1
- data/application/js/ajax.js +61 -31
- data/application/js/box.js +4 -4
- data/application/js/conflicted_field_dialogue.js +1 -1
- data/application/js/content.js +5 -5
- data/application/js/dom.js +5 -0
- data/application/js/edit_panel.js +1 -0
- data/application/js/editing.js +1 -1
- data/application/js/extensions.js +8 -0
- data/application/js/field/boolean.js +31 -0
- data/application/js/field/file.js +32 -4
- data/application/js/field/image.js +24 -9
- data/application/js/field/markdown.js +87 -59
- data/application/js/field/select.js +1 -1
- data/application/js/field/webvideo.js +6 -1
- data/application/js/init.js +2 -2
- data/application/js/jquery-selection-position.js +130 -0
- data/application/js/location.js +4 -25
- data/application/js/meta_view/user_admin.js +2 -2
- data/application/js/metadata.js +2 -2
- data/application/js/page_browser.js +1 -1
- data/application/js/panel/root_menu.js +0 -1
- data/application/js/popover.js +27 -12
- data/application/js/popover_view.js +20 -4
- data/application/js/preview.js +31 -16
- data/application/js/progress.js +22 -21
- data/application/js/publish.js +18 -7
- data/application/js/sharded_upload.js +9 -6
- data/application/js/spontaneous.js +3 -1
- data/application/js/top_bar.js +264 -173
- data/application/js/upload.js +12 -5
- data/application/js/upload_manager.js +4 -3
- data/application/js/user.js +1 -2
- data/application/js/views/box_view.js +1 -1
- data/application/js/views/page_view.js +16 -5
- data/application/js/views/piece_view.js +5 -4
- data/application/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf +0 -0
- data/application/views/index.erb +6 -14
- data/application/views/login.erb +6 -25
- data/application/views/schema_modification_error.html.erb +3 -7
- data/db/migrations/20130114120000_create_revision_tables.rb +2 -2
- data/db/migrations/20130813111009_increase_path_length.rb +14 -0
- data/gem-public_cert.pem +20 -0
- data/lib/spontaneous/asset/app_compiler.rb +44 -0
- data/lib/spontaneous/asset/environment.rb +225 -0
- data/lib/spontaneous/asset.rb +2 -67
- data/lib/spontaneous/box.rb +0 -1
- data/lib/spontaneous/capistrano/deploy.rb +2 -2
- data/lib/spontaneous/capistrano/sync.rb +1 -1
- data/lib/spontaneous/cli/init.rb +36 -13
- data/lib/spontaneous/cli/server.rb +0 -1
- data/lib/spontaneous/cli/site.rb +2 -1
- data/lib/spontaneous/cli.rb +3 -1
- data/lib/spontaneous/collections/entry_set.rb +4 -12
- data/lib/spontaneous/collections/hash_with_fallback.rb +20 -0
- data/lib/spontaneous/collections/prototype_set.rb +6 -5
- data/lib/spontaneous/crypt.rb +2 -2
- data/lib/spontaneous/data_mapper/content_model/associations.rb +115 -63
- data/lib/spontaneous/data_mapper.rb +1 -1
- data/lib/spontaneous/errors.rb +6 -0
- data/lib/spontaneous/extensions/object_space.rb +6 -0
- data/lib/spontaneous/facet.rb +1 -0
- data/lib/spontaneous/field/base.rb +86 -13
- data/lib/spontaneous/field/boolean.rb +65 -0
- data/lib/spontaneous/field/file.rb +17 -6
- data/lib/spontaneous/field/html.rb +13 -0
- data/lib/spontaneous/field/image/size.rb +76 -0
- data/lib/spontaneous/field/image.rb +99 -414
- data/lib/spontaneous/field/tags.rb +36 -0
- data/lib/spontaneous/field/update.rb +1 -1
- data/lib/spontaneous/field/webvideo/fallback.rb +41 -0
- data/lib/spontaneous/field/webvideo/vimeo.rb +113 -0
- data/lib/spontaneous/field/webvideo/vine.rb +94 -0
- data/lib/spontaneous/field/webvideo/youtube.rb +133 -0
- data/lib/spontaneous/field/webvideo.rb +100 -250
- data/lib/spontaneous/field.rb +1 -1
- data/lib/spontaneous/generators/site/Gemfile.tt +5 -14
- data/lib/spontaneous/generators/site/assets/README.md +20 -0
- data/lib/spontaneous/generators/site/assets/css/site.scss +8 -0
- data/lib/spontaneous/generators/site/assets/js/site.js +6 -0
- data/lib/spontaneous/generators/site/config/deploy.rb.tt +9 -0
- data/lib/spontaneous/generators/site/config/user_levels.yml +14 -3
- data/lib/spontaneous/generators/site/public/README.md +12 -0
- data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +2 -2
- data/lib/spontaneous/generators/site.rb +77 -35
- data/lib/spontaneous/layout.rb +6 -7
- data/lib/spontaneous/loader.rb +21 -13
- data/lib/spontaneous/media/file.rb +22 -9
- data/lib/spontaneous/media/image/attributes.rb +33 -0
- data/lib/spontaneous/media/image/format/gif.rb +4 -0
- data/lib/spontaneous/media/image/format/jpg.rb +17 -0
- data/lib/spontaneous/media/image/format/png.rb +4 -0
- data/lib/spontaneous/media/image/format/webp.rb +26 -0
- data/lib/spontaneous/media/image/format.rb +79 -0
- data/lib/spontaneous/media/image/optimizer.rb +69 -0
- data/lib/spontaneous/media/image/processor.rb +17 -0
- data/lib/spontaneous/media/image/renderable.rb +52 -0
- data/lib/spontaneous/media/image/skeptick.rb +70 -0
- data/lib/spontaneous/media/image.rb +50 -0
- data/lib/spontaneous/media/temp_file.rb +4 -0
- data/lib/spontaneous/media.rb +1 -0
- data/lib/spontaneous/model/core/aliases.rb +14 -8
- data/lib/spontaneous/model/core/boxes.rb +5 -2
- data/lib/spontaneous/model/core/entries.rb +4 -0
- data/lib/spontaneous/model/core/entry.rb +1 -0
- data/lib/spontaneous/model/core/fields.rb +5 -2
- data/lib/spontaneous/model/core/locks.rb +16 -0
- data/lib/spontaneous/model/core/media.rb +1 -15
- data/lib/spontaneous/model/core.rb +31 -1
- data/lib/spontaneous/model/page/controllers.rb +2 -2
- data/lib/spontaneous/model/page/formats.rb +1 -4
- data/lib/spontaneous/model/page/layouts.rb +6 -2
- data/lib/spontaneous/model/page/locks.rb +8 -2
- data/lib/spontaneous/model/page/page_tree.rb +2 -2
- data/lib/spontaneous/model/page/paths.rb +74 -9
- data/lib/spontaneous/model/page.rb +11 -3
- data/lib/spontaneous/model.rb +6 -6
- data/lib/spontaneous/output/context/render_cache.rb +23 -0
- data/lib/spontaneous/output/context.rb +56 -30
- data/lib/spontaneous/output/helpers/script_helper.rb +9 -53
- data/lib/spontaneous/output/helpers/stylesheet_helper.rb +8 -40
- data/lib/spontaneous/output/template/renderer.rb +17 -5
- data/lib/spontaneous/output.rb +0 -1
- data/lib/spontaneous/paths.rb +6 -2
- data/lib/spontaneous/permissions/access_key.rb +18 -0
- data/lib/spontaneous/permissions/user.rb +1 -1
- data/lib/spontaneous/permissions.rb +4 -1
- data/lib/spontaneous/plugins/application/state.rb +19 -12
- data/lib/spontaneous/prototypes/field_prototype.rb +14 -8
- data/lib/spontaneous/published_revision.rb +7 -0
- data/lib/spontaneous/publishing/immediate.rb +43 -34
- data/lib/spontaneous/publishing/revision.rb +9 -6
- data/lib/spontaneous/rack/asset_server.rb +20 -0
- data/lib/spontaneous/rack/back/alias.rb +46 -0
- data/lib/spontaneous/rack/back/application_assets.rb +28 -0
- data/lib/spontaneous/rack/back/base.rb +34 -0
- data/lib/spontaneous/rack/back/changes.rb +19 -0
- data/lib/spontaneous/rack/back/content.rb +54 -0
- data/lib/spontaneous/rack/back/events.rb +38 -0
- data/lib/spontaneous/rack/back/field.rb +37 -0
- data/lib/spontaneous/rack/back/file.rb +118 -0
- data/lib/spontaneous/rack/back/helpers.rb +71 -0
- data/lib/spontaneous/rack/back/index.rb +16 -0
- data/lib/spontaneous/rack/back/login.rb +47 -0
- data/lib/spontaneous/rack/back/map.rb +24 -0
- data/lib/spontaneous/rack/back/page.rb +46 -0
- data/lib/spontaneous/rack/back/preview.rb +43 -0
- data/lib/spontaneous/rack/back/schema.rb +30 -0
- data/lib/spontaneous/rack/back/site.rb +25 -0
- data/lib/spontaneous/rack/back/site_assets.rb +13 -0
- data/lib/spontaneous/rack/back/unsupported_browser.rb +7 -0
- data/lib/spontaneous/rack/{user_admin.rb → back/user_admin.rb} +2 -5
- data/lib/spontaneous/rack/back.rb +85 -764
- data/lib/spontaneous/rack/cacheable_file.rb +3 -3
- data/lib/spontaneous/rack/front.rb +16 -9
- data/lib/spontaneous/rack/middleware/authenticate.rb +65 -0
- data/lib/spontaneous/rack/middleware/csrf.rb +66 -0
- data/lib/spontaneous/rack/middleware/reloader.rb +52 -0
- data/lib/spontaneous/rack/middleware/scope.rb +60 -0
- data/lib/spontaneous/rack/middleware.rb +6 -0
- data/lib/spontaneous/rack/page_controller.rb +18 -5
- data/lib/spontaneous/rack/public.rb +17 -11
- data/lib/spontaneous/rack.rb +34 -24
- data/lib/spontaneous/revision.rb +29 -2
- data/lib/spontaneous/schema/uid.rb +4 -3
- data/lib/spontaneous/schema/uid_map.rb +5 -24
- data/lib/spontaneous/schema.rb +1 -0
- data/lib/spontaneous/search/database.rb +8 -0
- data/lib/spontaneous/search/field.rb +1 -1
- data/lib/spontaneous/search/index.rb +3 -5
- data/lib/spontaneous/server.rb +1 -1
- data/lib/spontaneous/simultaneous.rb +1 -1
- data/lib/spontaneous/site/features.rb +4 -5
- data/lib/spontaneous/site/helpers.rb +22 -5
- data/lib/spontaneous/site/instance.rb +2 -2
- data/lib/spontaneous/site/selectors.rb +22 -3
- data/lib/spontaneous/storage/cloud.rb +13 -9
- data/lib/spontaneous/storage/local.rb +11 -6
- data/lib/spontaneous/style.rb +40 -23
- data/lib/spontaneous/utils/database/mysql_dumper.rb +1 -1
- data/lib/spontaneous/utils/smush_it.rb +1 -1
- data/lib/spontaneous/version.rb +1 -1
- data/lib/spontaneous.rb +35 -33
- data/spontaneous.gemspec +53 -787
- data/test/experimental/test_crypt.rb +56 -56
- data/test/experimental/test_features.rb +16 -27
- data/test/fixtures/assets/public1/css/data.css.scss +3 -0
- data/test/fixtures/assets/public1/css/image1.css.scss +4 -0
- data/test/fixtures/assets/public1/css/import.css.scss +1 -0
- data/test/fixtures/assets/public1/css/urlhash.css.scss +3 -0
- data/test/fixtures/assets/public1/js/a.js +1 -1
- data/test/fixtures/assets/public1/js/all.js +4 -0
- data/test/fixtures/assets/public1/js/{m.coffee → m.js.coffee} +1 -0
- data/test/fixtures/assets/public1/x.js +1 -0
- data/test/fixtures/assets/public2/css/all.css +4 -0
- data/test/fixtures/assets/public2/css/missing.css.scss +3 -0
- data/test/fixtures/assets/public2/i/y.png +0 -0
- data/test/fixtures/assets/public2/js/b.js +1 -1
- data/test/fixtures/assets/public2/js/c.js +1 -1
- data/test/fixtures/images/size.extended.webp +0 -0
- data/test/fixtures/images/size.lossless.webp +0 -0
- data/test/fixtures/images/size.lossy.webp +0 -0
- data/test/fixtures/schema/before.yml +4 -4
- data/test/fixtures/schema/schema.yml +1 -1
- data/test/fixtures/templates/aliases/aaa.html.cut +0 -0
- data/test/fixtures/templates/extended/partial_with_renderer.html.cut +1 -0
- data/test/fixtures/templates/extended/with_includes_and_renderer.html.cut +2 -0
- data/test/functional/test_application.rb +108 -106
- data/test/functional/test_back.rb +924 -930
- data/test/functional/test_front.rb +285 -238
- data/test/functional/test_user_manager.rb +75 -100
- data/test/integration/test_installation.rb +1 -1
- data/test/support/matchers.rb +12 -0
- data/test/support/minitest.rb +121 -0
- data/test/support/rack.rb +45 -0
- data/test/support/test_start_finish.rb +103 -0
- data/test/test_helper.rb +21 -68
- data/test/test_integration_helper.rb +1 -3
- data/test/unit/test_alias.rb +432 -408
- data/test/unit/test_asset_bundler.rb +58 -58
- data/test/unit/test_assets.rb +485 -155
- data/test/unit/test_async.rb +16 -37
- data/test/unit/test_authentication.rb +425 -457
- data/test/unit/test_boxes.rb +191 -191
- data/test/unit/test_changesets.rb +244 -254
- data/test/unit/test_config.rb +128 -142
- data/test/unit/test_content.rb +313 -359
- data/test/unit/test_content_inheritance.rb +29 -30
- data/test/unit/test_datamapper.rb +1205 -1080
- data/test/unit/test_datamapper_content.rb +49 -51
- data/test/unit/test_extensions.rb +23 -23
- data/test/unit/test_fields.rb +1488 -1180
- data/test/unit/test_formats.rb +158 -158
- data/test/unit/test_generators.rb +98 -40
- data/test/unit/test_helpers.rb +73 -76
- data/test/unit/test_image_size.rb +53 -22
- data/test/unit/test_images.rb +164 -165
- data/test/unit/test_layouts.rb +133 -122
- data/test/unit/test_logger.rb +14 -17
- data/test/unit/test_media.rb +69 -84
- data/test/unit/test_modifications.rb +513 -525
- data/test/unit/test_page.rb +462 -361
- data/test/unit/test_permissions.rb +379 -364
- data/test/unit/test_piece.rb +67 -75
- data/test/unit/test_plugins.rb +82 -89
- data/test/unit/test_prototype_set.rb +215 -216
- data/test/unit/test_prototypes.rb +114 -124
- data/test/unit/test_publishing.rb +252 -289
- data/test/unit/test_render.rb +167 -115
- data/test/unit/test_revisions.rb +436 -444
- data/test/unit/test_schema.rb +339 -309
- data/test/unit/test_search.rb +577 -574
- data/test/unit/test_serialisation.rb +136 -147
- data/test/unit/test_site.rb +252 -227
- data/test/unit/test_skeptick.rb +130 -0
- data/test/unit/test_storage.rb +46 -40
- data/test/unit/test_structure.rb +57 -66
- data/test/unit/test_styles.rb +104 -104
- data/test/unit/test_templates.rb +72 -57
- data/test/unit/test_type_hierarchy.rb +15 -16
- data/test/unit/test_visibility.rb +239 -257
- metadata +455 -326
- data/application/js/vendor/JS.Class-2.1.5/CHANGELOG +0 -283
- data/application/js/vendor/JS.Class-2.1.5/MIT-LICENSE +0 -30
- data/application/js/vendor/JS.Class-2.1.5/README +0 -30
- data/application/js/vendor/JS.Class-2.1.5/min/command.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/comparable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/constant_scope.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/decorator.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/enumerable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/forwardable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/hash.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/linked_list.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/loader.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/method_chain.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/observable.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/package.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/proxy.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/ruby.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/set.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/stack_trace.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/state.js +0 -1
- data/application/js/vendor/JS.Class-2.1.5/min/stdlib.js +0 -16
- data/application/js/vendor/jquery-1.6.2.min.js +0 -18
- data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +0 -791
- data/application/js/vendor/jquery-ui-1.8.9.custom.min.js +0 -415
- data/application/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf +0 -0
- data/application/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png +0 -0
- data/bin/limit-upload +0 -5
- data/bin/unlimit-upload +0 -3
- data/lib/spontaneous/asset/file.rb +0 -25
- data/lib/spontaneous/asset/source.rb +0 -28
- data/lib/spontaneous/image_size.rb +0 -123
- data/lib/spontaneous/output/assets/compression.rb +0 -58
- data/lib/spontaneous/output/assets.rb +0 -32
- data/lib/spontaneous/rack/around_back.rb +0 -20
- data/lib/spontaneous/rack/around_front.rb +0 -27
- data/lib/spontaneous/rack/around_preview.rb +0 -22
- data/lib/spontaneous/rack/assets.rb +0 -126
- data/lib/spontaneous/rack/authentication.rb +0 -20
- data/lib/spontaneous/rack/cookie_authentication.rb +0 -38
- data/lib/spontaneous/rack/helpers.rb +0 -52
- data/lib/spontaneous/rack/http.rb +0 -18
- data/lib/spontaneous/rack/media.rb +0 -30
- data/lib/spontaneous/rack/query_authentication.rb +0 -35
- data/lib/spontaneous/rack/reloader.rb +0 -45
- data/lib/spontaneous/rack/user_helpers.rb +0 -28
- /data/{README → application/js/field/markdown/text_command.js} +0 -0
- /data/application/js/vendor/{JS.Class-2.1.5/min/core.js → js.class-2.1.5.min.js} +0 -0
- /data/test/fixtures/assets/public1/css/{a.scss → a.css.scss} +0 -0
- /data/{lib/spontaneous/generators/site/public/css/site.scss → test/fixtures/assets/public1/x.css} +0 -0
- /data/{lib/spontaneous/generators/site/public/js/.empty_directory → test/fixtures/assets/public1/x.png} +0 -0
- /data/test/fixtures/assets/public2/css/{b.scss → b.css.scss} +0 -0
- /data/test/fixtures/assets/public2/js/{n.coffee → n.js.coffee} +0 -0
- /data/test/fixtures/back/{public → assets}/css/sass_include.scss +0 -0
- /data/test/fixtures/back/{public → assets}/css/sass_template.scss +0 -0
- /data/test/fixtures/back/{public → assets}/js/coffeescript.coffee +0 -0
- /data/{lib/spontaneous/generators/site/public/js/site.js → test/fixtures/templates/aliases/aa_alias.html.cut} +0 -0
data/test/unit/test_content.rb
CHANGED
@@ -3,377 +3,331 @@
|
|
3
3
|
require File.expand_path('../../test_helper', __FILE__)
|
4
4
|
|
5
5
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
6
|
+
describe "Content" do
|
7
|
+
before do
|
8
|
+
@site = setup_site
|
9
|
+
class C < ::Piece; end
|
10
|
+
class P < ::Page; end
|
11
|
+
|
12
|
+
C.box :things
|
13
|
+
P.box :box1
|
14
|
+
P.box :box2
|
15
|
+
end
|
16
|
+
|
17
|
+
after do
|
18
|
+
Object.send(:remove_const, :C) rescue nil
|
19
|
+
Object.send(:remove_const, :P) rescue nil
|
20
|
+
teardown_site
|
21
|
+
end
|
22
|
+
|
23
|
+
describe "Content instances" do
|
24
|
+
it "evaluate instance code" do
|
25
|
+
@instance = C.create({
|
26
|
+
:instance_code => "def monkey; 'magic'; end"
|
27
|
+
})
|
28
|
+
@instance.monkey.must_equal 'magic'
|
29
|
+
id = @instance.id
|
30
|
+
@instance = ::Content[id]
|
31
|
+
@instance.monkey.must_equal 'magic'
|
32
|
+
end
|
33
|
+
end
|
34
|
+
describe "pieces" do
|
35
|
+
before do
|
36
|
+
@instance = C.new
|
37
|
+
end
|
38
|
+
|
39
|
+
after do
|
40
|
+
::Content.delete rescue nil
|
41
|
+
end
|
42
|
+
|
43
|
+
it "be initialised empty" do
|
44
|
+
@instance.contents.to_a.must_equal []
|
45
|
+
end
|
46
|
+
|
47
|
+
it "provide a #target method poiting to itself" do
|
48
|
+
@instance.target.must_equal @instance
|
49
|
+
end
|
50
|
+
|
51
|
+
it "accept addition of child content" do
|
52
|
+
e = C.new
|
53
|
+
@instance.things << e
|
54
|
+
@instance.contents.length.must_equal 1
|
55
|
+
@instance.things.contents.length.must_equal 1
|
56
|
+
@instance.contents.first.must_equal e
|
57
|
+
@instance.contents.first.container.must_equal @instance.things
|
58
|
+
@instance.contents.first.owner.must_equal @instance
|
59
|
+
@instance.contents.first.parent.must_equal @instance
|
60
|
+
e.visibility_path.must_equal "#{@instance.id}"
|
61
|
+
@instance.contents.first.visibility_path.must_equal "#{@instance.id}"
|
62
|
+
end
|
63
|
+
|
64
|
+
it "accept addition of multiple children" do
|
65
|
+
e = C.new
|
66
|
+
f = C.new
|
67
|
+
@instance.things << e
|
68
|
+
@instance.things << f
|
69
|
+
@instance.contents.length.must_equal 2
|
70
|
+
@instance.things.contents.length.must_equal 2
|
71
|
+
@instance.contents.first.must_equal e
|
72
|
+
@instance.things.contents.first.must_equal e
|
73
|
+
@instance.contents.last.must_equal f
|
74
|
+
@instance.things.contents.last.must_equal f
|
75
|
+
@instance.contents.first.container.must_equal @instance.things
|
76
|
+
@instance.contents.last.container.must_equal @instance.things
|
77
|
+
@instance.contents.first.parent.must_equal @instance
|
78
|
+
@instance.contents.last.parent.must_equal @instance
|
79
|
+
@instance.contents.first.owner.must_equal @instance
|
80
|
+
@instance.contents.last.owner.must_equal @instance
|
81
|
+
@instance.contents.first.visibility_path.must_equal "#{@instance.id}"
|
82
|
+
@instance.contents.last.visibility_path.must_equal "#{@instance.id}"
|
83
|
+
end
|
84
|
+
|
85
|
+
it "allow for a deep hierarchy" do
|
86
|
+
e = C.new
|
87
|
+
f = C.new
|
88
|
+
@instance.things << e
|
89
|
+
e.things << f
|
90
|
+
@instance.contents.length.must_equal 1
|
91
|
+
@instance.contents.first.must_equal e
|
92
|
+
e.owner.id.must_equal @instance.id
|
93
|
+
e.parent.id.must_equal @instance.id
|
94
|
+
e.container.must_equal @instance.things
|
95
|
+
e.visibility_path.must_equal "#{@instance.id}"
|
96
|
+
|
97
|
+
f.owner.id.must_equal e.id
|
98
|
+
f.parent.id.must_equal e.id
|
99
|
+
f.container.must_equal e.things
|
100
|
+
f.visibility_path.must_equal "#{@instance.id}.#{e.id}"
|
101
|
+
end
|
102
|
+
|
103
|
+
it "persist hierarchy" do
|
104
|
+
e = C.new
|
105
|
+
f = C.new
|
106
|
+
e.things << f
|
107
|
+
@instance.things << e
|
108
|
+
@instance.save
|
109
|
+
e.save
|
110
|
+
f.save
|
111
|
+
|
112
|
+
i = C[@instance.id]
|
113
|
+
e = C[e.id]
|
114
|
+
f = C[f.id]
|
115
|
+
|
116
|
+
i.contents.length.must_equal 1
|
117
|
+
i.contents.first.must_equal e
|
118
|
+
|
119
|
+
e.container.must_equal i.things
|
120
|
+
e.owner.must_equal i
|
121
|
+
e.parent.must_equal i
|
122
|
+
f.container.must_equal e.things
|
123
|
+
f.parent.must_equal e
|
124
|
+
f.owner.must_equal e
|
125
|
+
e.entry.must_equal i.contents.first
|
126
|
+
f.entry.must_equal e.contents.first
|
127
|
+
e.contents.first.must_equal f
|
128
|
+
end
|
129
|
+
|
130
|
+
it "have a list of child nodes" do
|
131
|
+
e = C.new
|
132
|
+
f = C.new
|
133
|
+
e.things << f
|
134
|
+
@instance.things << e
|
135
|
+
@instance.save
|
136
|
+
e.save
|
137
|
+
f.save
|
138
|
+
|
139
|
+
i = C[@instance.id]
|
140
|
+
e = C[e.id]
|
141
|
+
f = C[f.id]
|
142
|
+
i.contents.to_a.must_equal [e]
|
143
|
+
e.contents.to_a.must_equal [f]
|
144
|
+
end
|
145
|
+
|
146
|
+
it "provide a list of non-page contents" do
|
147
|
+
p = P.new
|
148
|
+
|
149
|
+
c1 = C.new
|
150
|
+
c2 = C.new
|
151
|
+
c3 = C.new
|
152
|
+
p1 = P.new
|
153
|
+
p2 = P.new
|
154
|
+
p3 = P.new
|
155
|
+
|
156
|
+
p.box1 << c1
|
157
|
+
p.box1 << c2
|
158
|
+
p.box1 << p1
|
159
|
+
|
160
|
+
p.box2 << p3
|
161
|
+
p.box2 << c3
|
162
|
+
|
163
|
+
[p, c1, c2, c3, p1, p2, p3].each { |c| c.save; c.reload }
|
164
|
+
|
165
|
+
p = P[p.id]
|
166
|
+
|
167
|
+
p.pieces.must_equal [c1, c2, c3]
|
168
|
+
end
|
169
|
+
|
170
|
+
|
171
|
+
it "allow for testing of position" do
|
172
|
+
e = C.new
|
173
|
+
f = C.new
|
174
|
+
g = C.new
|
175
|
+
@instance.things << e
|
176
|
+
@instance.things << f
|
177
|
+
@instance.things << g
|
178
|
+
assert e.first?
|
179
|
+
refute f.first?
|
180
|
+
refute g.first?
|
181
|
+
refute e.last?
|
182
|
+
refute f.last?
|
183
|
+
assert g.last?
|
184
|
+
end
|
185
|
+
|
186
|
+
it "know their next neighbour" do
|
187
|
+
e = C.new
|
188
|
+
f = C.new
|
189
|
+
g = C.new
|
190
|
+
@instance.things << e
|
191
|
+
@instance.things << f
|
192
|
+
@instance.things << g
|
193
|
+
e.next.must_equal f
|
194
|
+
f.next.must_equal g
|
195
|
+
g.next.must_be_nil
|
196
|
+
end
|
197
|
+
|
198
|
+
it "know their previous neighbour" do
|
199
|
+
e = C.new
|
200
|
+
f = C.new
|
201
|
+
g = C.new
|
202
|
+
@instance.things << e
|
203
|
+
@instance.things << f
|
204
|
+
@instance.things << g
|
205
|
+
e.previous.must_be_nil
|
206
|
+
f.previous.must_equal e
|
207
|
+
g.previous.must_equal f
|
208
|
+
g.prev.must_equal f
|
209
|
+
end
|
210
|
+
|
211
|
+
it "record the depth of the nodes" do
|
212
|
+
a = C.new
|
213
|
+
b = C.new
|
214
|
+
c = C.new
|
215
|
+
|
216
|
+
a.depth.must_equal 0
|
217
|
+
b.depth.must_equal 0
|
218
|
+
c.depth.must_equal 0
|
219
|
+
|
220
|
+
a.things << b
|
221
|
+
b.things << c
|
222
|
+
|
223
|
+
b.depth.must_equal 1
|
224
|
+
c.depth.must_equal 2
|
17
225
|
end
|
18
226
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
227
|
+
|
228
|
+
end
|
229
|
+
describe "Deletion" do
|
230
|
+
before do
|
231
|
+
C.delete
|
232
|
+
@a = C.new(:label => 'a')
|
233
|
+
@b = C.new(:label => 'b')
|
234
|
+
@c = C.new(:label => 'c')
|
235
|
+
@d = C.new(:label => 'd')
|
236
|
+
@a.things << @b
|
237
|
+
@a.things << @d
|
238
|
+
@b.things << @c
|
239
|
+
@a.save
|
240
|
+
@b.save
|
241
|
+
@c.save
|
242
|
+
@d.save
|
243
|
+
@a = C[@a.id]
|
244
|
+
@b = C[@b.id]
|
245
|
+
@c = C[@c.id]
|
246
|
+
@d = C[@d.id]
|
247
|
+
C.count.must_equal 4
|
248
|
+
@ids = [@a, @b, @c, @d].map {|c| c.id }
|
249
|
+
end
|
250
|
+
it "recurse all the way" do
|
251
|
+
@a.destroy
|
252
|
+
C.count.must_equal 0
|
23
253
|
end
|
24
254
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
@instance = ::Content[id]
|
33
|
-
@instance.monkey.should == 'magic'
|
34
|
-
end
|
255
|
+
it "recurse" do
|
256
|
+
@b.destroy
|
257
|
+
C.count.must_equal 2
|
258
|
+
@a.reload
|
259
|
+
@a.contents.length.must_equal 1
|
260
|
+
@a.contents.first.must_equal @d.reload
|
261
|
+
C.all.map { |c| c.id }.sort.must_equal [@a, @d].map { |c| c.id }.sort
|
35
262
|
end
|
36
|
-
context "pieces" do
|
37
|
-
setup do
|
38
|
-
@instance = C.new
|
39
|
-
end
|
40
|
-
|
41
|
-
teardown do
|
42
|
-
::Content.delete rescue nil
|
43
|
-
end
|
44
|
-
|
45
|
-
should "be initialised empty" do
|
46
|
-
@instance.contents.should == []
|
47
|
-
end
|
48
|
-
|
49
|
-
should "provide a #target method poiting to itself" do
|
50
|
-
@instance.target.should == @instance
|
51
|
-
end
|
52
|
-
|
53
|
-
should "accept addition of child content" do
|
54
|
-
e = C.new
|
55
|
-
@instance.things << e
|
56
|
-
@instance.contents.length.should == 1
|
57
|
-
@instance.things.contents.length.should == 1
|
58
|
-
@instance.contents.first.should == e
|
59
|
-
@instance.contents.first.container.should == @instance.things
|
60
|
-
@instance.contents.first.owner.should == @instance
|
61
|
-
@instance.contents.first.parent.should == @instance
|
62
|
-
e.visibility_path.should == "#{@instance.id}"
|
63
|
-
@instance.contents.first.visibility_path.should == "#{@instance.id}"
|
64
|
-
end
|
65
|
-
|
66
|
-
should "accept addition of multiple children" do
|
67
|
-
e = C.new
|
68
|
-
f = C.new
|
69
|
-
@instance.things << e
|
70
|
-
@instance.things << f
|
71
|
-
@instance.contents.length.should == 2
|
72
|
-
@instance.things.contents.length.should == 2
|
73
|
-
@instance.contents.first.should == e
|
74
|
-
@instance.things.contents.first.should == e
|
75
|
-
@instance.contents.last.should == f
|
76
|
-
@instance.things.contents.last.should == f
|
77
|
-
@instance.contents.first.container.should == @instance.things
|
78
|
-
@instance.contents.last.container.should == @instance.things
|
79
|
-
@instance.contents.first.parent.should == @instance
|
80
|
-
@instance.contents.last.parent.should == @instance
|
81
|
-
@instance.contents.first.owner.should == @instance
|
82
|
-
@instance.contents.last.owner.should == @instance
|
83
|
-
@instance.contents.first.visibility_path.should == "#{@instance.id}"
|
84
|
-
@instance.contents.last.visibility_path.should == "#{@instance.id}"
|
85
|
-
end
|
86
|
-
|
87
|
-
should "allow for a deep hierarchy" do
|
88
|
-
e = C.new
|
89
|
-
f = C.new
|
90
|
-
@instance.things << e
|
91
|
-
e.things << f
|
92
|
-
@instance.contents.length.should == 1
|
93
|
-
@instance.contents.first.should == e
|
94
|
-
e.owner.id.should == @instance.id
|
95
|
-
e.parent.id.should == @instance.id
|
96
|
-
e.container.should == @instance.things
|
97
|
-
e.visibility_path.should == "#{@instance.id}"
|
98
|
-
|
99
|
-
f.owner.id.should == e.id
|
100
|
-
f.parent.id.should == e.id
|
101
|
-
f.container.should == e.things
|
102
|
-
f.visibility_path.should == "#{@instance.id}.#{e.id}"
|
103
|
-
end
|
104
|
-
|
105
|
-
should "persist hierarchy" do
|
106
|
-
e = C.new
|
107
|
-
f = C.new
|
108
|
-
e.things << f
|
109
|
-
@instance.things << e
|
110
|
-
@instance.save
|
111
|
-
e.save
|
112
|
-
f.save
|
113
|
-
|
114
|
-
i = C[@instance.id]
|
115
|
-
e = C[e.id]
|
116
|
-
f = C[f.id]
|
117
|
-
|
118
|
-
i.contents.length.should == 1
|
119
|
-
i.contents.first.should == e
|
120
|
-
|
121
|
-
e.container.should == i.things
|
122
|
-
e.owner.should == i
|
123
|
-
e.parent.should == i
|
124
|
-
f.container.should == e.things
|
125
|
-
f.parent.should == e
|
126
|
-
f.owner.should == e
|
127
|
-
e.entry.should == i.contents.first
|
128
|
-
f.entry.should == e.contents.first
|
129
|
-
e.contents.first.should == f
|
130
|
-
end
|
131
|
-
|
132
|
-
should "have a list of child nodes" do
|
133
|
-
e = C.new
|
134
|
-
f = C.new
|
135
|
-
e.things << f
|
136
|
-
@instance.things << e
|
137
|
-
@instance.save
|
138
|
-
e.save
|
139
|
-
f.save
|
140
|
-
|
141
|
-
i = C[@instance.id]
|
142
|
-
e = C[e.id]
|
143
|
-
f = C[f.id]
|
144
|
-
i.contents.should == [e]
|
145
|
-
e.contents.should == [f]
|
146
|
-
end
|
147
|
-
|
148
|
-
should "provide a list of non-page contents" do
|
149
|
-
p = P.new
|
150
|
-
|
151
|
-
c1 = C.new
|
152
|
-
c2 = C.new
|
153
|
-
c3 = C.new
|
154
|
-
p1 = P.new
|
155
|
-
p2 = P.new
|
156
|
-
p3 = P.new
|
157
|
-
|
158
|
-
p.box1 << c1
|
159
|
-
p.box1 << c2
|
160
|
-
p.box1 << p1
|
161
|
-
|
162
|
-
p.box2 << p3
|
163
|
-
p.box2 << c3
|
164
|
-
|
165
|
-
[p, c1, c2, c3, p1, p2, p3].each { |c| c.save; c.reload }
|
166
|
-
|
167
|
-
p = P[p.id]
|
168
|
-
|
169
|
-
p.pieces.should == [c1, c2, c3]
|
170
|
-
end
|
171
|
-
|
172
|
-
|
173
|
-
should "allow for testing of position" do
|
174
|
-
e = C.new
|
175
|
-
f = C.new
|
176
|
-
g = C.new
|
177
|
-
@instance.things << e
|
178
|
-
@instance.things << f
|
179
|
-
@instance.things << g
|
180
|
-
e.first?.should be_true
|
181
|
-
f.first?.should be_false
|
182
|
-
g.first?.should be_false
|
183
|
-
e.last?.should be_false
|
184
|
-
f.last?.should be_false
|
185
|
-
g.last?.should be_true
|
186
|
-
end
|
187
|
-
|
188
|
-
should "know their next neighbour" do
|
189
|
-
e = C.new
|
190
|
-
f = C.new
|
191
|
-
g = C.new
|
192
|
-
@instance.things << e
|
193
|
-
@instance.things << f
|
194
|
-
@instance.things << g
|
195
|
-
e.next.should == f
|
196
|
-
f.next.should == g
|
197
|
-
g.next.should be_nil
|
198
|
-
end
|
199
|
-
|
200
|
-
should "know their previous neighbour" do
|
201
|
-
e = C.new
|
202
|
-
f = C.new
|
203
|
-
g = C.new
|
204
|
-
@instance.things << e
|
205
|
-
@instance.things << f
|
206
|
-
@instance.things << g
|
207
|
-
e.previous.should be_nil
|
208
|
-
f.previous.should == e
|
209
|
-
g.previous.should == f
|
210
|
-
g.prev.should == f
|
211
|
-
end
|
212
|
-
|
213
|
-
should "record the depth of the nodes" do
|
214
|
-
a = C.new
|
215
|
-
b = C.new
|
216
|
-
c = C.new
|
217
|
-
|
218
|
-
a.depth.should == 0
|
219
|
-
b.depth.should == 0
|
220
|
-
c.depth.should == 0
|
221
|
-
|
222
|
-
a.things << b
|
223
|
-
b.things << c
|
224
|
-
|
225
|
-
b.depth.should == 1
|
226
|
-
c.depth.should == 2
|
227
|
-
end
|
228
263
|
|
264
|
+
it "work through pieces" do
|
265
|
+
@a.things.length.must_equal 2
|
266
|
+
@a.things.first.destroy
|
267
|
+
C.count.must_equal 2
|
268
|
+
@a.things.length.must_equal 1
|
269
|
+
end
|
270
|
+
end
|
271
|
+
|
272
|
+
describe "Moving" do
|
273
|
+
before do
|
274
|
+
C.delete
|
275
|
+
@r = C.new(:label => 'r')
|
276
|
+
@a = C.new(:label => 'a')
|
277
|
+
@b = C.new(:label => 'b')
|
278
|
+
@c = C.new(:label => 'c')
|
279
|
+
@d = C.new(:label => 'd')
|
280
|
+
@r.things << @a
|
281
|
+
@r.things << @c
|
282
|
+
@a.things << @b
|
283
|
+
@c.things << @d
|
284
|
+
[@r, @a, @b, @c, @d].each { |c| c.save; c.reload }
|
285
|
+
end
|
229
286
|
|
287
|
+
after do
|
288
|
+
C.delete
|
230
289
|
end
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
@d.save
|
245
|
-
@a = C[@a.id]
|
246
|
-
@b = C[@b.id]
|
247
|
-
@c = C[@c.id]
|
248
|
-
@d = C[@d.id]
|
249
|
-
C.count.should == 4
|
250
|
-
@ids = [@a, @b, @c, @d].map {|c| c.id }
|
251
|
-
end
|
252
|
-
should "recurse all the way" do
|
253
|
-
@a.destroy
|
254
|
-
C.count.should == 0
|
255
|
-
end
|
256
|
-
|
257
|
-
should "recurse" do
|
258
|
-
@b.destroy
|
259
|
-
C.count.should == 2
|
260
|
-
@a.reload
|
261
|
-
@a.contents.length.should == 1
|
262
|
-
@a.contents.first.should == @d.reload
|
263
|
-
C.all.map { |c| c.id }.sort.should == [@a, @d].map { |c| c.id }.sort
|
264
|
-
end
|
265
|
-
|
266
|
-
should "work through pieces" do
|
267
|
-
@a.things.length.should == 2
|
268
|
-
@a.things.first.destroy
|
269
|
-
C.count.should == 2
|
270
|
-
@a.things.length.should == 1
|
271
|
-
end
|
290
|
+
|
291
|
+
it "default to adding at the end" do
|
292
|
+
@b.parent.must_equal @a
|
293
|
+
@r.things.adopt(@b)
|
294
|
+
@b.reload
|
295
|
+
@r.reload
|
296
|
+
@b.parent.must_equal @r
|
297
|
+
@b.container.must_equal @r.things
|
298
|
+
@b.depth.must_equal 1
|
299
|
+
@a.reload
|
300
|
+
@a.things.count.must_equal 0
|
301
|
+
@r.reload
|
302
|
+
@r.things.last.must_equal @b
|
272
303
|
end
|
273
304
|
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
C.delete
|
291
|
-
end
|
292
|
-
|
293
|
-
should "default to adding at the end" do
|
294
|
-
@b.parent.should == @a
|
295
|
-
@r.things.adopt(@b)
|
296
|
-
@b.reload
|
297
|
-
@r.reload
|
298
|
-
@b.parent.should == @r
|
299
|
-
@b.container.should == @r.things
|
300
|
-
@b.depth.should == 1
|
301
|
-
@a.reload
|
302
|
-
@a.things.count.should == 0
|
303
|
-
@r.reload
|
304
|
-
@r.things.last.should == @b
|
305
|
-
end
|
306
|
-
|
307
|
-
should "allow for adding in any position" do
|
308
|
-
@b.parent.should == @a
|
309
|
-
@r.things.adopt(@b, 1)
|
310
|
-
@b.reload
|
311
|
-
@r.reload
|
312
|
-
@b.parent.should == @r
|
313
|
-
@b.container.should == @r.things
|
314
|
-
@b.depth.should == 1
|
315
|
-
@a.reload
|
316
|
-
@a.things.count.should == 0
|
317
|
-
@r.reload
|
318
|
-
@r.things[1].should == @b
|
319
|
-
@r.things.adopt(@d, 0)
|
320
|
-
@d.reload
|
321
|
-
@r.reload
|
322
|
-
@r.things[0].should == @d
|
323
|
-
end
|
324
|
-
|
325
|
-
should "re-set the visibility path" do
|
326
|
-
@r.things.adopt(@b)
|
327
|
-
@b.reload
|
328
|
-
@b.visibility_path.should == @r.id.to_s
|
329
|
-
end
|
330
|
-
|
331
|
-
should "ensure that child pages have their visibility paths updated" do
|
332
|
-
skip "Implement this"
|
333
|
-
end
|
305
|
+
it "allow for adding in any position" do
|
306
|
+
@b.parent.must_equal @a
|
307
|
+
@r.things.adopt(@b, 1)
|
308
|
+
@b.reload
|
309
|
+
@r.reload
|
310
|
+
@b.parent.must_equal @r
|
311
|
+
@b.container.must_equal @r.things
|
312
|
+
@b.depth.must_equal 1
|
313
|
+
@a.reload
|
314
|
+
@a.things.count.must_equal 0
|
315
|
+
@r.reload
|
316
|
+
@r.things[1].must_equal @b
|
317
|
+
@r.things.adopt(@d, 0)
|
318
|
+
@d.reload
|
319
|
+
@r.reload
|
320
|
+
@r.things[0].must_equal @d
|
334
321
|
end
|
335
322
|
|
323
|
+
it "re-set the visibility path" do
|
324
|
+
@r.things.adopt(@b)
|
325
|
+
@b.reload
|
326
|
+
@b.visibility_path.must_equal @r.id.to_s
|
327
|
+
end
|
336
328
|
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
# ::Content.delete
|
341
|
-
# ::Content.delete_all_revisions!
|
342
|
-
# class ::IdentitySubclass < C; end
|
343
|
-
# @c1 = C.create
|
344
|
-
# @c2 = C.create
|
345
|
-
# @i1 = IdentitySubclass.create
|
346
|
-
# @i2 = IdentitySubclass.create
|
347
|
-
# end
|
348
|
-
# teardown do
|
349
|
-
# Object.send(:remove_const, :IdentitySubclass) rescue nil
|
350
|
-
# # Content.delete
|
351
|
-
# # Content.delete_all_revisions!
|
352
|
-
# end
|
353
|
-
# should "work for Content" do
|
354
|
-
# Content.with_identity_map do
|
355
|
-
# Content[@c1.id].object_id.should == Content[@c1.id].object_id
|
356
|
-
# end
|
357
|
-
# end
|
358
|
-
|
359
|
-
# should "work for subclasses" do
|
360
|
-
# Content.with_identity_map do
|
361
|
-
# IdentitySubclass[@i1.id].object_id.should == IdentitySubclass[@i1.id].object_id
|
362
|
-
# end
|
363
|
-
# end
|
364
|
-
|
365
|
-
# should "return different objects for different revisions" do
|
366
|
-
# revision = 2
|
367
|
-
# a = b = nil
|
368
|
-
# Content.publish(revision)
|
369
|
-
# Content.with_identity_map do
|
370
|
-
# a = Content[@c1.id]
|
371
|
-
# Content.with_revision(revision) do
|
372
|
-
# b = Content[@c1.id]
|
373
|
-
# end
|
374
|
-
# a.object_id.should_not == b.object_id
|
375
|
-
# end
|
376
|
-
# end
|
377
|
-
# end
|
329
|
+
it "ensure that child pages have their visibility paths updated" do
|
330
|
+
skip "Implement this"
|
331
|
+
end
|
378
332
|
end
|
379
333
|
end
|