RubyGems - spontaneous - Versions diffs - 0.1.0.alpha1 → 0.2.0.alpha1 - Mend

spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (413) hide show

data/Gemfile +40 -35
data/LICENSE +20 -0
data/Rakefile +39 -42
data/Readme.markdown +155 -0
data/application/css/definitions.scss +3 -0
data/application/css/editing.scss +9 -4
data/application/css/min/565d4c25e82148acb01c45c8d675b37a08676d77.css +1 -0
data/application/css/min/84dbe894ea96eafd321c30823d630817bfc4b03b.css +1 -0
data/application/css/min/d1b54ff4847c613618267ca1c15658e2aee0a4e5.css +1 -0
data/application/css/v2.scss +144 -50
data/application/js/add_alias_dialogue.js +18 -8
data/application/js/ajax.js +1 -1
data/application/js/authentication.js +8 -1
data/application/js/box.js +37 -7
data/application/js/box_container.js +1 -1
data/application/js/compatibility.js +7 -0
data/application/js/content.js +7 -0
data/application/js/content_area.js +4 -0
data/application/js/edit_panel.js +44 -18
data/application/js/editing.js +12 -0
data/application/js/event_source.js +17 -0
data/application/js/extensions.js +2 -0
data/application/js/field_types/file_field.js +2 -1
data/application/js/field_types/image_field.js +35 -48
data/application/js/field_types/long_string_field.js +12 -0
data/application/js/field_types/markdown_field.js +2 -5
data/application/js/field_types/string_field.js +5 -1
data/application/js/field_types/webvideo_field.js +15 -0
data/application/js/init.js +1 -0
data/application/js/location.js +30 -19
data/application/js/login.js +1 -2
data/application/js/min/2a0c2962537a3181fedfff5c92596ba6d3122dc9.js +3 -0
data/application/js/min/4cf1c493d3379ecba5287758c61238034c0893f9.js +2 -0
data/application/js/min/78ac6b99d96750bb6b9f9aad4cb9cd91cd03f391.js +3 -0
data/application/js/min/c8efb9b9f7c3f6613fcebc6be60f605b6570a382.js +90 -0
data/application/js/page.js +1 -0
data/application/js/page_entry.js +6 -40
data/application/js/preview.js +2 -3
data/application/js/top_bar.js +76 -31
data/application/js/upload.js +5 -2
data/application/js/upload_manager.js +2 -81
data/application/js/vendor/jquery-1.7.1.min.js +4 -0
data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +791 -0
data/application/js/views.js +3 -3
data/application/js/views/box_view.js +164 -83
data/application/js/views/page_piece_view.js +2 -2
data/application/js/views/page_view.js +46 -15
data/application/js/views/piece_view.js +29 -8
data/application/static/diagonal-texture.png +0 -0
data/application/static/item-buttons-highlight.png +0 -0
data/application/static/plus-box.png +0 -0
data/application/static/plus_alt.svg +8 -0
data/application/static/slot-up-arrow.png +0 -0
data/application/views/{index.erubis → index.erb} +9 -5
data/application/views/{login.erubis → login.erb} +14 -10
data/application/views/schema_modification_error.html.erb +18 -6
data/application/views/{unsupported.erubis → unsupported.erb} +0 -0
data/bin/spot +15 -2
data/db/migrations/20100610142136_init.rb +2 -2
data/db/migrations/20101130104334_timestamps.rb +2 -2
data/db/migrations/20110209152710_users_and_groups.rb +11 -11
data/db/migrations/20120106171423_visibility_path.rb +19 -0
data/db/migrations/20120107124541_owner_id.rb +19 -0
data/docs/recipe-interface-screenshot.png +0 -0
data/lib/cutaneous.rb +11 -10
data/lib/cutaneous/context_helper.rb +119 -14
data/lib/cutaneous/preview_context.rb +4 -3
data/lib/cutaneous/preview_renderer.rb +1 -6
data/lib/cutaneous/publish_context.rb +1 -0
data/lib/cutaneous/{first_pass_renderer.rb → publish_renderer.rb} +2 -6
data/lib/cutaneous/publish_template.rb +62 -0
data/lib/cutaneous/publish_token_parser.rb +8 -0
data/lib/cutaneous/renderer.rb +4 -2
data/lib/cutaneous/request_context.rb +1 -0
data/lib/cutaneous/{second_pass_renderer.rb → request_renderer.rb} +2 -5
data/lib/cutaneous/request_template.rb +11 -0
data/lib/cutaneous/request_token_parser.rb +9 -0
data/lib/cutaneous/token_parser.rb +125 -0
data/lib/sequel/plugins/content_table_inheritance.rb +19 -12
data/lib/sequel/plugins/scoped_table_name.rb +45 -0
data/lib/spontaneous.rb +123 -126
data/lib/spontaneous/box.rb +127 -47
data/lib/spontaneous/box_style.rb +39 -22
data/lib/spontaneous/change.rb +2 -2
data/lib/spontaneous/cli.rb +1 -0
data/lib/spontaneous/cli/base.rb +12 -4
data/lib/spontaneous/cli/console.rb +72 -0
data/lib/spontaneous/cli/server.rb +36 -12
data/lib/spontaneous/cli/site.rb +175 -1
data/lib/spontaneous/collections/box_set.rb +19 -1
data/lib/spontaneous/collections/entry_set.rb +70 -22
data/lib/spontaneous/collections/field_set.rb +3 -3
data/lib/spontaneous/collections/prototype_set.rb +28 -0
data/lib/spontaneous/config.rb +14 -5
data/lib/spontaneous/content.rb +23 -24
data/lib/spontaneous/errors.rb +20 -4
data/lib/spontaneous/extensions/array.rb +2 -2
data/lib/spontaneous/extensions/json.rb +1 -1
data/lib/spontaneous/extensions/nil.rb +13 -0
data/lib/spontaneous/facet.rb +61 -7
data/lib/spontaneous/field_types.rb +1 -3
data/lib/spontaneous/field_types/date_field.rb +1 -0
data/lib/spontaneous/field_types/field.rb +32 -15
data/lib/spontaneous/field_types/image_field.rb +138 -69
data/lib/spontaneous/field_types/location_field.rb +59 -0
data/lib/spontaneous/field_types/long_string_field.rb +13 -0
data/lib/spontaneous/field_types/markdown_field.rb +2 -1
data/lib/spontaneous/field_types/string_field.rb +2 -2
data/lib/spontaneous/field_types/webvideo_field.rb +255 -0
data/lib/spontaneous/generators/page/inline.html.cut +1 -1
data/lib/spontaneous/generators/page/page.html.cut.tt +5 -4
data/lib/spontaneous/generators/page/page.rb.tt +1 -5
data/lib/spontaneous/generators/site.rb +1 -0
data/lib/spontaneous/generators/site/.gitignore +2 -0
data/lib/spontaneous/generators/site/Gemfile.tt +3 -5
data/lib/spontaneous/generators/site/config/environment.rb.tt +1 -0
data/lib/spontaneous/generators/site/config/environments/development.rb.tt +3 -1
data/lib/spontaneous/generators/site/config/environments/production.rb.tt +3 -1
data/lib/spontaneous/generators/site/config/indexes.rb.tt +23 -0
data/lib/spontaneous/generators/site/public/css/{site.css → site.scss} +0 -0
data/lib/spontaneous/generators/site/schema/box.rb.tt +5 -0
data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +11 -5
data/lib/spontaneous/image_size.rb +0 -1
data/lib/spontaneous/loader.rb +335 -218
data/lib/spontaneous/logger.rb +7 -2
data/lib/spontaneous/media.rb +64 -59
data/lib/spontaneous/media/file.rb +74 -0
data/lib/spontaneous/page.rb +47 -18
data/lib/spontaneous/page_piece.rb +29 -27
data/lib/spontaneous/paths.rb +0 -1
data/lib/spontaneous/permissions.rb +3 -21
data/lib/spontaneous/permissions/user.rb +5 -1
data/lib/spontaneous/permissions/user_level.rb +6 -7
data/lib/spontaneous/piece.rb +12 -7
data/lib/spontaneous/plugins/aliases.rb +76 -31
data/lib/spontaneous/plugins/allowed_types.rb +36 -37
data/lib/spontaneous/plugins/application/facets.rb +7 -10
data/lib/spontaneous/plugins/application/features.rb +17 -0
data/lib/spontaneous/plugins/application/paths.rb +25 -31
data/lib/spontaneous/plugins/application/render.rb +1 -5
data/lib/spontaneous/plugins/application/serialisation.rb +2 -0
data/lib/spontaneous/plugins/application/state.rb +6 -9
data/lib/spontaneous/plugins/boxes.rb +65 -40
data/lib/spontaneous/plugins/controllers.rb +22 -22
data/lib/spontaneous/plugins/entries.rb +149 -150
data/lib/spontaneous/plugins/entry.rb +50 -35
data/lib/spontaneous/plugins/field/editor_class.rb +13 -0
data/lib/spontaneous/plugins/fields.rb +41 -33
data/lib/spontaneous/plugins/instance_code.rb +9 -9
data/lib/spontaneous/plugins/layouts.rb +31 -35
data/lib/spontaneous/plugins/media.rb +31 -32
data/lib/spontaneous/plugins/page/formats.rb +56 -31
data/lib/spontaneous/plugins/page/request.rb +15 -9
data/lib/spontaneous/plugins/page_search.rb +30 -31
data/lib/spontaneous/plugins/page_tree.rb +59 -12
data/lib/spontaneous/plugins/paths.rb +84 -79
data/lib/spontaneous/plugins/permissions.rb +26 -28
data/lib/spontaneous/plugins/prototypes.rb +42 -37
data/lib/spontaneous/plugins/publishing.rb +50 -94
data/lib/spontaneous/plugins/render.rb +8 -16
data/lib/spontaneous/plugins/schema_hierarchy.rb +20 -21
data/lib/spontaneous/plugins/schema_id.rb +33 -25
data/lib/spontaneous/plugins/schema_title.rb +3 -4
data/lib/spontaneous/plugins/serialisation.rb +32 -35
data/lib/spontaneous/plugins/site/features.rb +32 -0
data/lib/spontaneous/plugins/site/instance.rb +3 -2
data/lib/spontaneous/plugins/site/level.rb +18 -0
data/lib/spontaneous/plugins/site/map.rb +2 -1
data/lib/spontaneous/plugins/site/publishing.rb +56 -59
data/lib/spontaneous/plugins/site/revisions.rb +24 -19
data/lib/spontaneous/plugins/site/schema.rb +33 -0
data/lib/spontaneous/plugins/site/search.rb +43 -0
data/lib/spontaneous/plugins/site/selectors.rb +35 -30
data/lib/spontaneous/plugins/site/storage.rb +63 -0
data/lib/spontaneous/plugins/site_map.rb +23 -25
data/lib/spontaneous/plugins/styles.rb +35 -43
data/lib/spontaneous/plugins/supertype.rb +3 -1
data/lib/spontaneous/plugins/visibility.rb +90 -83
data/lib/spontaneous/prototypes/box_prototype.rb +55 -25
data/lib/spontaneous/prototypes/field_prototype.rb +66 -19
data/lib/spontaneous/prototypes/style_prototype.rb +2 -2
data/lib/spontaneous/publishing.rb +1 -1
data/lib/spontaneous/publishing/immediate.rb +128 -49
data/lib/spontaneous/publishing/simultaneous.rb +70 -0
data/lib/spontaneous/rack.rb +38 -26
data/lib/spontaneous/rack/around_back.rb +3 -23
data/lib/spontaneous/rack/around_preview.rb +3 -8
data/lib/spontaneous/rack/assets.rb +7 -6
data/lib/spontaneous/rack/authentication.rb +21 -0
data/lib/spontaneous/rack/back.rb +310 -331
data/lib/spontaneous/rack/cacheable_file.rb +27 -0
data/lib/spontaneous/rack/cookie_authentication.rb +38 -0
data/lib/spontaneous/rack/css.rb +43 -0
data/lib/spontaneous/rack/event_source.rb +31 -0
data/lib/spontaneous/rack/front.rb +30 -8
data/lib/spontaneous/rack/helpers.rb +31 -0
data/lib/spontaneous/rack/media.rb +22 -21
data/lib/spontaneous/rack/public.rb +2 -1
data/lib/spontaneous/rack/query_authentication.rb +35 -0
data/lib/spontaneous/rack/reloader.rb +6 -3
data/lib/spontaneous/rack/user_helpers.rb +28 -0
data/lib/spontaneous/render.rb +64 -23
data/lib/spontaneous/render/context_base.rb +143 -0
data/lib/spontaneous/render/format.rb +24 -19
data/lib/spontaneous/render/helpers.rb +14 -0
data/lib/spontaneous/render/helpers/html_helper.rb +69 -0
data/lib/spontaneous/render/helpers/script_helper.rb +17 -0
data/lib/spontaneous/render/helpers/stylesheet_helper.rb +16 -0
data/lib/spontaneous/render/preview_context.rb +8 -0
data/lib/spontaneous/render/preview_renderer.rb +6 -0
data/lib/spontaneous/render/publish_context.rb +22 -0
data/lib/spontaneous/render/published_renderer.rb +12 -13
data/lib/spontaneous/render/publishing_renderer.rb +3 -0
data/lib/spontaneous/render/render_cache.rb +26 -0
data/lib/spontaneous/render/renderer.rb +5 -1
data/lib/spontaneous/render/request_context.rb +8 -0
data/lib/spontaneous/schema.rb +56 -24
data/lib/spontaneous/schema/schema_modification.rb +2 -2
data/lib/spontaneous/schema/uid.rb +22 -106
data/lib/spontaneous/schema/uid_map.rb +120 -0
data/lib/spontaneous/search.rb +11 -0
data/lib/spontaneous/search/compound_indexer.rb +26 -0
data/lib/spontaneous/search/database.rb +72 -0
data/lib/spontaneous/search/field.rb +95 -0
data/lib/spontaneous/search/index.rb +184 -0
data/lib/spontaneous/search/results.rb +34 -0
data/lib/spontaneous/server.rb +5 -1
data/lib/spontaneous/site.rb +56 -16
data/lib/spontaneous/storage.rb +22 -0
data/lib/spontaneous/storage/backend.rb +10 -0
data/lib/spontaneous/storage/cloud.rb +104 -0
data/lib/spontaneous/storage/local.rb +52 -0
data/lib/spontaneous/style.rb +27 -9
data/lib/spontaneous/version.rb +1 -1
data/spontaneous.gemspec +719 -0
data/test/disabled/test_slots.rb +1 -1
data/test/experimental/test_cutaneous.rb +309 -0
data/test/experimental/test_features.rb +129 -0
data/test/fixtures/application/views/{index.erubis → index.erb} +0 -0
data/test/fixtures/back/public/css/sass_include.scss +5 -0
data/test/fixtures/back/public/css/sass_template.scss +4 -0
data/test/fixtures/example_application/templates/client_project.html.cut +4 -4
data/test/fixtures/example_application/templates/client_project/images.html.cut +1 -1
data/test/fixtures/example_application/templates/client_projects.html.cut +2 -2
data/test/fixtures/example_application/templates/inline_image.html.cut +1 -1
data/test/fixtures/example_application/templates/layouts/home.html.cut +7 -7
data/test/fixtures/example_application/templates/layouts/info.html.cut +1 -1
data/test/fixtures/example_application/templates/layouts/project.html.cut +4 -4
data/test/fixtures/example_application/templates/layouts/projects.html.cut +2 -2
data/test/fixtures/example_application/templates/project.html.cut +2 -2
data/test/fixtures/example_application/templates/project/inline.html.cut +3 -3
data/test/fixtures/example_application/templates/project_image.html.cut +1 -1
data/test/fixtures/example_application/templates/text.html.cut +1 -1
data/test/fixtures/fields/youtube_api_response.xml +102 -0
data/test/fixtures/layouts/layouts/custom4.html.cut +0 -0
data/test/fixtures/plugins/schema_plugin/public/css/plugin.css +1 -0
data/test/fixtures/plugins/schema_plugin/public/js/plugin.js +1 -0
data/test/fixtures/plugins/schema_plugin/public/static.html +1 -0
data/test/fixtures/plugins/schema_plugin/public/subdir/image.gif +1 -0
data/test/fixtures/plugins/schema_plugin/public/subdir/include1.scss +3 -0
data/test/fixtures/plugins/schema_plugin/public/subdir/sass.scss +4 -0
data/test/fixtures/plugins/schema_plugin/public/subdir/sass/include2.scss +4 -0
data/test/fixtures/public/templates/layouts/default.html.cut +1 -1
data/test/fixtures/public/templates/layouts/default.pdf.cut +1 -1
data/test/fixtures/public/templates/layouts/default.rss.cut +1 -1
data/test/fixtures/public/templates/layouts/dynamic.html.cut +1 -1
data/test/fixtures/schema_modification/config/database.yml +0 -0
data/test/fixtures/schema_modification/config/environment.rb +2 -0
data/test/fixtures/schema_modification/schema/box.rb +1 -0
data/test/fixtures/schema_modification/schema/custom_box.rb +1 -0
data/test/fixtures/schema_modification/schema/page.rb +6 -0
data/test/fixtures/schema_modification/schema/piece.rb +1 -0
data/test/fixtures/search/config/database.yml +1 -0
data/test/fixtures/search/config/indexes.rb +4 -0
data/test/fixtures/serialisation/root_hash.yaml.erb +16 -20
data/test/fixtures/storage/cloud/environment.rb +12 -0
data/test/fixtures/storage/default/environment.rb +1 -0
data/test/fixtures/templates/aliases/layouts/c_alias.html.cut +1 -1
data/test/fixtures/templates/content/include.html.cut +1 -1
data/test/fixtures/templates/content/include_dir.html.cut +1 -1
data/test/fixtures/templates/content/included.epub.cut +1 -1
data/test/fixtures/templates/content/included.html.cut +1 -1
data/test/fixtures/templates/content/partial/included.html.cut +1 -1
data/test/fixtures/templates/content/preprocess.html.cut +1 -1
data/test/fixtures/templates/content/second.html.cut +1 -1
data/test/fixtures/templates/content/template.epub.cut +1 -1
data/test/fixtures/templates/content/template.html.cut +1 -1
data/test/fixtures/templates/default_style_class.html.cut +1 -1
data/test/fixtures/templates/engine/braces.html.cut +6 -0
data/test/fixtures/templates/engine/multiline.html.cut +5 -0
data/test/fixtures/templates/extended/grandparent.html.cut +7 -7
data/test/fixtures/templates/extended/main.html.cut +5 -5
data/test/fixtures/templates/extended/parent.html.cut +10 -8
data/test/fixtures/templates/extended/partial.html.cut +1 -0
data/test/fixtures/templates/extended/partial_with_locals.html.cut +1 -0
data/test/fixtures/templates/extended/with_includes.html.cut +9 -0
data/test/fixtures/templates/extended/with_includes_and_locals.html.cut +9 -0
data/test/fixtures/templates/layouts/entries.html.cut +7 -7
data/test/fixtures/templates/layouts/page_style.html.cut +1 -1
data/test/fixtures/templates/layouts/params.html.cut +1 -1
data/test/fixtures/templates/layouts/preview_render.html.cut +2 -2
data/test/fixtures/templates/layouts/standard_page.html.cut +1 -1
data/test/fixtures/templates/layouts/subdir_style.html.cut +1 -1
data/test/fixtures/templates/layouts/template_params.html.cut +1 -1
data/test/fixtures/templates/layouts/variables.html.cut +7 -0
data/test/fixtures/templates/page_class/inline_style.html.cut +1 -1
data/test/fixtures/templates/preview_render/variables.html.cut +1 -0
data/test/fixtures/templates/publishing/templates/layouts/dynamic.html.cut +1 -0
data/test/fixtures/templates/publishing/templates/layouts/dynamic.rtf.cut +1 -0
data/test/fixtures/templates/publishing/templates/layouts/static.html.cut +1 -0
data/test/fixtures/templates/template_class/anonymous_style.html.cut +2 -2
data/test/fixtures/templates/template_class/complex_template.html.cut +4 -4
data/test/fixtures/templates/template_class/complex_template.pdf.cut +4 -4
data/test/fixtures/templates/template_class/default_template_style.html.cut +2 -2
data/test/fixtures/templates/template_class/images_with_template.html.cut +3 -3
data/test/fixtures/templates/template_class/slots_template.html.cut +3 -3
data/test/fixtures/templates/template_class/slots_template.pdf.cut +3 -3
data/test/fixtures/templates/template_class/this_template.epub.cut +1 -1
data/test/fixtures/templates/template_class/this_template.html.cut +1 -1
data/test/fixtures/templates/template_class/this_template.pdf.cut +1 -1
data/test/fixtures/templates/with_default_style_class.html.cut +1 -1
data/test/functional/test_application.rb +19 -15
data/test/functional/test_back.rb +130 -98
data/test/functional/test_front.rb +72 -28
data/test/javascript/test_dom.rb +1 -1
data/test/javascript/test_markdown.rb +1 -1
data/test/slow/test_publishing.rb +94 -75
data/test/slow/test_visibility.rb +47 -14
data/test/test_helper.rb +30 -3
data/test/ui/test_page_editing.rb +1 -1
data/test/unit/test_alias.rb +200 -16
data/test/unit/test_authentication.rb +26 -28
data/test/unit/test_boxes.rb +146 -75
data/test/unit/test_config.rb +42 -20
data/test/unit/test_content.rb +156 -37
data/test/unit/test_content_inheritance.rb +4 -2
data/test/unit/test_extensions.rb +7 -1
data/test/unit/test_fields.rb +558 -290
data/test/{experimental → unit}/test_formats.rb +42 -3
data/test/unit/test_generators.rb +3 -2
data/test/unit/test_helpers.rb +54 -0
data/test/unit/test_image_size.rb +1 -1
data/test/unit/test_images.rb +51 -40
data/test/unit/test_layouts.rb +21 -4
data/test/unit/test_logger.rb +1 -1
data/test/unit/test_media.rb +165 -7
data/test/unit/test_page.rb +158 -27
data/test/unit/test_permissions.rb +170 -187
data/test/unit/test_piece.rb +27 -9
data/test/unit/test_plugins.rb +153 -0
data/test/unit/test_prototype_set.rb +60 -2
data/test/unit/test_prototypes.rb +81 -20
data/test/unit/test_render.rb +97 -9
data/test/unit/test_schema.rb +167 -120
data/test/unit/test_search.rb +588 -0
data/test/unit/test_serialisation.rb +26 -10
data/test/unit/test_site.rb +42 -25
data/test/unit/test_storage.rb +88 -0
data/test/unit/test_structure.rb +11 -5
data/test/unit/test_styles.rb +64 -3
data/test/unit/test_table_scoping.rb +76 -0
data/test/unit/test_templates.rb +69 -31
data/test/unit/test_type_hierarchy.rb +9 -1
metadata +274 -208
data/Gemfile.lock +0 -146
data/application/css/min/54ee0ed3c7fac7632bd5c020d69e9a2503e0c88c.css +0 -1
data/application/css/min/c256adc144e2bdd0b0539356b04eb62db01e1dc3.css +0 -1
data/application/js/edit_dialogue.js +0 -137
data/application/js/min/492a209de8ee955fa9c729a765377495001e11b1.js +0 -17
data/application/js/min/80f684d77c940887a1d4a63e3a96102e993baa98.js +0 -88
data/application/js/min/c7140ec9475e5bf868b901e0621338d7d162358b.js +0 -3
data/application/js/min/f07f2bd6630ee31e1c2288ec223383d8f0658ba6.js +0 -2
data/application/js/vendor/.DS_Store +0 -0
data/application/js/vendor/JS.Class-2.1.5/src/command.js +0 -93
data/application/js/vendor/JS.Class-2.1.5/src/comparable.js +0 -37
data/application/js/vendor/JS.Class-2.1.5/src/constant_scope.js +0 -48
data/application/js/vendor/JS.Class-2.1.5/src/core.js +0 -1060
data/application/js/vendor/JS.Class-2.1.5/src/decorator.js +0 -50
data/application/js/vendor/JS.Class-2.1.5/src/enumerable.js +0 -505
data/application/js/vendor/JS.Class-2.1.5/src/forwardable.js +0 -22
data/application/js/vendor/JS.Class-2.1.5/src/hash.js +0 -334
data/application/js/vendor/JS.Class-2.1.5/src/linked_list.js +0 -114
data/application/js/vendor/JS.Class-2.1.5/src/loader.js +0 -553
data/application/js/vendor/JS.Class-2.1.5/src/method_chain.js +0 -172
data/application/js/vendor/JS.Class-2.1.5/src/observable.js +0 -55
data/application/js/vendor/JS.Class-2.1.5/src/package.js +0 -472
data/application/js/vendor/JS.Class-2.1.5/src/proxy.js +0 -58
data/application/js/vendor/JS.Class-2.1.5/src/ruby.js +0 -44
data/application/js/vendor/JS.Class-2.1.5/src/set.js +0 -332
data/application/js/vendor/JS.Class-2.1.5/src/stack_trace.js +0 -151
data/application/js/vendor/JS.Class-2.1.5/src/state.js +0 -95
data/application/js/vendor/JS.Class-2.1.5/src/stdlib.js +0 -2612
data/application/js/vendor/jquery-1.4.2.min.js +0 -154
data/application/js/vendor/jquery-1.4.3.min.js +0 -166
data/application/js/vendor/jquery-1.5.1.min.js +0 -16
data/application/js/vendor/jquery-1.5.1rc1.min.js +0 -24
data/application/js/vendor/jquery-ui-1.8.6.custom.min.js +0 -265
data/application/js/vendor/jquery-ui-1.8.custom.min.js +0 -106
data/application/js/vendor/jquery.hotkeys-0.7.9.js +0 -248
data/application/js/vendor/jquery.hotkeys-0.7.9.min.js +0 -19
data/application/js/vendor/jsdiff.js +0 -169
data/lib/cutaneous/first_pass_parser.rb +0 -23
data/lib/cutaneous/parser_core.rb +0 -18
data/lib/cutaneous/second_pass_parser.rb +0 -23
data/lib/sequel/plugins/yajl_serialization.rb +0 -154
data/lib/spontaneous/plugins.rb +0 -20
data/lib/spontaneous/proxy_object.rb +0 -12
data/lib/spontaneous/publishing/fire_and_forget.rb +0 -57
data/lib/spontaneous/render/context.rb +0 -100
data/spontaneous.gemspec.tmpl +0 -66
data/test/experimental/test_plugins.rb +0 -64
data/test/fixtures/templates/publishing/layouts/dynamic.html.cut +0 -1
data/test/fixtures/templates/publishing/layouts/static.html.cut +0 -1

data/test/fixtures/storage/cloud/environment.rb ADDED Viewed

@@ -0,0 +1,12 @@
+test_setting true
+storage :s3 do |config|
+  config.update({
+    :provider => "AWS",
+    :aws_access_key_id => "ACCESS_KEY_ID",
+    :aws_secret_access_key => "SECRET_ACCESS_KEY",
+    :bucket => "media.example.com",
+    :endpoint => "http://media.example.com",
+    :host => "media.example.com"
+  })
+end

data/test/fixtures/storage/default/environment.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ test_setting true

data/test/fixtures/templates/aliases/layouts/c_alias.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- {{ aaa_field1 }}
1	+ ${ aaa_field1 }

data/test/fixtures/templates/content/include.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html>{% include 'included' %}</html>
1	+ <html>%{ include 'included' }</html>

data/test/fixtures/templates/content/include_dir.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html>{% include 'partial/included' %}</html>
1	+ <html>%{ include 'partial/included' }</html>

data/test/fixtures/templates/content/included.epub.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <epub>#{~~bell}~~{{ bell }}</epub>
1	+ <epub>{{ bell }}${bell}</epub>

data/test/fixtures/templates/content/included.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- #{bell}{{ bell }}
1	+ {{bell}}${bell}

data/test/fixtures/templates/content/partial/included.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- #{~~bell}~~{{ bell }}
1	+ {{ bell }}${bell}

data/test/fixtures/templates/content/preprocess.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html><title>{{ title }}</title>#{bell}</html>
1	+ <html><title>${ title }</title>{{bell}}</html>

data/test/fixtures/templates/content/second.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html><title>#{title}</title>#{bell}</html>
1	+ <html><title>{{title}}</title>{{bell}}</html>

data/test/fixtures/templates/content/template.epub.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <epub>{% include 'included' %}</epub>
1	+ <epub>%{ include 'included' }</epub>

data/test/fixtures/templates/content/template.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html><title>{{ title }}</title></html>
1	+ <html><title>${ title }</title></html>

data/test/fixtures/templates/default_style_class.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- Title: {{ title }}
1	+ Title: ${ title }

data/test/fixtures/templates/engine/braces.html.cut ADDED Viewed

@@ -0,0 +1,6 @@
+%{
+	a = { :a => "a", :b => "b" }
+	b = { :c => "c", :d => "d" }
+	c = a.map { |k, v| "#{k}-#{v}"}.join("/")
+}
+${ a[:a] }${ a[:b] }

data/test/fixtures/templates/engine/multiline.html.cut ADDED Viewed

@@ -0,0 +1,5 @@
+%{
+ something = 3
+ nothing = 4; another = 5
+}
+${ something + nothing + another }

data/test/fixtures/templates/extended/grandparent.html.cut CHANGED Viewed

@@ -1,10 +1,10 @@
-{% block :title %}Grandparent Title{% endblock %}
-{% block :navigation  %}
+%{ block :title }Grandparent Title%{ endblock }
+%{ block :navigation  }
 Grandparent Nav
-{% endblock %}
-{% block :body  %}
+%{ endblock }
+%{ block :body  }
 Grandparent Body
-{% endblock %}
-{% block :footer %}
+%{ endblock }
+%{ block :footer }
 Grandparent Footer
-{% endblock %}
+%{ endblock }

data/test/fixtures/templates/extended/main.html.cut CHANGED Viewed

@@ -1,6 +1,6 @@
-{% extends 'parent' %}
-{% block :title %}Main Title #{page.title}{% endblock %}
-{% block :body %}
+%{ extends 'parent' }
+%{ block :title }Main Title {{page.title}}%{ endblock }
+%{ block :body }
 Main Body
-{% block_super %}
-{% endblock %}
+%{ block_super }
+%{ endblock }

data/test/fixtures/templates/extended/parent.html.cut CHANGED Viewed

@@ -1,10 +1,12 @@
-{% extends 'grandparent' %}
-{% block :title  %}Parent Title{% endblock %}
-{% block :body  %}
+%{ extends 'grandparent' }
+%{ block :title  }Parent Title
+%{ endblock }
+%{ block :body  }
 Parent Body
-{% block_super %}
-{% endblock %}
-{% block :footer  %}
-{% block_super %}
+%{ block_super }
+%{ endblock }
+%{ block :footer  }
+%{ block_super }
 Parent Footer
-{% endblock %}
+%{ endblock }

data/test/fixtures/templates/extended/partial.html.cut ADDED Viewed

	@@ -0,0 +1 @@
1	+ PARTIAL

data/test/fixtures/templates/extended/partial_with_locals.html.cut ADDED Viewed

	@@ -0,0 +1 @@
1	+ ${ title }

data/test/fixtures/templates/extended/with_includes.html.cut ADDED Viewed

@@ -0,0 +1,9 @@
+%{ extends 'parent' }
+%{ block :navigation }
+%{ endblock }
+%{ block :body }
+INCLUDE
+%{ include 'partial' }
+%{ endblock }

data/test/fixtures/templates/extended/with_includes_and_locals.html.cut ADDED Viewed

@@ -0,0 +1,9 @@
+%{ extends 'parent' }
+%{ block :navigation }
+%{ endblock }
+%{ block :body }
+INCLUDE
+%{ include 'partial_with_locals', :title => "local title" }
+%{ endblock }

data/test/fixtures/templates/layouts/entries.html.cut CHANGED Viewed

@@ -1,7 +1,7 @@
-{% images.each do |image| %}
-{{image.position}}{% if image.first? %}>{% end %}{% if image.last? %}<{% end %}{{ image.title }}
-{% end %}
-{% images.each_with_index do |image, i| %}
-{{ i }}:{{ image.title }}
-{% end %}
-{{ images.map { |i| i.title }.join('.') }}
+%{ images.each do |image| }
+${image.position}%{ if image.first? }>%{ end }%{ if image.last? }<%{ end }${ image.title }
+%{ end }
+%{ images.each_with_index do |image, i| }
+${ i }:${ image.title }
+%{ end }
+${ images.map do |i|; i.title end.join('.') }

data/test/fixtures/templates/layouts/page_style.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html>{{ render_content }}</html>
1	+ <html>${ render_content }</html>

data/test/fixtures/templates/layouts/params.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- {{title}} #{welcome}
1	+ ${title} {{welcome}}

data/test/fixtures/templates/layouts/preview_render.html.cut CHANGED Viewed

@@ -1,2 +1,2 @@
-{{ title }} #{ description }
-{{ images }}
+${ title } {{ description }}
+${ images }

data/test/fixtures/templates/layouts/standard_page.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- /{{ title }}/
1	+ /${ title }/

data/test/fixtures/templates/layouts/subdir_style.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <{{ title }}>
1	+ <${ title }>

data/test/fixtures/templates/layouts/template_params.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- {{ image(:alt => "Smelly") }}
1	+ ${ image(:alt => "Smelly") }

data/test/fixtures/templates/layouts/variables.html.cut ADDED Viewed

@@ -0,0 +1,7 @@
+%{
+local = "local"
+@variable = "variable"
+}
+${ param }
+${ images }
+${ local }

data/test/fixtures/templates/page_class/inline_style.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- {{ title }}
1	+ ${ title }

data/test/fixtures/templates/preview_render/variables.html.cut ADDED Viewed

	@@ -0,0 +1 @@
1	+ <${ @variable }/${ param }/${ local }>

data/test/fixtures/templates/publishing/templates/layouts/dynamic.html.cut ADDED Viewed

	@@ -0,0 +1 @@
1	+ Page: '${ title }' {{Time.now.to_i}}

data/test/fixtures/templates/publishing/templates/layouts/dynamic.rtf.cut ADDED Viewed

	@@ -0,0 +1 @@
1	+ RICH!

data/test/fixtures/templates/publishing/templates/layouts/static.html.cut ADDED Viewed

	@@ -0,0 +1 @@
1	+ Page: '${ title }'

data/test/fixtures/templates/template_class/anonymous_style.html.cut CHANGED Viewed

@@ -1,4 +1,4 @@
 <root>
-{{ images.introduction }}
-{{ images }}
+${ images.introduction }
+${ images }
 </root>

data/test/fixtures/templates/template_class/complex_template.html.cut CHANGED Viewed

@@ -1,6 +1,6 @@
 <complex>
-{{ title }}
-{% content.each do |piece| %}
-<piece>{{ piece }}</piece>
-{% end %}
+${ title }
+%{ content.each do |piece| }
+<piece>${ piece }</piece>
+%{ end }
 </complex>

data/test/fixtures/templates/template_class/complex_template.pdf.cut CHANGED Viewed

@@ -1,6 +1,6 @@
 <pdf>
-{{ title }}
-{% content.each do |piece| %}
-<piece>{{ piece }}</piece>
-{% end %}
+${ title }
+%{ content.each do |piece| }
+<piece>${ piece }</piece>
+%{ end }
 </pdf>

data/test/fixtures/templates/template_class/default_template_style.html.cut CHANGED Viewed

@@ -1,4 +1,4 @@
 <root>
-{{ images_with_template.introduction }}
-{{ images_with_template }}
+${ images_with_template.introduction }
+${ images_with_template }
 </root>

data/test/fixtures/templates/template_class/images_with_template.html.cut CHANGED Viewed

@@ -1,5 +1,5 @@
 <images>
-{% pieces.each do |image| %}
-  {{ image }}
-{% end %}
+%{ pieces.each do |image| }
+  ${ image }
+%{ end }
 </images>

data/test/fixtures/templates/template_class/slots_template.html.cut CHANGED Viewed

@@ -1,5 +1,5 @@
 <boxes>
-{% images.entries.each do |image| %}
-  <img>{{ image }}</img>
-{% end %}
+%{ images.entries.each do |image| }
+  <img>${ image }</img>
+%{ end }
 </boxes>

data/test/fixtures/templates/template_class/slots_template.pdf.cut CHANGED Viewed

@@ -1,5 +1,5 @@
 <boxes-pdf>
-{% images.entries.each do |image| %}
-  <img>{{ image }}</img>
-{% end %}
+%{ images.entries.each do |image| }
+  <img>${ image }</img>
+%{ end }
 </boxes-pdf>

data/test/fixtures/templates/template_class/this_template.epub.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <EPUB><title>{{ title }}</title><body>{{ description }}</body></EPUB>
1	+ <EPUB><title>${ title }</title><body>${ description }</body></EPUB>

data/test/fixtures/templates/template_class/this_template.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <html><title>{{ title }}</title><body>{{ description }}</body></html>
1	+ <html><title>${ title }</title><body>${ description }</body></html>

data/test/fixtures/templates/template_class/this_template.pdf.cut CHANGED Viewed

	@@ -1 +1 @@
1	- <PDF><title>{{ title }}</title><body>{{ description }}</body></PDF>
1	+ <PDF><title>${ title }</title><body>${ description }</body></PDF>

data/test/fixtures/templates/with_default_style_class.html.cut CHANGED Viewed

	@@ -1 +1 @@
1	- Title: {{ title }}
1	+ Title: ${ title }

data/test/functional/test_application.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # encoding: UTF-8
-require 'test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 # set :environment, :test
@@ -8,21 +8,24 @@ class ApplicationTest < MiniTest::Spec
   include Spontaneous
   include ::Rack::Test::Methods
-  def setup
-    @saved_schema_root = Spontaneous.schema_root
-    Spontaneous.schema_root = nil
-    Spontaneous.root = File.expand_path("../../fixtures/example_application", __FILE__)
-    File.exists?(Spontaneous.root).should be_true
+  def self.site_root
+    @site_root
   end
-  def teardown
-    # to keep other tests working
-    Spontaneous.schema_root = @saved_schema_root
+  def self.startup
+    @site_root = Dir.mktmpdir
+    app_root = File.expand_path('../../fixtures/example_application', __FILE__)
+    FileUtils.cp_r(app_root, @site_root)
+    @site_root += "/example_application"
+  end
+  def self.shutdown
+    teardown_site
   end
   context "schema" do
     setup do
-      Spontaneous.init(:mode => :back, :environment => :development)
+      Spontaneous.init(:root => self.class.site_root, :mode => :back, :environment => :development)
     end
     should "load" do
@@ -32,7 +35,7 @@ class ApplicationTest < MiniTest::Spec
   context "Site" do
     setup do
-      Spontaneous.init(:mode => :back, :environment => :development)
+      Spontaneous.init(:root => self.class.site_root, :mode => :back, :environment => :development)
     end
     should "have the same config as Spontaneous" do
       Site.config.should == Spontaneous.config
@@ -43,10 +46,11 @@ class ApplicationTest < MiniTest::Spec
       Site.config.butter.should == "yummy"
     end
   end
   context "back, development" do
     setup do
-      Spontaneous.init(:mode => :back, :environment => :development)
+      Spontaneous.init(:root => self.class.site_root, :mode => :back, :environment => :development)
       Sequel::Migrator.apply(Spontaneous.database, 'db/migrations')
     end
@@ -98,7 +102,7 @@ class ApplicationTest < MiniTest::Spec
   context "front, development" do
     setup do
-      Spontaneous.init(:mode => :front, :environment => :development)
+      Spontaneous.init(:root => self.class.site_root, :mode => :front, :environment => :development)
     end
     should "have the right mode setting" do
@@ -121,7 +125,7 @@ class ApplicationTest < MiniTest::Spec
   context "back, production" do
     setup do
-      Spontaneous.init(:mode => :back, :environment => :production)
+      Spontaneous.init(:root => self.class.site_root, :mode => :back, :environment => :production)
     end
     should "have the right mode setting" do
@@ -153,7 +157,7 @@ class ApplicationTest < MiniTest::Spec
   context "front, production" do
     setup do
-      Spontaneous.init(:mode => :front, :environment => :production)
+      Spontaneous.init(:root => self.class.site_root, :mode => :front, :environment => :production)
     end
     should "have the right mode setting" do

data/test/functional/test_back.rb CHANGED Viewed

@@ -1,7 +1,6 @@
 # encoding: UTF-8
-require 'test_helper'
-require 'tmpdir'
+require File.expand_path('../../test_helper', __FILE__)
 # set :environment, :test
@@ -10,30 +9,32 @@ class BackTest < MiniTest::Spec
   include ::Rack::Test::Methods
+  def self.site_root
+    @site_root
+  end
   def self.startup
-    # Spontaneous.logger = nil
-    Spontaneous.logger.silent!
+    @site_root = Dir.mktmpdir
+    app_root = File.expand_path('../../fixtures/back', __FILE__)
+    FileUtils.cp_r(app_root, @site_root)
+    @site_root += "/back"
+    FileUtils.mkdir_p(@site_root / "cache")
+    FileUtils.cp_r(File.join(File.dirname(__FILE__), "../fixtures/media"), @site_root / "cache")
   end
   def self.shutdown
+    teardown_site
   end
   def app
     Spontaneous::Rack::Back.application
   end
-  def teardown
-    # teardown_site_fixture
-  end
   def setup
-    @media_dir = File.expand_path('../../../tmp/media', __FILE__)
-    Spontaneous.media_dir = @media_dir
-  end
-  def teardown
-    ::FileUtils.rm_rf(@media_dir)
+    @site = setup_site(self.class.site_root)
   end
   def auth_post(path, params={})
     post(path, params.merge("__key" => @key))
   end
@@ -44,39 +45,47 @@ class BackTest < MiniTest::Spec
   context "Editing interface" do
     setup do
+      @storage = @site.default_storage
+      @site.stubs(:storage).with(anything).returns(@storage)
       config = mock()
       config.stubs(:reload_classes).returns(false)
       config.stubs(:auto_login).returns('root')
       config.stubs(:default_charset).returns('utf-8')
       config.stubs(:publishing_method).returns(:immediate)
-      root = File.expand_path("../../fixtures/back", __FILE__)
-      Spontaneous.root = root
-      instance = Spontaneous::Site.instantiate(root, :test, :back)
-      instance.stubs(:config).returns(config)
-      Spontaneous.instance = instance
-      app.send(:set, :raise_errors, true)
-      app.send(:set, :dump_errors, true)
-      app.send(:set, :show_exceptions, true)
-      S::Schema.reset!
+      config.stubs(:site_domain).returns('example.org')
+      config.stubs(:site_id).returns('example_org')
+      config.stubs(:site_id).returns('example_org')
+      @site.stubs(:config).returns(config)
+      S::Rack::Back::EditingInterface.set :raise_errors, true
+      S::Rack::Back::EditingInterface.set :dump_errors, true
+      S::Rack::Back::EditingInterface.set :show_exceptions, false
       Content.delete
       Spontaneous::Permissions::User.delete
       self.template_root = File.expand_path('../../fixtures/back/templates', __FILE__)
       @app_dir = File.expand_path("../../fixtures/application", __FILE__)
       File.exists?(@app_dir).should be_true
       Spontaneous.stubs(:application_dir).returns(@app_dir)
-      Spontaneous::Rack::Back.application.send :set, :show_exceptions, false
-      # setup_site_fixture
+      # Spontaneous::Rack::Back.application.send :set, :show_exceptions, false
       # annoying to have to do this, but there you go
       @user = Spontaneous::Permissions::User.create(:email => "root@example.com", :login => "root", :name => "root", :password => "rootpass", :password_confirmation => "rootpass")
       @user.update(:level => Spontaneous::Permissions.root)
       @user.save
       @key = "c5AMX3r5kMHX2z9a5ExLKjAmCcnT6PFf22YQxzb4Codj"
-      Spontaneous::Permissions.stubs(:active_user).returns(@user)
+      @key.stubs(:user).returns(@user)
+      @key.stubs(:key_id).returns(@key)
+      @user.stubs(:access_keys).returns([@key])
+      Spontaneous::Permissions::User.stubs(:[]).with(:login => 'root').returns(@user)
+      Spontaneous::Permissions::AccessKey.stubs(:authenticate).with(@key).returns(@key)
       Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
       class Page < Spot::Page
         field :title
       end
       class Piece < Spot::Piece; end
       class Project < Page; end
       class Image < Piece
@@ -95,7 +104,7 @@ class BackTest < MiniTest::Spec
       end
       class LinkedJob < Piece
-        alias_of Job
+        alias_of proc { |owner, box| box.contents }
       end
       class HomePage < Page
@@ -148,8 +157,8 @@ class BackTest < MiniTest::Spec
       should "return application page" do
         get '/@spontaneous/'
-        assert last_response.ok?
-        last_response.body.should =~ /<title>Spontaneous<\/title>/
+        assert last_response.ok?, "Should have returned 200 but got #{last_response.status}"
+        last_response.body.should =~ /<title>Spontaneous/
       end
       should "return json for root page" do
@@ -171,7 +180,7 @@ class BackTest < MiniTest::Spec
         auth_get "/@spontaneous/types"
         assert last_response.ok?
         last_response.content_type.should == "application/json;charset=utf-8"
-        assert_equal Schema.serialise_http, last_response.body
+        assert_equal Site.schema.serialise_http, last_response.body
       end
       should "return scripts from js dir" do
@@ -254,7 +263,7 @@ class BackTest < MiniTest::Spec
           assert last_response.ok?
           last_response.content_type.should == "application/json;charset=utf-8"
           @job1 = Content[@job1.id]
-          last_response.body.should == @job1.serialise_http
+          last_response.body.should == @job1.serialise_http(@user)
           @job1.fields.title.value.should ==  "Updated field_name_1"
         end
@@ -267,7 +276,7 @@ class BackTest < MiniTest::Spec
           assert last_response.ok?
           last_response.content_type.should == "application/json;charset=utf-8"
           @home = Content[@home.id]
-          last_response.body.should == @home.serialise_http
+          last_response.body.should == @home.serialise_http(@user)
           @home.fields.title.value.should ==  "Updated title"
           @home.fields.introduction.value.should ==  "<p>Updated intro</p>\n"
         end
@@ -285,11 +294,12 @@ class BackTest < MiniTest::Spec
         end
         should "generate an error if there is a field version conflict" do
+          field = @job1.fields.title
+          field.version = 3
+          @job1.save.reload
           field = @job1.fields.title
           sid = field.schema_id.to_s
           params = { "fields" => {sid => "2"} }
-          field.stubs(:version).returns(3)
-          Content.stubs(:[]).with(@job1.id.to_s).returns(@job1)
           auth_post "/@spontaneous/version/#{@job1.id}", params
           assert last_response.status == 409, "Should have recieved a 409 conflict but instead received a #{last_response.status}"
@@ -301,12 +311,14 @@ class BackTest < MiniTest::Spec
         end
         should "generate an error if there is a field version conflict for boxes" do
+          box = @job1.images
+          field = box.fields.title
+          field.version = 3
+          @job1.save.reload
           box = @job1.images
           field = box.fields.title
           sid = field.schema_id.to_s
           params = { "fields" => {sid => "2"} }
-          field.stubs(:version).returns(3)
-          Content.stubs(:[]).with(@job1.id.to_s).returns(@job1)
           auth_post "/@spontaneous/version/#{@job1.id}/#{box.schema_id.to_s}", params
           assert last_response.status == 409, "Should have recieved a 409 conflict but instead received a #{last_response.status}"
@@ -381,6 +393,12 @@ class BackTest < MiniTest::Spec
           end
         end
       end
+      should "render SASS templates" do
+        get "/css/sass_template.css"
+        assert last_response.ok?, "Should return 200 but got #{last_response.status}"
+        last_response.body.should =~ /color: #ffeeff/
+      end
     end
     context "static files" do
@@ -412,7 +430,7 @@ class BackTest < MiniTest::Spec
     context "media files" do
       setup do
         Spontaneous.stubs(:reload!)
-        Spontaneous.media_dir = File.join(File.dirname(__FILE__), "../fixtures/media")
+        # Spontaneous.media_dir = File.join(File.dirname(__FILE__), "../fixtures/media")
       end
       teardown do
       end
@@ -432,17 +450,6 @@ class BackTest < MiniTest::Spec
         Spontaneous::Media.stubs(:upload_index).returns(23)
       end
-      should "create a file in a safe subdirectory of media/tmp" do
-        auth_post "@spontaneous/file/upload/9723", "file" => ::Rack::Test::UploadedFile.new(@src_file, "image/jpeg")
-        assert last_response.ok?
-        last_response.content_type.should == "application/json;charset=utf-8"
-        assert_equal({
-          :id => '9723',
-          :src => "/media/tmp/1288882153.23/rose.jpg",
-          :path => "#{Spontaneous.media_dir}/tmp/1288882153.23/rose.jpg"
-        }.to_json, last_response.body)
-      end
       should "replace values of fields immediately when required" do
         @image1.image.processed_value.should == ""
         auth_post "@spontaneous/file/replace/#{@image1.id}", "file" => ::Rack::Test::UploadedFile.new(@src_file, "image/jpeg"), "field" => @image1.image.schema_id.to_s
@@ -451,11 +458,11 @@ class BackTest < MiniTest::Spec
         @image1 = Content[@image1.id]
         src = @image1.image.src
         src.should =~ /^\/media(.+)\/rose\.jpg$/
-        last_response.body.should == {
-          :id => @image1.id,
-          :src => src,
-          :version => 1
-        }.to_json
+        Spot::JSON.parse(last_response.body).should == @image1.image.export
+        #   :id => @image1.id,
+        #   :src => src,
+        #   :version => 1
+        # }.to_json
         File.exist?(Media.to_filepath(src)).should be_true
         get src
         assert last_response.ok?
@@ -469,11 +476,11 @@ class BackTest < MiniTest::Spec
         @job1 = Content[@job1.id]
         src = @job1.images.image.src
         src.should =~ /^\/media(.+)\/rose\.jpg$/
-        last_response.body.should == {
-          :id => @job1.id,
-          :src => src,
-          :version => 1
-        }.to_json
+        Spot::JSON.parse(last_response.body).should == @job1.images.image.export
+        #   :id => @job1.id,
+        #   :src => src,
+        #   :version => 1
+        # }.to_json
         File.exist?(Media.to_filepath(src)).should be_true
         get src
         assert last_response.ok?
@@ -502,7 +509,7 @@ class BackTest < MiniTest::Spec
       setup do
         Spontaneous.stubs(:reload!)
       end
-      should "be addable" do
+      should "default to being added at the top" do
         current_count = @home.in_progress.pieces.length
         first_id = @home.in_progress.pieces.first.id
         @home.in_progress.pieces.first.class.name.should_not == "BackTest::Image"
@@ -527,6 +534,24 @@ class BackTest < MiniTest::Spec
         last_response.content_type.should == "application/json;charset=utf-8"
         Content[target.id].should be_nil
       end
+      should "be addable at the bottom" do
+        current_count = @home.in_progress.pieces.length
+        last_id = @home.in_progress.pieces.last.id
+        @home.in_progress.pieces.last.class.name.should_not == "BackTest::Image"
+        auth_post "/@spontaneous/add/#{@home.id}/#{@home.in_progress.schema_id.to_s}/#{Image.schema_id.to_s}", :position => -1
+        assert last_response.ok?, "Recieved #{last_response.status} not 200"
+        last_response.content_type.should == "application/json;charset=utf-8"
+        @home.reload
+        @home.in_progress.pieces.length.should == current_count+1
+        @home.in_progress.pieces.last.id.should_not == last_id
+        @home.in_progress.pieces.last.class.name.should == "BackTest::Image"
+        required_response = {
+          :position => -1,
+          :entry => @home.in_progress.pieces.last.export
+        }
+        Spot::JSON.parse(last_response.body).should == required_response
+      end
     end
     context "Page paths" do
@@ -540,7 +565,7 @@ class BackTest < MiniTest::Spec
         last_response.content_type.should == "application/json;charset=utf-8"
         @project1.reload
         @project1.path.should == "/howabout"
-        Spot::JSON.parse(last_response.body).should == {:path => '/howabout' }
+        Spot::JSON.parse(last_response.body).should == {:path => '/howabout', :slug => 'howabout' }
       end
       should "raise error when trying to save duplicate path" do
         auth_post "/@spontaneous/slug/#{@project1.id}", 'slug' => 'project2'
@@ -571,6 +596,7 @@ class BackTest < MiniTest::Spec
         Spot::JSON.parse(last_response.body).should == {:uid => uid}
         @project1.reload.uid.should == uid
       end
       should "not be editable by non-developer users" do
         @user.stubs(:developer?).returns(false)
         uid = "boom"
@@ -584,11 +610,6 @@ class BackTest < MiniTest::Spec
     context "Request cache" do
       setup do
         Spontaneous.stubs(:reload!)
-        # @home = HomePage.new
-        # @piece = Text.new
-        # @home.in_progress << @piece
-        # @home.save
-        # @piece.save
         Change.delete
       end
       should "wrap all updates in a Change.record" do
@@ -649,13 +670,6 @@ class BackTest < MiniTest::Spec
         auth_post "/@spontaneous/publish/publish", :change_set_ids => [@c1.id, @c2.id]
         assert last_response.ok?
       end
-      should "be able to retrieve the publishing status" do
-        Site.publishing_method.status = "something:50"
-        auth_get "/@spontaneous/publish/status"
-        assert last_response.ok?
-        last_response.body.should == {:status => "something", :progress => "50"}.to_json
-      end
     end
     context "New sites" do
@@ -699,9 +713,9 @@ class BackTest < MiniTest::Spec
       end
       should "be able to retrieve a list of potential targets" do
-        auth_get "/@spontaneous/targets/#{LinkedJob.schema_id}"
+        auth_get "/@spontaneous/targets/#{LinkedJob.schema_id}/#{@home.id}/#{@home.in_progress.schema_id}"
         assert last_response.ok?
-        Spot::JSON.parse(last_response.body).should == LinkedJob.targets.map do |job|
+        Spot::JSON.parse(last_response.body).should == LinkedJob.targets(@home, @home.in_progress).map do |job|
           {
             :id => job.id,
             :title => job.title.to_s,
@@ -711,7 +725,7 @@ class BackTest < MiniTest::Spec
       end
       should "be able to add an alias to a box" do
         @home.featured_jobs.pieces.length.should == 0
-        auth_post "/@spontaneous/alias/#{@home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_id' => Job.first.id
+        auth_post "/@spontaneous/alias/#{@home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_id' => Job.first.id, "position" => 0
         assert last_response.ok?, "Recieved #{last_response.status} not 200"
         last_response.content_type.should == "application/json;charset=utf-8"
         @home.reload
@@ -721,7 +735,27 @@ class BackTest < MiniTest::Spec
         a.target.should == Job.first
         required_response = {
           :position => 0,
-          :entry => @home.featured_jobs.pieces.first.export
+          :entry => @home.featured_jobs.pieces.first.export(@user)
+        }
+        Spot::JSON.parse(last_response.body).should == required_response
+      end
+      should "be able to add an alias to a box at any position" do
+        @home.featured_jobs << Job.new
+        @home.featured_jobs << Job.new
+        @home.featured_jobs << Job.new
+        @home.save.reload
+        @home.featured_jobs.pieces.length.should == 3
+        auth_post "/@spontaneous/alias/#{@home.id}/#{HomePage.boxes[:featured_jobs].schema_id.to_s}", 'alias_id' => LinkedJob.schema_id.to_s, 'target_id' => Job.first.id, "position" => 2
+        assert last_response.ok?, "Recieved #{last_response.status} not 200"
+        last_response.content_type.should == "application/json;charset=utf-8"
+        @home.reload
+        @home.featured_jobs.pieces.length.should == 4
+        a = @home.featured_jobs[2]
+        a.alias?.should be_true
+        a.target.should == Job.first
+        required_response = {
+          :position => 2,
+          :entry => @home.featured_jobs[2].export(@user)
         }
         Spot::JSON.parse(last_response.body).should == required_response
       end
@@ -732,11 +766,10 @@ class BackTest < MiniTest::Spec
         # enable schema validation errors by creating and using a permanent map file
         @schema_map = File.join(Dir.tmpdir, "schema.yml")
         FileUtils.rm(@schema_map) if File.exists?(@schema_map)
-        S::Schema.schema_map_file = @schema_map
-        S::Schema.validate!
-        S::Schema.write_schema
-        S::Schema.schema_loader_class = S::Schema::PersistentMap
-        S::Schema.reload!
+        S.schema.schema_map_file = @schema_map
+        S.schema.validate!
+        S.schema.write_schema
+        S.schema.schema_loader_class = S::Schema::PersistentMap
         Job.field :replaced
         @df1 = Job.field_prototypes[:title]
         @af1 = Job.field_prototypes[:replaced]
@@ -744,15 +777,14 @@ class BackTest < MiniTest::Spec
         @uid = @df1.schema_id.to_s
         Job.stubs(:field_prototypes).returns({:replaced => @af1, :image => @f1})
         Job.stubs(:fields).returns([@af1, @f1])
-        S::Schema.reload!
-        lambda { S::Schema.validate! }.must_raise(Spontaneous::SchemaModificationError)
+        lambda { S.schema.validate! }.must_raise(Spontaneous::SchemaModificationError)
         # hammer, meet nut
         S::Rack::Back::EditingInterface.use Spontaneous::Rack::Reloader
         Spontaneous::Loader.stubs(:reload!)
       end
       teardown do
-        S::Schema.schema_loader_class = S::Schema::TransientMap
+        S.schema.schema_loader_class = S::Schema::TransientMap
         FileUtils.rm(@schema_map) if File.exists?(@schema_map)
       end
@@ -762,7 +794,7 @@ class BackTest < MiniTest::Spec
       end
       should "present a dialogue page with possible solutions" do
-        get '/@spontaneous/'
+        auth_get '/@spontaneous/'
         assert last_response.status == 412, "Schema validation errors should raise a 412 but instead recieved a #{last_response.status}"
         last_response.body.should =~ %r{<form action="/@spontaneous/schema/delete" method="post"}
         last_response.body.should =~ %r{<input type="hidden" name="uid" value="#{@df1.schema_id}"}
@@ -776,7 +808,7 @@ class BackTest < MiniTest::Spec
         auth_post action, "uid" => @df1.schema_id, "ref" => @af1.schema_name, "origin" => "/@spontaneous"
         last_response.status.should == 302
         begin
-          S::Schema.validate!
+          S.schema.validate!
         rescue Spontaneous::SchemaModificationError => e
           flunk("Schema modification link should have resolved schema errors")
         end
@@ -787,7 +819,7 @@ class BackTest < MiniTest::Spec
         auth_post action, "uid" => @df1.schema_id, "origin" => "/@spontaneous"
         last_response.status.should == 302
         begin
-          S::Schema.validate!
+          S.schema.validate!
         rescue Spontaneous::SchemaModificationError => e
           flunk("Schema modification link should have resolved schema errors")
         end
@@ -797,21 +829,19 @@ class BackTest < MiniTest::Spec
     end
     context "sharded uploading" do
       setup do
-        @temp_dir = Dir.mktmpdir
-        @shard_dir = @temp_dir / "tmp"
+        Spontaneous.stubs(:reload!)
         @image = File.expand_path("../../fixtures/sharding/rose.jpg", __FILE__)
         # read the digest dynamically in case I change that image
         @image_digest = S::Media.digest(@image)
-        FileUtils.mkdir(@shard_dir)
-        Spontaneous.media_dir = @temp_dir
       end
       teardown do
-        FileUtils.rm_rf(@temp_dir)
       end
       should "have the right setting for shard_dir" do
-        Spontaneous.shard_path.should == @shard_dir
-        Spontaneous.shard_path("abcdef0123").should == @shard_dir/ "ab/cd/abcdef0123"
+        shard_path = File.join(@site.root / 'cache/media/tmp')
+        Spontaneous.shard_path.should == shard_path
+        Spontaneous.shard_path("abcdef0123").should == shard_path/ "ab/cd/abcdef0123"
       end
       should "know when it already has a shard" do
@@ -852,6 +882,12 @@ class BackTest < MiniTest::Spec
           last_response.status.should == 200
         end
         @image1.image.processed_value.should == ""
+        dataset = mock()
+        S::Content.stubs(:for_update).returns(dataset)
+        dataset.stubs(:first).with(:id => @image1.id.to_s).returns(@image1)
+        dataset.stubs(:first).with(:id => @image1.id).returns(@image1)
+        # S::Content.stubs(:[]).with(@image1.id.to_s).returns(@image1)
+        # S::Content.stubs(:[]).with(@image1.id).returns(@image1)
         auth_post "/@spontaneous/shard/replace/#{@image1.id}", "filename" => "rose.jpg",
           "shards" => hashes, "field" => @image1.image.schema_id.to_s
         assert last_response.ok?
@@ -859,11 +895,7 @@ class BackTest < MiniTest::Spec
         @image1 = Content[@image1.id]
         src = @image1.image.src
         src.should =~ %r{^(.+)/rose\.jpg$}
-        Spot::JSON.parse(last_response.body).should == {
-          :id => @image1.id,
-          :src => src,
-          :version => 1
-        }
+        Spot::JSON.parse(last_response.body).should == @image1.image.export
         File.exist?(Media.to_filepath(src)).should be_true
         S::Media.digest(Media.to_filepath(src)).should == @image_digest
       end