RubyGems - spontaneous - Versions diffs - 0.2.0.alpha2 → 0.2.0.alpha3 - Mend

spontaneous 0.2.0.alpha2 → 0.2.0.alpha3

Files changed (404) hide show

data/Gemfile +3 -40
data/Rakefile +29 -41
data/Readme.markdown +21 -8
data/application/css/add_alias_dialogue.css.scss +79 -0
data/application/css/{v2.scss → core.css.scss} +537 -550
data/application/css/{definitions.scss → definitions.css.scss} +121 -33
data/application/css/dialogue.css.scss +409 -0
data/application/css/{editing.scss → editing.css.scss} +25 -262
data/application/css/font.css.scss +8 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_diagonals-thick_18_b81900_40x40.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_diagonals-thick_20_666666_40x40.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_flat_10_000000_40x100.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_glass_100_f6f6f6_1x400.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_glass_100_fdf5ce_1x400.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_glass_65_ffffff_1x400.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_gloss-wave_35_f6a828_500x100.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_highlight-soft_100_eeeeee_1x100.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-bg_highlight-soft_75_ffe45c_1x100.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-icons_222222_256x240.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-icons_228ef1_256x240.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-icons_ef8c08_256x240.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-icons_ffd27a_256x240.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/images/ui-icons_ffffff_256x240.png +0 -0
data/application/css/jquery-ui-1.8.21.custom/ui-lightness.css.scss +565 -0
data/application/css/{login.scss → login.css.scss} +4 -4
data/application/css/meta.css.scss +331 -0
data/application/css/{popover.scss → popover.css.scss} +9 -8
data/application/css/{schema_error.scss → schema_error.css.scss} +4 -4
data/application/css/spontaneous.css +5 -0
data/application/css/unsupported.css.scss +42 -0
data/application/js/add_alias_dialogue.js +72 -10
data/application/js/ajax.js +50 -16
data/application/js/compatibility.js +19 -15
data/application/js/content.js +39 -36
data/application/js/content_area.js +53 -5
data/application/js/dialogue.js +17 -0
data/application/js/dom.js +1 -1
data/application/js/edit_panel.js +23 -8
data/application/js/extensions.js +7 -2
data/application/js/field_preview.js +2 -1
data/application/js/field_types/date_field.js +11 -8
data/application/js/field_types/file_field.js +188 -9
data/application/js/field_types/image_field.js +46 -29
data/application/js/field_types/markdown_field.js +57 -14
data/application/js/field_types/select_field.js +72 -0
data/application/js/field_types/string_field.js +8 -0
data/application/js/field_types/webvideo_field.js +8 -0
data/application/js/init.js +1 -7
data/application/js/location.js +41 -13
data/application/js/login.js +3 -0
data/application/js/meta_view/user_admin.js +543 -0
data/application/js/meta_view.js +1 -0
data/application/js/metadata.js +20 -0
data/application/js/page.js +17 -3
data/application/js/page_browser.js +40 -30
data/application/js/page_entry.js +4 -0
data/application/js/panel/root_menu.js +66 -0
data/application/js/popover.js +2 -2
data/application/js/preview.js +1 -1
data/application/js/publish.js +138 -30
data/application/js/services.js +43 -0
data/application/js/sharded_upload.js +2 -2
data/application/js/spontaneous.js +64 -5
data/application/js/state.js +20 -9
data/application/js/top_bar.js +273 -150
data/application/js/types.js +20 -15
data/application/js/upload.js +1 -2
data/application/js/user.js +18 -4
data/application/js/vendor/date.js +104 -0
data/application/js/vendor/jquery-ui-1.8.18.custom.min.js +356 -0
data/application/js/views/box_view.js +15 -8
data/application/js/views/page_piece_view.js +11 -8
data/application/js/views/page_view.js +21 -3
data/application/js/views/piece_view.js +19 -10
data/application/js/views.js +3 -0
data/application/static/chromelogo-200x52-45c7cbc93be080bea342df5fcda2ef8b.png +0 -0
data/application/static/dot-texture-9eea29e4ac7ad9a772285252078ec127.png +0 -0
data/application/static/editing-textarea-resize-s-b5af62365eb7e19ea4beccf7242d508e.png +0 -0
data/application/static/editing-texture-1-42b06a3439752490988f30f2a06d5e7c.png +0 -0
data/application/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf +0 -0
data/application/static/loop_alt1-white-7894b458528e92216196cae26b4c2c96.svg +12 -0
data/application/static/spontaneous-states-e91ec89db525c62da0105b97cdd781ce.png +0 -0
data/application/views/index.erb +2 -2
data/application/views/login.erb +4 -8
data/application/views/schema_modification_error.html.erb +1 -4
data/application/views/unsupported.erb +9 -7
data/bin/spot +1 -1
data/db/migrations/20110209152710_users_and_groups.rb +10 -10
data/db/migrations/20120305112647_site_modification_time.rb +11 -0
data/db/migrations/20120418153903_add_ownership_of_content.rb +14 -0
data/db/migrations/20120423175416_add_pending_modifications.rb +21 -0
data/db/migrations/20120525164947_add_field_versions.rb +27 -0
data/lib/sequel/plugins/scoped_table_name.rb +10 -1
data/lib/spontaneous/asset/file.rb +25 -0
data/lib/spontaneous/asset/source.rb +28 -0
data/lib/spontaneous/asset.rb +75 -0
data/lib/spontaneous/box.rb +6 -4
data/lib/spontaneous/capistrano/deploy.rb +47 -0
data/lib/spontaneous/capistrano/sync.rb +81 -0
data/lib/spontaneous/capistrano.rb +13 -0
data/lib/spontaneous/change.rb +60 -68
data/lib/spontaneous/cli/assets.rb +29 -0
data/lib/spontaneous/cli/base.rb +0 -48
data/lib/spontaneous/cli/console.rb +1 -1
data/lib/spontaneous/cli/server.rb +6 -4
data/lib/spontaneous/cli/site.rb +28 -17
data/lib/spontaneous/cli/user.rb +107 -0
data/lib/spontaneous/cli.rb +100 -4
data/lib/spontaneous/collections/entry_set.rb +2 -2
data/lib/spontaneous/collections/field_set.rb +48 -22
data/lib/spontaneous/collections/prototype_set.rb +20 -13
data/lib/spontaneous/constants.rb +3 -0
data/lib/spontaneous/content.rb +22 -5
data/lib/spontaneous/errors.rb +3 -3
data/lib/spontaneous/extensions/array.rb +12 -0
data/lib/spontaneous/extensions/enumerable.rb +30 -0
data/lib/spontaneous/extensions/nil.rb +3 -1
data/lib/spontaneous/extensions/string.rb +16 -0
data/lib/spontaneous/field_types/date_field.rb +45 -2
data/lib/spontaneous/field_types/field.rb +42 -9
data/lib/spontaneous/field_types/file_field.rb +68 -0
data/lib/spontaneous/field_types/image_field.rb +63 -0
data/lib/spontaneous/field_types/select_field.rb +109 -0
data/lib/spontaneous/field_types/string_field.rb +6 -1
data/lib/spontaneous/field_types/webvideo_field.rb +85 -27
data/lib/spontaneous/field_types.rb +1 -1
data/lib/spontaneous/field_version.rb +8 -0
data/lib/spontaneous/generators/page.rb +1 -1
data/lib/spontaneous/generators/site/Capfile.tt +1 -4
data/lib/spontaneous/generators/site/Gemfile.tt +13 -6
data/lib/spontaneous/generators/site/config/deploy.rb.tt +28 -0
data/lib/spontaneous/generators/site/config/environments/production.rb.tt +7 -2
data/lib/spontaneous/generators/site.rb +1 -0
data/lib/spontaneous/json.rb +34 -11
data/lib/spontaneous/layout.rb +22 -0
data/lib/spontaneous/media/file.rb +4 -0
data/lib/spontaneous/output/assets/compression.rb +58 -0
data/lib/spontaneous/output/assets.rb +32 -0
data/lib/spontaneous/output/context.rb +179 -0
data/lib/spontaneous/output/format/html.rb +5 -0
data/lib/spontaneous/output/format/plain.rb +5 -0
data/lib/spontaneous/output/format.rb +180 -0
data/lib/spontaneous/output/helpers/classes_helper.rb +18 -0
data/lib/spontaneous/{render/helpers/html_helper.rb → output/helpers/conditional_comment_helper.rb} +3 -12
data/lib/spontaneous/output/helpers/script_helper.rb +73 -0
data/lib/spontaneous/output/helpers/stylesheet_helper.rb +61 -0
data/lib/spontaneous/output/helpers.rb +28 -0
data/lib/spontaneous/output/template/engine.rb +59 -0
data/lib/spontaneous/output/template/renderer.rb +153 -0
data/lib/spontaneous/output/template.rb +21 -0
data/lib/spontaneous/output.rb +163 -0
data/lib/spontaneous/page.rb +2 -1
data/lib/spontaneous/paths.rb +6 -1
data/lib/spontaneous/permissions/access_key.rb +5 -5
data/lib/spontaneous/permissions/user.rb +81 -35
data/lib/spontaneous/permissions/user_level.rb +26 -22
data/lib/spontaneous/plugins/aliases.rb +76 -12
data/lib/spontaneous/plugins/allowed_types.rb +60 -18
data/lib/spontaneous/plugins/application/paths.rb +0 -28
data/lib/spontaneous/plugins/application/system.rb +35 -0
data/lib/spontaneous/plugins/boxes.rb +4 -0
data/lib/spontaneous/plugins/content_groups.rb +16 -0
data/lib/spontaneous/plugins/entries.rb +50 -30
data/lib/spontaneous/plugins/fields.rb +15 -0
data/lib/spontaneous/plugins/layouts.rb +8 -2
data/lib/spontaneous/plugins/modifications.rb +228 -0
data/lib/spontaneous/plugins/page/formats.rb +67 -42
data/lib/spontaneous/plugins/page/request.rb +10 -0
data/lib/spontaneous/plugins/page/site_timestamps.rb +28 -0
data/lib/spontaneous/plugins/paths.rb +15 -3
data/lib/spontaneous/plugins/publishing.rb +124 -45
data/lib/spontaneous/plugins/render.rb +13 -8
data/lib/spontaneous/plugins/schema_hierarchy.rb +18 -6
data/lib/spontaneous/plugins/site/helpers.rb +53 -0
data/lib/spontaneous/plugins/site/hooks.rb +50 -0
data/lib/spontaneous/plugins/site/map.rb +1 -1
data/lib/spontaneous/plugins/site/paths.rb +13 -0
data/lib/spontaneous/plugins/site/publishing.rb +6 -2
data/lib/spontaneous/plugins/site/{revisions.rb → state.rb} +5 -1
data/lib/spontaneous/plugins/site/storage.rb +4 -0
data/lib/spontaneous/plugins/site/url.rb +15 -0
data/lib/spontaneous/plugins/site_map.rb +13 -3
data/lib/spontaneous/plugins/styles.rb +5 -1
data/lib/spontaneous/plugins/visibility.rb +39 -12
data/lib/spontaneous/prototypes/box_prototype.rb +4 -0
data/lib/spontaneous/prototypes/field_prototype.rb +15 -10
data/lib/spontaneous/publishing/event_client.rb +46 -0
data/lib/spontaneous/publishing/immediate.rb +81 -44
data/lib/spontaneous/publishing/simultaneous.rb +23 -6
data/lib/spontaneous/publishing.rb +4 -3
data/lib/spontaneous/rack/around_back.rb +1 -5
data/lib/spontaneous/rack/around_front.rb +4 -4
data/lib/spontaneous/rack/around_preview.rb +4 -3
data/lib/spontaneous/rack/assets.rb +81 -54
data/lib/spontaneous/rack/authentication.rb +0 -1
data/lib/spontaneous/rack/back.rb +160 -72
data/lib/spontaneous/rack/cookie_authentication.rb +2 -2
data/lib/spontaneous/rack/css.rb +18 -15
data/lib/spontaneous/rack/event_source.rb +9 -21
data/lib/spontaneous/rack/fiber_pool.rb +26 -0
data/lib/spontaneous/rack/front.rb +12 -4
data/lib/spontaneous/rack/helpers.rb +35 -13
data/lib/spontaneous/rack/js.rb +41 -0
data/lib/spontaneous/rack/public.rb +34 -44
data/lib/spontaneous/rack/sse.rb +18 -0
data/lib/spontaneous/rack/static.rb +3 -0
data/lib/spontaneous/rack/user_admin.rb +100 -0
data/lib/spontaneous/rack/user_helpers.rb +1 -1
data/lib/spontaneous/rack.rb +6 -2
data/lib/spontaneous/schema.rb +31 -4
data/lib/spontaneous/search/index.rb +19 -3
data/lib/spontaneous/search/results.rb +1 -1
data/lib/spontaneous/sequel.rb +17 -0
data/lib/spontaneous/site.rb +11 -4
data/lib/spontaneous/state.rb +11 -0
data/lib/spontaneous/storage/cloud.rb +4 -0
data/lib/spontaneous/storage/local.rb +11 -0
data/lib/spontaneous/style.rb +2 -2
data/lib/spontaneous/tasks/database.rake +21 -22
data/lib/spontaneous/utils/database/mysql_dumper.rb +4 -0
data/lib/spontaneous/utils/database/postgres_dumper.rb +78 -0
data/lib/spontaneous/utils/database.rb +6 -3
data/lib/spontaneous/utils/smart_quotes.rb +499 -0
data/lib/spontaneous/utils/smush_it.rb +66 -0
data/lib/spontaneous/utils.rb +3 -1
data/lib/spontaneous/version.rb +2 -2
data/lib/spontaneous.rb +25 -29
data/spontaneous.gemspec +186 -106
data/test/experimental/test_features.rb +1 -1
data/test/fixtures/asset_pipeline/application/css/basic.css.scss +4 -0
data/test/fixtures/asset_pipeline/application/css/complex.css.scss.erb +6 -0
data/test/fixtures/asset_pipeline/application/css/simple.css +3 -0
data/test/fixtures/asset_pipeline/application/css/spontaneous.css +7 -0
data/test/fixtures/asset_pipeline/application/css/subdir/complex.css.scss.erb +6 -0
data/test/fixtures/asset_pipeline/application/css/subdir/library.css.scss +1 -0
data/test/fixtures/asset_pipeline/application/css/subdir/simple.css +3 -0
data/test/fixtures/asset_pipeline/application/js/basic.js.coffee +1 -0
data/test/fixtures/asset_pipeline/application/js/complex.js.coffee.erb +1 -0
data/test/fixtures/asset_pipeline/application/js/login.js +1 -0
data/test/fixtures/asset_pipeline/application/js/require.js +1 -0
data/test/fixtures/asset_pipeline/application/js/simple.js +1 -0
data/test/fixtures/asset_pipeline/application/js/spontaneous.js +5 -0
data/test/fixtures/asset_pipeline/application/js/subdir/complex.js.coffee.erb +1 -0
data/test/fixtures/asset_pipeline/application/js/subdir/library.js.coffee +1 -0
data/test/fixtures/asset_pipeline/application/js/subdir/simple.js +1 -0
data/test/fixtures/asset_pipeline/application/js/vendor/jquery.js +1 -0
data/test/fixtures/asset_pipeline/application/static/dot-texture.png +0 -0
data/test/fixtures/asset_pipeline/application/static/subdir/px.gif +0 -0
data/test/fixtures/assets/public1/css/a.scss +1 -0
data/test/fixtures/assets/public1/js/a.js +1 -0
data/test/fixtures/assets/public1/js/m.coffee +1 -0
data/test/fixtures/assets/public2/css/b.scss +1 -0
data/test/fixtures/assets/public2/css/c.css +1 -0
data/test/fixtures/assets/public2/js/b.js +1 -0
data/test/fixtures/assets/public2/js/c.js +1 -0
data/test/fixtures/assets/public2/js/n.coffee +1 -0
data/test/fixtures/back/config/user_levels.yml +3 -0
data/test/fixtures/back/public/js/coffeescript.coffee +1 -0
data/test/fixtures/back/templates/layouts/standard.css.cut +1 -0
data/test/fixtures/back/templates/layouts/standard.js.cut +1 -0
data/test/fixtures/example_application/config/database.yml +4 -4
data/test/fixtures/helpers/templates/layouts/standard.html.cut +1 -0
data/test/fixtures/helpers/templates/layouts/standard.mobile.cut +1 -0
data/test/fixtures/images/vimlogo.pdf +0 -0
data/test/fixtures/outputs/templates/layouts/standard.atom.cut +1 -0
data/test/fixtures/permissions/config/user_levels.yml +6 -3
data/test/fixtures/serialisation/class_hash.yaml.erb +1 -0
data/test/fixtures/serialisation/root_hash.yaml.erb +2 -2
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 +8 -8
data/test/fixtures/templates/extended/partial_with_locals.html.cut +1 -1
data/test/fixtures/templates/extended/with_includes.html.cut +6 -6
data/test/fixtures/templates/extended/with_includes_and_locals.html.cut +6 -7
data/test/fixtures/templates/layouts/entries.html.cut +4 -4
data/test/fixtures/templates/layouts/standard.html.cut +1 -0
data/test/fixtures/templates/layouts/variables.html.cut +1 -1
data/test/fixtures/templates/publishing/templates/layouts/static.html.cut +1 -1
data/test/fixtures/templates/publishing/templates/layouts/static.rtf.cut +1 -0
data/test/fixtures/templates/template_class/complex_template.html.cut +2 -2
data/test/fixtures/templates/template_class/complex_template.pdf.cut +2 -2
data/test/fixtures/templates/template_class/default_template_style.html.cut +1 -1
data/test/fixtures/templates/template_class/images_with_template.html.cut +2 -2
data/test/fixtures/templates/template_class/slots_template.html.cut +2 -2
data/test/fixtures/templates/template_class/slots_template.pdf.cut +2 -2
data/test/fixtures/user_manager/config/user_levels.yml +9 -0
data/test/functional/test_application.rb +7 -7
data/test/functional/test_back.rb +352 -97
data/test/functional/test_front.rb +71 -20
data/test/functional/test_user_manager.rb +284 -0
data/test/javascript/env.js +13505 -0
data/test/javascript/test_markdown.rb +43 -3
data/test/support/custom_matchers.rb +3 -2
data/test/test_helper.rb +50 -9
data/test/test_javascript.rb +13 -13
data/test/ui_helper.rb +1 -1
data/test/unit/test_alias.rb +79 -8
data/test/unit/test_asset_bundler.rb +220 -0
data/test/unit/test_assets.rb +213 -0
data/test/unit/test_async.rb +55 -0
data/test/unit/test_authentication.rb +52 -39
data/test/unit/test_boxes.rb +20 -15
data/test/unit/test_changesets.rb +261 -0
data/test/unit/test_content.rb +73 -33
data/test/unit/test_content_inheritance.rb +18 -18
data/test/unit/test_extensions.rb +26 -0
data/test/unit/test_fields.rb +303 -16
data/test/unit/test_formats.rb +267 -34
data/test/unit/test_helpers.rb +79 -2
data/test/unit/test_images.rb +10 -0
data/test/unit/test_layouts.rb +21 -13
data/test/unit/test_modifications.rb +648 -0
data/test/unit/test_page.rb +6 -2
data/test/unit/test_permissions.rb +101 -27
data/test/unit/test_piece.rb +4 -4
data/test/unit/test_plugins.rb +3 -2
data/test/unit/test_publishing.rb +332 -0
data/test/unit/test_render.rb +118 -67
data/test/unit/test_revisions.rb +546 -0
data/test/unit/test_schema.rb +83 -1
data/test/unit/test_search.rb +59 -0
data/test/unit/test_serialisation.rb +2 -47
data/test/unit/test_site.rb +217 -108
data/test/unit/test_storage.rb +26 -0
data/test/unit/test_structure.rb +2 -2
data/test/unit/test_styles.rb +90 -75
data/test/unit/test_table_scoping.rb +21 -17
data/test/unit/test_templates.rb +75 -69
data/test/{slow → unit}/test_visibility.rb +78 -22
metadata +528 -221
data/application/css/add_alias_dialogue.scss +0 -27
data/application/css/min/14c2a35812c443001b15d8b12a4780f88c678035.css +0 -1
data/application/css/min/565d4c25e82148acb01c45c8d675b37a08676d77.css +0 -1
data/application/css/min/84dbe894ea96eafd321c30823d630817bfc4b03b.css +0 -1
data/application/css/spontaneous.scss +0 -111
data/application/css/unsupported.scss +0 -16
data/application/css/variables.scss +0 -80
data/application/js/min/2a0c2962537a3181fedfff5c92596ba6d3122dc9.js +0 -3
data/application/js/min/4cf1c493d3379ecba5287758c61238034c0893f9.js +0 -2
data/application/js/min/78ac6b99d96750bb6b9f9aad4cb9cd91cd03f391.js +0 -3
data/application/js/min/b8abf302a824c35385ff517b34111e1710ff3b37.js +0 -2
data/application/js/min/c8efb9b9f7c3f6613fcebc6be60f605b6570a382.js +0 -90
data/application/static/diagonal-texture.png +0 -0
data/application/static/editing-0-noise.png +0 -0
data/application/static/editing-1-noise.png +0 -0
data/application/static/editing-texture-1.png +0 -0
data/application/static/editing-texture.png +0 -0
data/application/static/editing-toolbar-shadow-bottom.png +0 -0
data/application/static/editing-toolbar-shadow-top.png +0 -0
data/application/static/inner-glow.png +0 -0
data/application/static/item-buttons-highlight.png +0 -0
data/application/static/item-buttons.png +0 -0
data/application/static/paper-texture-dark.png +0 -0
data/application/static/plus_alt.svg +0 -8
data/application/static/select-arrow-root.png +0 -0
data/application/static/slot-up-arrow.png +0 -0
data/application/static/spontaneous.png +0 -0
data/lib/cutaneous/context_helper.rb +0 -187
data/lib/cutaneous/preview_context.rb +0 -32
data/lib/cutaneous/preview_renderer.rb +0 -10
data/lib/cutaneous/publish_context.rb +0 -10
data/lib/cutaneous/publish_renderer.rb +0 -14
data/lib/cutaneous/publish_template.rb +0 -62
data/lib/cutaneous/publish_token_parser.rb +0 -8
data/lib/cutaneous/renderer.rb +0 -124
data/lib/cutaneous/request_context.rb +0 -9
data/lib/cutaneous/request_renderer.rb +0 -15
data/lib/cutaneous/request_template.rb +0 -11
data/lib/cutaneous/request_token_parser.rb +0 -9
data/lib/cutaneous/token_parser.rb +0 -125
data/lib/cutaneous.rb +0 -48
data/lib/spontaneous/render/context_base.rb +0 -143
data/lib/spontaneous/render/development_renderer.rb +0 -14
data/lib/spontaneous/render/engine.rb +0 -19
data/lib/spontaneous/render/format/html.rb +0 -5
data/lib/spontaneous/render/format.rb +0 -75
data/lib/spontaneous/render/helpers/script_helper.rb +0 -17
data/lib/spontaneous/render/helpers/stylesheet_helper.rb +0 -16
data/lib/spontaneous/render/helpers.rb +0 -14
data/lib/spontaneous/render/preview_context.rb +0 -8
data/lib/spontaneous/render/preview_renderer.rb +0 -24
data/lib/spontaneous/render/publish_context.rb +0 -22
data/lib/spontaneous/render/published_renderer.rb +0 -53
data/lib/spontaneous/render/publishing_renderer.rb +0 -16
data/lib/spontaneous/render/render_cache.rb +0 -26
data/lib/spontaneous/render/renderer.rb +0 -50
data/lib/spontaneous/render/request_context.rb +0 -8
data/lib/spontaneous/render.rb +0 -214
data/test/experimental/test_cutaneous.rb +0 -309
data/test/fixtures/application/css/test.less +0 -5
data/test/slow/test_publishing.rb +0 -1006
/data/application/css/{developer.scss → developer.css.scss} +0 -0
/data/application/js/vendor/{jquery-1.7.1.min.js → jquery.js} +0 -0
/data/application/static/{location-arrow.png → location-arrow-c1c1d3ca472481c61a0a5f8cb289d743.png} +0 -0
/data/application/static/{missing.png → missing-911ce6dbd9f4602e0f3fbcd7e78846a2.png} +0 -0
/data/application/static/{orange-down-arrow.png → orange-down-arrow-395ae1929e8662b2ff0977daf12c35bb.png} +0 -0
/data/application/static/{page-browser-next.png → page-browser-next-ce781a242c23b980b99b9db7abc20b05.png} +0 -0
/data/application/static/{plus-box.png → plus-box-dcde74a1e496f68298c9b443caa1c5d5.png} +0 -0
/data/application/static/{select-arrow.png → select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png} +0 -0
/data/application/static/{slot-down-arrow.png → slot-down-arrow-59ad5f5ee5b52a7ebd00bca4b3104194.png} +0 -0
/data/application/static/{splash.png → splash-65b493a714df9b8b3ab170103401b53d.png} +0 -0
/data/application/static/{spot.png → spot-71fab1d2f065034f5fc15e7bea2ad36c.png} +0 -0
/data/application/static/{spot.svg → spot-8505041082d8d3bbe8d34c29dddb3b7d.svg} +0 -0
/data/application/static/{texture.png → texture-03f7627e8264b1d607113ab32c593a58.png} +0 -0

data/application/static/diagonal-texture.png DELETED Viewed

Binary file

data/application/static/editing-0-noise.png DELETED Viewed

Binary file

data/application/static/editing-1-noise.png DELETED Viewed

Binary file

data/application/static/editing-texture-1.png DELETED Viewed

Binary file

data/application/static/editing-texture.png DELETED Viewed

Binary file

data/application/static/editing-toolbar-shadow-bottom.png DELETED Viewed

Binary file

data/application/static/editing-toolbar-shadow-top.png DELETED Viewed

Binary file

data/application/static/inner-glow.png DELETED Viewed

Binary file

data/application/static/item-buttons-highlight.png DELETED Viewed

Binary file

data/application/static/item-buttons.png DELETED Viewed

Binary file

data/application/static/paper-texture-dark.png DELETED Viewed

Binary file

data/application/static/plus_alt.svg DELETED Viewed

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<path fill="#231F20" d="M16,0C7.165,0,0,7.164,0,16s7.165,16,16,16c8.837,0,16-7.164,16-16S24.837,0,16,0z M24,18h-6v6h-4v-6H8v-4h6
-	V8h4v6h6V18z"/>
-</svg>

data/application/static/select-arrow-root.png DELETED Viewed

Binary file

data/application/static/slot-up-arrow.png DELETED Viewed

Binary file

data/application/static/spontaneous.png DELETED Viewed

Binary file

data/lib/cutaneous/context_helper.rb DELETED Viewed

@@ -1,187 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  module ContextHelper
-    # include Spontaneous
-    attr_accessor :_buf, :_engine, :_layout
-    ## escape value. this method should be overrided in subclass.
-    def escape(val)
-      return val
-    end
-    ## include template. 'template_name' can be filename or short name.
-    def import(template_name, _append_to_buf=true)
-      _buf = self._buf
-      output = self._engine.render(template_name, context=self, layout=false)
-      _buf << output if _append_to_buf
-      return output
-    end
-    ## add value into _buf. this is equivarent to '#{value}'.
-    def echo(value)
-      self._buf << value
-    end
-    ##
-    ## start capturing.
-    ## returns captured string if block given, else return nil.
-    ## if block is not given, calling stop_capture() is required.
-    ##
-    ## ex. list.rbhtml
-    ##   <html><body>
-    ##     <h1><?rb start_capture(:title) do ?>Document Title<?rb end ?></h1>
-    ##     <?rb start_capture(:content) ?>
-    ##     <ul>
-    ##      <?rb for item in list do ?>
-    ##       <li>${item}</li>
-    ##      <?rb end ?>
-    ##     </ul>
-    ##     <?rb stop_capture() ?>
-    ##   </body></html>
-    ##
-    ## ex. layout.rbhtml
-    ##   <?xml version="1.0" ?>
-    ##   <html xml:lang="en">
-    ##    <head>
-    ##     <title>${@title}</title>
-    ##    </head>
-    ##    <body>
-    ##     <h1>${@title}</h1>
-    ##     <div id="content">
-    ##      <?rb echo(@content) ?>
-    ##     </div>
-    ##    </body>
-    ##   </html>
-    ##
-    def start_capture(varname=nil)
-      @_capture_varname = varname
-      @_start_position = self._buf.length
-      if block_given?
-        yield
-        output = stop_capture()
-        return output
-      else
-        return nil
-      end
-    end
-    ##
-    ## stop capturing.
-    ## returns captured string.
-    ## see start_capture()'s document.
-    ##
-    def stop_capture(store_to_context=true)
-      output = self._buf[@_start_position..-1]
-      self._buf[@_start_position..-1] = ''
-      @_start_position = nil
-      if @_capture_varname
-        self.instance_variable_set("@#{@_capture_varname}", output) if store_to_context
-        @_capture_varname = nil
-      end
-      return output
-    end
-    ##
-    ## if captured string is found then add it to _buf and return true,
-    ## else return false.
-    ## this is a helper method for layout template.
-    ##
-    def captured_as(name)
-      str = self.instance_variable_get("@#{name}")
-      return false unless str
-      @_buf << str
-      return true
-    end
-    def extends(parent)
-      self._layout = parent
-    end
-    def block_super
-      block_name = @_block_level.last
-      @_block_super_calls[block_name].push(@_buf.length - @_block_positions[block_name])
-    end
-    def block(block_name)
-      @_block_super_calls ||= Hash.new { |h, k| h[k] = [] }
-      @_block_positions ||= {}
-      @_block_content ||= {}
-      @_block_level ||= []
-      block_name = block_name.to_sym
-      @_block_positions[block_name] = @_buf.length
-      @_block_level << block_name
-      if block_given?
-        yield
-        output = endblock
-      end
-    end
-    # the _block_name param is ignored though could throw warning if the two are different
-    def endblock(_block_name=nil)
-      block_name = @_block_level.pop
-      return unless block_name
-      start_position = @_block_positions[block_name]
-      output = @_buf[start_position..-1]
-      @_buf[start_position..-1] = ''
-      if @_block_content.key?(block_name)
-        super_calls = @_block_super_calls[block_name]
-        result = @_block_content[block_name]
-        if !super_calls.empty?
-          position = super_calls.pop
-          result = result[0...position] << output << (result[(position)..-1] || "")
-          if _layout
-            if (super_call_position = @_block_super_calls[block_name].last)
-              @_block_super_calls[block_name][-1] = super_call_position + position
-              @_block_content[block_name] = result
-            end
-          end
-        end
-        @_buf << result
-      else
-        if _layout.nil?
-          @_buf << output
-        else
-          @_block_content[block_name] = output
-        end
-      end
-      output
-    end
-    def include(filename, locals = {})
-      import(filename, true, locals)
-    end
-    ## include template. 'template_name' can be filename or short name.
-    def import(template_name, _append_to_buf=true, locals={})
-      _buf = self._buf
-      context=self._dup_with_locals(locals)
-      output = self._engine.render(template_name, context, layout=false)
-      _buf << output if _append_to_buf
-      output
-    end
-    protected
-    def _dup_with_locals(locals = {})
-      self.dup.tap { |context| context._update(locals) }
-    end
-    def _decode_params(param)
-      unless param.is_a?(String)
-        @_render_method ||= "to_#{_format}".to_sym
-        if param.respond_to?(@_render_method)
-          param = param.send(@_render_method)
-        else
-          if param.respond_to?(:render)
-            param = param.render(_format, self)
-          end
-        end
-      end
-      # super(param)
-      param.to_s
-    end
-  end
-end

data/lib/cutaneous/preview_context.rb DELETED Viewed

@@ -1,32 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class PreviewContext
-    include ContextHelper
-    include Spontaneous::Render::PreviewContext
-    def include(filename, locals={})
-      _comment(filename)
-      import(filename, true, locals)
-    end
-    def _decode_params(param, *args)
-      if param.respond_to?(:start_inline_edit_marker)
-        _comment(param.start_inline_edit_marker) << super << _comment(param.end_inline_edit_marker)
-      else
-        super
-      end
-    end
-    def _comment(text)
-      @_comment_method ||= "_comment_#{_format}".to_sym
-      if (respond_to?(@_comment_method))
-        self.send(@_comment_method, text)
-      end
-    end
-    def _comment_html(text)
-      "<!-- #{escape(text.to_s.escape_html)} -->\n"
-    end
-  end
-end

data/lib/cutaneous/preview_renderer.rb DELETED Viewed

@@ -1,10 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class PreviewRenderer < PublishRenderer
-    def context_class
-      Cutaneous::PreviewContext
-    end
-  end
-end

data/lib/cutaneous/publish_context.rb DELETED Viewed

@@ -1,10 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class PublishContext
-    include ContextHelper
-    include Spontaneous::Render::PublishContext
-  end
-end

data/lib/cutaneous/publish_renderer.rb DELETED Viewed

@@ -1,14 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class PublishRenderer < Renderer
-    def template_class
-      Cutaneous::PublishTemplate
-    end
-    def context_class
-      Cutaneous::PublishContext
-    end
-  end
-end

data/lib/cutaneous/publish_template.rb DELETED Viewed

@@ -1,62 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class PublishTemplate
-    attr_reader   :parser
-    attr_writer   :script
-    attr_accessor :timestamp, :filename
-    def initialize(template_file = nil, format=:html)
-      @format = format
-      convert_file(template_file) if template_file
-    end
-    def convert_file(template_file)
-      convert(File.read(template_file), template_file)
-    end
-    def convert(template_string, filepath = nil)
-      @template_proc = @script = nil
-      @filename = filepath
-      @parser = create_parser(template_string)
-      script
-    end
-    def script
-      return nil unless @parser or @script
-      @script ||= @parser.script
-    end
-    # I'm not doing any type checking here as I know exactly where the calls are coming from
-    def render(context)
-      begin
-        context.instance_eval(&template_proc)
-      rescue => e
-        if context.show_errors?
-          raise e
-        else
-          logger.warn(e)
-          ""
-        end
-      end
-    end
-    protected
-    def template_proc
-      @template_proc ||= eval(template_proc_src.untaint, nil, @filename || '(cutaneous)')
-    end
-    def template_proc_src
-      "lambda { |context| self._buf = _buf = ''; #{script}; _buf.to_s }"
-    end
-    def create_parser(template_string)
-      parser_class.new(template_string)
-    end
-    def parser_class
-      Cutaneous::PublishTokenParser
-    end
-  end
-end

data/lib/cutaneous/publish_token_parser.rb DELETED Viewed

@@ -1,8 +0,0 @@
-module Cutaneous
-  PublishTokenParser = Cutaneous::TokenParser.generate({
-    :comment => %w(!{ }),
-    :expression => %w(${ }),
-    :escaped_expression => %w($${ }),
-    :statement => %w(%{ })
-  })
-end # Cutaneous

data/lib/cutaneous/renderer.rb DELETED Viewed

@@ -1,124 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class Renderer# < Spontaneous::Renderer
-    attr_reader :template_root, :cache_root
-    def initialize(template_root, cache = nil)
-      @template_root = template_root
-      @cache = cache
-    end
-    def use_cache?
-      @cache
-    end
-    def extension
-      Cutaneous.extension
-    end
-    def render_string(string, content, format = :html, params = {})
-      template = string_to_template(string)
-      render_template(template, content, format, params)
-    end
-    def render_file(file_path, content, format = :html, params = {})
-      template = get_template(file_path, format)
-      render_template(template, content, format, params)
-    end
-    def render(filename, context, _layout=true)
-      hook_context(context)
-      while true
-        template = get_template(filename, context.format)
-        _buf = context._buf
-        output = template.render(context)
-        context._buf = _buf
-        unless context._layout.nil?
-          layout = context._layout
-          # context._clean!
-          context._layout = nil
-        end
-        break unless layout
-        filename = layout
-        layout = false
-      end
-      output
-    end
-    protected
-    def render_template(template, content, format, params = {})
-      context = context_class.new(content, format, params)
-      render(template, context)
-    end
-    def create_template(filepath, format)
-      template = template_class.new(nil, format)
-      case filepath
-      when String
-        template.timestamp = Time.now
-        template.filename = filepath
-        if use_cache?
-          cache_path = filepath[0...(-Cutaneous.extension.length)] + 'rb'
-          if test(?f, cache_path)
-            # puts "Using cached template #{cache_path}"
-            template.filename = cache_path
-            template.script = File.read(cache_path)
-          else
-            template.convert(File.read(filepath), filepath)
-            File.open(cache_path, 'w') do |f|
-              f.flock(File::LOCK_EX)
-              f.write(template.script)
-            end
-          end
-        else
-          template.convert(File.read(filepath), filepath)
-        end
-      when Proc
-        template = template_class.new(nil, format)
-        template.convert(filepath.call, filepath.to_s)
-      end
-      template
-    end
-    def get_template(template, format)
-      case template
-      when String
-        # if the path is absolute and points to an existing file, just render that
-        # used by the published renderer
-        filepath = make_path_absolute(template, format)
-        create_template(filepath, format)
-      when Proc
-        create_template(template, format)
-      else
-        template
-      end
-    end
-    def make_path_absolute(path, format)
-      if ::File.file?(path)
-        path
-      else
-        Spontaneous::Render.find_template(path, format)
-      end
-    end
-    def string_to_template(string)
-      template = template_class.new
-      template.convert(string)
-      template
-    end
-    def hook_context(context)
-      context._engine = self
-      context._layout = nil
-      context
-    end
-  end
-end

data/lib/cutaneous/request_context.rb DELETED Viewed

@@ -1,9 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class RequestContext
-    include ContextHelper
-    include Spontaneous::Render::RequestContext
-  end
-end

data/lib/cutaneous/request_renderer.rb DELETED Viewed

@@ -1,15 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class RequestRenderer < Renderer
-    def template_class
-      Cutaneous::RequestTemplate
-    end
-    def context_class
-      Cutaneous::RequestContext
-    end
-  end
-end

data/lib/cutaneous/request_template.rb DELETED Viewed

@@ -1,11 +0,0 @@
-# encoding: UTF-8
-module Cutaneous
-  class RequestTemplate < PublishTemplate
-    protected
-    def parser_class
-      Cutaneous::RequestTokenParser
-    end
-  end
-end

data/lib/cutaneous/request_token_parser.rb DELETED Viewed

@@ -1,9 +0,0 @@
-module Cutaneous
-  RequestTokenParser = Cutaneous::TokenParser.generate({
-    :comment => %w(!{ }),
-    :expression => %w({{ }}),
-    :escaped_expression => %w({$ $}),
-    :statement => %w({% %})
-  })
-end # Cutaneous

data/lib/cutaneous/token_parser.rb DELETED Viewed

@@ -1,125 +0,0 @@
-# encoding: UTF-8
-require 'strscan'
-module Cutaneous
-  class TokenParser
-    class << self
-      attr_accessor :tags
-    end
-    module ClassMethods
-      def generate(tag_definitions)
-        parser_class = Class.new(Cutaneous::TokenParser)
-        parser_class.tags = tag_definitions
-        parser_class
-      end
-      def is_dynamic?(text)
-        !text.index(tag_start_pattern).nil?
-      end
-      def tag_start_pattern
-        @tag_start_pattern ||= compile_start_pattern
-      end
-      def compile_start_pattern
-        openings = self.tags.map { |type, tags| Regexp.escape(tags[0]) }
-        Regexp.new("#{ openings.join("|") }")
-      end
-      # map the set of tags into a hash used by the parse routine that converts an opening tag into a
-      # list of: tag type, the number of opening braces in the tag and the length of the closing tag
-      def token_map
-        @token_map ||= Hash[tags.map { |type, tags| [tags[0], [type, tags[0].count(?{), tags[1].length]] }]
-      end
-    end
-    extend ClassMethods
-    def initialize(template)
-      @template = template
-    end
-    def tokens
-      @tokens ||= parse
-    end
-    def script
-      @script ||= compile
-    end
-    protected
-    BRACES ||= /\{|\}/
-    def parse
-      tokens    = []
-      scanner   = StringScanner.new(@template)
-      tag_start = self.class.tag_start_pattern
-      tags      = self.class.tags
-      token_map = self.class.token_map
-      previous  = nil
-      while (text = scanner.scan_until(tag_start))
-        tag = scanner.matched
-        type, brace_count, endtag_length = token_map[tag]
-        text.slice!(text.length - tag.length, text.length)
-        expression = ""
-        begin
-          expression << scanner.scan_until(BRACES)
-          brace = scanner.matched
-          brace_count += ((123 - brace.ord)+1)
-        end while (brace_count > 0)
-        expression.slice!(expression.length - endtag_length, expression.length)
-        tokens << place_text_token(text, previous, type) if text.length > 0
-        tokens << create_token(type, expression)
-        previous = type
-      end
-      tokens << place_text_token(scanner.rest, previous, nil) unless scanner.eos?
-      tokens
-    end
-    def create_token(type, expression)
-      expression.strip! if type == :expression || type == :escaped_expression || type == :statement
-      [type, expression]
-    end
-    BEGINNING_WHITESPACE ||= /\A\s*?[\r\n]+/
-    ENDING_WHITESPACE    ||= /(\r?\n)[ \t]*\z/
-    ESCAPE_STRING        ||= /[`\\]/
-    def place_text_token(expression, preceeding_type, following_type)
-      if preceeding_type == :statement || preceeding_type == :comment
-        expression.gsub!(BEGINNING_WHITESPACE, '')
-      end
-      if following_type == :statement || following_type == :comment
-        expression.gsub!(ENDING_WHITESPACE, '\1')
-      end
-      expression.gsub!(ESCAPE_STRING, '\\\\\&')
-      [:text, expression]
-    end
-    def compile
-      script = ""
-      tokens.each do |type, expression|
-        case type
-        when :expression
-          script << %{_buf << _decode_params((} << expression << %{))\n}
-        when :text
-          script << %(_buf << %Q`) << expression << %(`\n)
-        when :statement
-          script << expression << "\n"
-        when :escaped_expression
-          script << %{_buf << escape(_decode_params((} << expression << %{)))\n}
-        end
-      end
-      script
-    end
-  end
-end