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

spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

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/lib/spontaneous/generators/site/config/indexes.rb.tt ADDED Viewed

@@ -0,0 +1,23 @@
+# Use this file to configure the search indexes for your site
+# In an index definition you can exclude and include things to index
+# by type, by ID or UID or by position in page tree.
+#
+# You can have as many indexes as you need.
+#
+# Additional control over what appears in each index is provided in
+# the field definitions. See the documentation there for more details.
+#
+# Site.index :blog do
+#   include_types :BlogPost, "Text"
+#   exclude_types :Image, Video
+#   language :english
+#   include_pages "> #blog", 99
+#   exclude_pages ">= /blog/archives", "#search_results", 23
+# end
+#
+# To create an index purely for tags, specify the index here
+# and then include only the tag field in the values to be indexed
+#
+# Site.index :tags do
+# end

data/lib/spontaneous/generators/site/public/css/{site.css → site.scss} RENAMED Viewed

File without changes

data/lib/spontaneous/generators/site/schema/box.rb.tt ADDED Viewed

@@ -0,0 +1,5 @@
+# encoding: UTF-8
+class Box < Spontaneous::Box
+end

data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt CHANGED Viewed

@@ -1,13 +1,19 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
+<!--[if IE 7]>    <html class="no-js ie7 oldie" lang="en"> <![endif]-->
+<!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-  <title>{{ title }}  <%= @domain %></title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <title>${ title }  <%= @domain %></title>
+	${ stylesheets '/css/site' }
 </head>
 <body>
-  {% block :content %}
+  %{ block :content }
     <h2>Welcome to <%= @domain %></h2>
-  {% endblock :content %}
+  %{ endblock :content }
+	${ scripts %w(/js/site) }
 </body>
 </html>

data/lib/spontaneous/image_size.rb CHANGED Viewed

@@ -114,4 +114,3 @@ module Spontaneous
     end
   end
 end

data/lib/spontaneous/loader.rb CHANGED Viewed

@@ -5,276 +5,393 @@ require 'active_support/ordered_hash'
 module Spontaneous
   OrderedHash = ActiveSupport::OrderedHash unless defined?(OrderedHash)
-  module Loader
-    class << self
+  class Loader
+    attr_reader :use_reloader, :load_paths
-      def use_reloader?
-        Site.config.reload_classes
-      end
+    alias_method :use_reloader?, :use_reloader
-      def load!
-        Reloader.run! if use_reloader?
-        Spontaneous.load_paths.each do |path|
-          load_classes(path)
-        end
-      end
+    def initialize(load_paths, use_reloader)
+      @load_paths = load_paths
+      @use_reloader = use_reloader
+    end
-      def reload!
-        Reloader.reload!
+    def reloader
+      @reloader ||= Reloader.new(load_paths)
+    end
+    def load!
+      reloader.run! if use_reloader?
+      load_paths.each do |path|
+        load_classes(path)
       end
+    end
-      # thank you oh makers of Merb for your genius
-      def load_classes(*paths)
-        orphaned_classes = []
-        paths.flatten.each do |path|
-          Dir[path].sort.each do |file|
-            begin
-              load_file(file)
-            rescue NameError => ne
-              # puts "Stashed file with missing requirements for later reloading: #{file}"
-              # ne.backtrace.each_with_index { |line, idx| puts "[#{idx}]: #{line}" }
-              orphaned_classes.unshift(file)
-            end
+    def reload!
+      reloader.reload!
+    end
+    def load_classes(*paths)
+      orphaned_classes = []
+      paths.flatten.each do |path|
+        Dir[path].sort.each do |file|
+          begin
+            load_file(file)
+          rescue NameError => ne
+            # puts "Stashed file with missing requirements for later reloading: #{file}"
+            # ne.backtrace.each_with_index { |line, idx| puts "[#{idx}]: #{line}" }
+            orphaned_classes.unshift(file)
           end
         end
-        load_classes_with_requirements(orphaned_classes)
       end
+      load_classes_with_requirements(orphaned_classes)
+    end
-      def load_file(file)
-        if use_reloader?
-          Reloader.safe_load(file)
-        else
-          require(file)
-        end
+    def load_file(file)
+      if use_reloader?
+        reloader.safe_load(file)
+      else
+        require(file)
       end
+    end
-      def load_classes_with_requirements(klasses)
-        klasses.uniq!
+    def load_classes_with_requirements(klasses)
+      klasses.uniq!
-        while klasses.size > 0
-          # Note size to make sure things are loading
-          size_at_start = klasses.size
+      while klasses.size > 0
+        # Note size to make sure things are loading
+        size_at_start = klasses.size
-          # List of failed classes
-          failed_classes = []
-          # Map classes to exceptions
-          error_map = {}
+        # List of failed classes
+        failed_classes = []
+        # Map classes to exceptions
+        error_map = {}
-          klasses.each do |klass|
-            begin
-              load_file klass
-            rescue NameError => ne
-              error_map[klass] = ne
-              failed_classes.push(klass)
-            end
+        klasses.each do |klass|
+          begin
+            load_file klass
+          rescue NameError => ne
+            error_map[klass] = ne
+            failed_classes.push(klass)
           end
-          klasses.clear
+        end
+        klasses.clear
-          # Keep list of classes unique
-          failed_classes.each { |k| klasses.push(k) unless klasses.include?(k) }
+        # Keep list of classes unique
+        failed_classes.each { |k| klasses.push(k) unless klasses.include?(k) }
-          # Stop processing if nothing loads or if everything has loaded
-          if klasses.size == size_at_start && klasses.size != 0
-            # Write all remaining failed classes and their exceptions to the log
-            messages = error_map.map do |klass, e|
-              ["Could not load #{klass}:\n\n#{e.message} - (#{e.class})",
-               "#{(e.backtrace || []).join("\n")}"]
-            end
-            messages.each { |msg, trace| puts("#{msg}\n\n#{trace}") }
-            puts "#{failed_classes.join(", ")} failed to load."
+        # Stop processing if nothing loads or if everything has loaded
+        if klasses.size == size_at_start && klasses.size != 0
+          # Write all remaining failed classes and their exceptions to the log
+          messages = error_map.map do |klass, e|
+            backtrace = (e.backtrace.select { |line| is_site_page?(line) } || []).join("\n") << "\n..."
+            ["Could not load #{klass}:\n\n#{e.message} - (#{e.class})", "#{ backtrace }"]
           end
-          break if(klasses.size == size_at_start || klasses.size == 0)
+          messages.each { |msg, trace| logger.fatal("#{msg}\n\n#{trace}") }
+          abort("\n#{failed_classes.join(", ")} failed to load.")
         end
-        nil
+        break if(klasses.size == size_at_start || klasses.size == 0)
       end
+      nil
     end
-    module Reloader
-      class << self
-        CACHE                = {}
-        MTIMES               = {}
-        FILES_LOADED         = {}
-        LOADED_CLASSES       = {}
-        ##
-        # Reload all files with changes detected.
-        #
-        def reload!
-          rotation do |file, mtime|
-            # Retrive the last modified time
-            new_file = MTIMES[file].nil?
-            previous_mtime = MTIMES[file] ||= mtime
-            logger.debug "Detected a new file #{file}" if new_file
-            # We skip to next file if it is not new and not modified
-            next unless new_file || mtime > previous_mtime
-            # Now we can reload our file
-            safe_load(file, mtime)
-          end
+    def is_site_page?(backtrace)
+      path, line, context = backtrace.split(":")
+      path = File.expand_path(path)
+      root = Site.instance.root
+      path.start_with?(root)
+    end
+    class Reloader
+      attr_reader :load_paths, :cache, :mtimes, :files_loaded, :loaded_classes
+      def initialize(load_paths)
+        @load_paths = load_paths
+        @cache          = {}
+        @mtimes         = {}
+        @files_loaded   = {}
+        @loaded_classes = {}
+      end
+      def reset!
+        cache.clear
+        mtimes.clear
+        files_loaded.clear
+        loaded_classes.clear
+      end
+      def reload!
+        rotation do |file, mtime|
+          # Retrive the last modified time
+          new_file = mtimes[file].nil?
+          previous_mtime = mtimes[file] ||= mtime
+          logger.debug "Detected a new file #{file}" if new_file
+          # We skip to next file if it is not new and not modified
+          next unless new_file || mtime > previous_mtime
+          # Now we can reload our file
+          safe_load(file, mtime)
         end
+      end
-        ##
-        # Returns true if any file changes are detected and populates the MTIMES cache
-        #
-        def changed?
-          changed = false
-          rotation do |file, mtime|
-            new_file = MTIMES[file].nil?
-            previous_mtime = MTIMES[file] ||= mtime
-            changed = true if new_file || mtime > previous_mtime
-          end
-          changed
+      ##
+      # Returns true if any file changes are detected and populates the MTIMES cache
+      #
+      def changed?
+        changed = false
+        rotation do |file, mtime|
+          new_file = mtimes[file].nil?
+          previous_mtime = mtimes[file] ||= mtime
+          changed = true if new_file || mtime > previous_mtime
         end
-        alias :run! :changed?
+        changed
+      end
+      alias :run! :changed?
-        ##
-        # A safe Kernel::load which issues the necessary hooks depending on results
-        #
-        def safe_load(file, mtime=nil)
-          reload = mtime && mtime > MTIMES[file]
-          logger.debug "Reloading #{file}" if reload
+      def dependency_file?(file)
+        true
+      end
-          # Removes all classes declared in the specified file
-          if klasses = LOADED_CLASSES.delete(file)
-            klasses.each { |klass| remove_constant(klass) }
-          end
+      def classes_for_file(file)
+        loaded_classes[file]
+      end
-          # Keeps track of which constants were loaded and the files
-          # that have been added so that the constants can be removed
-          # and the files can be removed from $LOADED_FEAUTRES
-          if FILES_LOADED[file]
-            FILES_LOADED[file].each do |fl|
-              next if fl == file
-              $LOADED_FEATURES.delete(fl)
-            end
+      def file_for_class(klass)
+        loaded_classes.select do |file, classes|
+          classes.include?(klass)
+        end.keys
+      end
+      ##
+      # A safe Kernel::load which issues the necessary hooks depending on results
+      #
+      def safe_load(file, mtime=nil)
+        reload = mtime && mtime > mtimes[file]
+        logger.debug "Reloading #{file}" if reload
+        # Removes all classes declared in the specified file
+        if klasses = loaded_classes.delete(file)
+          klasses.each { |klass| remove_constant(klass) }
+        end
+        # Keeps track of which constants were loaded and the files
+        # that have been added so that the constants can be removed
+        # and the files can be removed from $LOADED_FEAUTRES
+        if self.files_loaded[file]
+          self.files_loaded[file].each do |fl|
+            next if fl == file
+            $LOADED_FEATURES.delete(fl) if dependency_file?(fl)
           end
+        end
+        # Now reload the file ignoring any syntax errors
+        $LOADED_FEATURES.delete(file)
-          # Now reload the file ignoring any syntax errors
-          $LOADED_FEATURES.delete(file)
-          # Duplicate objects and loaded features in the file
-          klasses = ObjectSpace.classes.dup
-          files_loaded = $LOADED_FEATURES.dup
-          # Start to re-require old dependencies
-          #
-          # Why we need to reload the dependencies i.e. of a model?
-          #
-          # In some circumstances (i.e. with MongoMapper) reloading a model require:
-          #
-          # 1) Clean objectspace
-          # 2) Reload model dependencies
-          #
-          # We need to clean objectspace because for example we don't need to apply two times validations keys etc...
-          #
-          # We need to reload MongoMapper dependencies for re-initialize them.
-          #
-          # In other cases i.e. in a controller (specially with dependencies that uses autoload) reload stuff like sass
-          # is not really necessary... but how to distinguish when it is (necessary) since it is not?
-          #
-          if FILES_LOADED[file]
-            FILES_LOADED[file].each do |fl|
-              next if fl == file
-              # Swich off for a while warnings expecially "already initialized constant" stuff
-              begin
-                verbosity = $-v
-                $-v = nil
-                require(fl)
-              ensure
-                $-v = verbosity
-              end
+        # Duplicate objects and loaded features in the file
+        klasses = ObjectSpace.classes.dup
+        already_loaded = $LOADED_FEATURES.dup
+        # Start to re-require old dependencies
+        #
+        # Why we need to reload the dependencies i.e. of a model?
+        #
+        # In some circumstances (i.e. with MongoMapper) reloading a model require:
+        #
+        # 1) Clean objectspace
+        # 2) Reload model dependencies
+        #
+        # We need to clean objectspace because for example we don't need to apply two times validations keys etc...
+        #
+        # We need to reload MongoMapper dependencies for re-initialize them.
+        #
+        # In other cases i.e. in a controller (specially with dependencies that uses autoload) reload stuff like sass
+        # is not really necessary... but how to distinguish when it is (necessary) since it is not?
+        #
+        if self.files_loaded[file]
+          self.files_loaded[file].each do |fl|
+            next if fl == file
+            # Swich off for a while warnings expecially "already initialized constant" stuff
+            begin
+              verbosity = $-v
+              $-v = nil
+              require(fl)
+            ensure
+              $-v = verbosity
             end
           end
+        end
-          # And finally reload the specified file
-          begin
-            require(file)
-          rescue SyntaxError => ex
-            logger.error "Cannot require #{file} because of syntax error: #{ex.message}"
-          ensure
-            MTIMES[file] = mtime if mtime
-          end
+        # And finally reload the specified file
+        begin
+          require(file)
+        # rescue => ex
+        #   logger.fatal "Cannot require #{file}\\\\\\\\n#{ex.message}"
+        #   raise ex
+        ensure
+          mtimes[file] = mtime if mtime
+        end
-          # Store the file details after successful loading
-          LOADED_CLASSES[file] = ObjectSpace.classes - klasses
-          FILES_LOADED[file]   = $LOADED_FEATURES - files_loaded
+        # Store the file details after successful loading
+        loaded_classes[file] = ObjectSpace.classes - klasses
+        self.files_loaded[file]   = $LOADED_FEATURES - already_loaded
-          nil
-        end
+        nil
+      end
-        ##
-        # Removes the specified class and constant.
-        #
-        def remove_constant(const)
-          # return if Padrino::Reloader.exclude_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) } &&
-          # !Padrino::Reloader.include_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) }
+      ##
+      # Removes the specified class and constant.
+      #
+      def remove_constant(const)
+        # return if Padrino::Reloader.exclude_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) } &&
+        # !Padrino::Reloader.include_constants.any? { |base| (const.to_s =~ /^#{base}/ || const.superclass.to_s =~ /^#{base}/) }
-          Spontaneous::Schema.delete(const)
+        Spontaneous.schema.delete(const)
-          parts = const.to_s.split("::")
+        parts = const.to_s.split("::")
+        begin
           base = parts.size == 1 ? Object : Object.full_const_get(parts[0..-2].join("::"))
           object = parts[-1].to_s
-          begin
-            base.send(:remove_const, object)
-          rescue NameError
-          end
-          nil
+          base.send(:remove_const, object)
+        rescue NameError => e
+          # logger.warn(e)
         end
-        ##
-        # Searches Ruby files in your +Padrino.root+ and monitors them for any changes.
-        #
-        def rotation
-          paths = []
-          # paths  = Dir[Padrino.root("*")].unshift(Padrino.root).
-          #   reject { |path| Padrino::Reloader.exclude.include?(path) || !File.directory?(path) }
-          # files  = paths.map { |path| Dir["#{path}/**/*.rb"] }.flatten.uniq
+        nil
+      end
+      ##
+      # Searches Ruby files in your load_paths and monitors them for any changes.
+      #
+      def rotation
+        paths = []
+        files = load_paths.map do |glob|
+          Dir[glob]
+        end.flatten.uniq
+        files.map { |file|
+          found, stat = figure_path(file, paths)
+          next unless found && stat && mtime = stat.mtime
-          files = Spontaneous.load_paths.map do |glob|
-            Dir[glob]
-          end.flatten.uniq
+          cache[file] = found
-          files.map { |file|
-            # next if Padrino::Reloader.exclude.any? { |base| file =~ /^#{base}/ }
+          yield(found, mtime)
+        }.compact
+      end
-            found, stat = figure_path(file, paths)
-            next unless found && stat && mtime = stat.mtime
+      ##
+      # Takes a relative or absolute +file+ name and a couple possible +paths+ that
+      # the +file+ might reside in. Returns the full path and File::Stat for that path.
+      #
+      def figure_path(file, paths)
+        found = cache[file]
+        found = file if !found and Pathname.new(file).absolute?
+        found, stat = safe_stat(found)
+        return found, stat if found
+        # paths.find do |possible_path|
+        #   path = ::File.join(possible_path, file)
+        #   found, stat = safe_stat(path)
+        #   return ::File.expand_path(found), stat if found
+        # end
+        return false, false
+      end
-            CACHE[file] = found
+      def safe_stat(file)
+        return unless file
+        stat = ::File.stat(file)
+        return file, stat if stat.file?
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        cache.delete(file) and false
+      end
+    end
-            yield(found, mtime)
-          }.compact
+  end # Loader
+  class SchemaLoader < Loader
+    def reloader
+      @reloader ||= SchemaReloader.new(load_paths)
+    end
+    class SchemaReloader < Loader::Reloader
+      def schema_classes_for_file(file)
+        if klasses = classes_for_file(file)
+          klasses.select { |c| is_schema_class?(c) }
+        else
+          []
         end
+      end
-        ##
-        # Takes a relative or absolute +file+ name and a couple possible +paths+ that
-        # the +file+ might reside in. Returns the full path and File::Stat for that path.
-        #
-        def figure_path(file, paths)
-          found = CACHE[file]
-          found = file if !found and Pathname.new(file).absolute?
-          found, stat = safe_stat(found)
-          return found, stat if found
-          # paths.find do |possible_path|
-          #   path = ::File.join(possible_path, file)
-          #   found, stat = safe_stat(path)
-          #   return ::File.expand_path(found), stat if found
-          # end
-          return false, false
+      # Because the schema classes are so tied up together reloading
+      # must be done in the right order.
+      # This method works by finding all the modified files then
+      # mapping those to modified classes. Using the Schema, we find
+      # all the subclasses affected by the modified file and map those
+      # to files.
+      # To reload these we must first reload the superclass, otherwise
+      # the subclasses will re-load but load schema definitions from the
+      # already loaded but out-of-date superclass and we'll end up
+      # with orphaned box and field definitions
+      def reload!
+        changed_files = []
+        rotation do |file, mtime|
+          # Retrive the last modified time
+          new_file = mtimes[file].nil?
+          previous_mtime = mtimes[file] ||= mtime
+          logger.debug "Detected a new file #{file}" if new_file
+          # We skip to next file if it is not new and not modified
+          changed_files << [file, mtime] if new_file || mtime > previous_mtime
+          # Now we can reload our file
         end
+        all_classes = schema.classes.dup
+        modified_classes = changed_files.map do |file, mtime|
+          schema_classes_for_file(file)
+        end.flatten
+        affected_subclasses = modified_classes.map do |modified_class|
+          all_classes.select { |schema_class|
+            schema_class < modified_class
+          }
+        end.flatten
-        def safe_stat(file)
-          return unless file
-          stat = ::File.stat(file)
-          return file, stat if stat.file?
-        rescue Errno::ENOENT, Errno::ENOTDIR
-          CACHE.delete(file) and false
+        subclass_files_to_reload = affected_subclasses.map do |subclass|
+          file_for_class(subclass)
+        end.flatten
+        changed_files.each { |file, mtime|
+          begin
+            safe_load(file, mtime)
+          rescue => boom
+            # remove the file so that it gets reloaded next time, this stops errors in the schema files
+            # from resulting in a schema map change...
+            mtimes.delete(file)
+            raise boom
+          end
+        }
+        subclass_files_to_reload.each { |file| safe_load(file) }
+      end
+      def schema
+        Spontaneous.schema
+      end
+      def is_schema_class?(klass)
+        (klass < Spontaneous::Page or klass < Spontaneous::Piece or klass < Spontaneous::Box)
+      end
+      def remove_constant(const)
+        if is_schema_class?(const)
+          super
         end
-      end # self
+      end
+      def dependency_file?(file)
+        path = ::File.expand_path(file)
+        tests = load_paths.map { |load_path| ::File.fnmatch?(load_path, path) }
+        tests.any? { |t| t }
+      end
     end
-  end # Loader
+  end
 end # Spontaneous