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/lib/cutaneous/context_helper.rb CHANGED Viewed

@@ -3,9 +3,97 @@
 module Cutaneous
   module ContextHelper
-    include Tenjin::ContextHelper
-    include Spontaneous::Render::Context
-    include Spontaneous
+    # 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)
@@ -45,8 +133,10 @@ module Cutaneous
           position = super_calls.pop
           result = result[0...position] << output << (result[(position)..-1] || "")
           if _layout
-            @_block_super_calls[block_name][-1] = @_block_super_calls[block_name].last + position
-            @_block_content[block_name] = result
+            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
@@ -60,23 +150,38 @@ module Cutaneous
       output
     end
-    def include(filename)
-      import(filename)
+    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 _decode_params(param, *args)
+    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
+        @_render_method ||= "to_#{_format}".to_sym
         if param.respond_to?(@_render_method)
-          param = param.send(@_render_method, *args)
-        end
-        if param.respond_to?(:render)
-          param = param.render(format, *args)
+          param = param.send(@_render_method)
+        else
+          if param.respond_to?(:render)
+            param = param.render(_format, self)
+          end
         end
       end
-      super(param)
+      # super(param)
+      param.to_s
     end
   end
 end

data/lib/cutaneous/preview_context.rb CHANGED Viewed

@@ -3,10 +3,11 @@
 module Cutaneous
   class PreviewContext
     include ContextHelper
+    include Spontaneous::Render::PreviewContext
-    def include(filename)
+    def include(filename, locals={})
       _comment(filename)
-      import(filename)
+      import(filename, true, locals)
     end
     def _decode_params(param, *args)
@@ -18,7 +19,7 @@ module Cutaneous
     end
     def _comment(text)
-      @_comment_method ||= "_comment_#{format}".to_sym
+      @_comment_method ||= "_comment_#{_format}".to_sym
       if (respond_to?(@_comment_method))
         self.send(@_comment_method, text)
       end

data/lib/cutaneous/preview_renderer.rb CHANGED Viewed

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

data/lib/cutaneous/publish_context.rb CHANGED Viewed

@@ -3,6 +3,7 @@
 module Cutaneous
   class PublishContext
     include ContextHelper
+    include Spontaneous::Render::PublishContext
   end
 end

data/lib/cutaneous/{first_pass_renderer.rb → publish_renderer.rb} RENAMED Viewed

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 module Cutaneous
-  class FirstPassRenderer < Renderer
+  class PublishRenderer < Renderer
     def template_class
-      Cutaneous::FirstPassParser
+      Cutaneous::PublishTemplate
     end
     def context_class
@@ -12,7 +12,3 @@ module Cutaneous
     end
   end
 end

data/lib/cutaneous/publish_template.rb ADDED Viewed

@@ -0,0 +1,62 @@
+# 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 ADDED Viewed

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

data/lib/cutaneous/renderer.rb CHANGED Viewed

@@ -36,6 +36,7 @@ module Cutaneous
         context._buf = _buf
         unless context._layout.nil?
           layout = context._layout
+          # context._clean!
           context._layout = nil
         end
         break unless layout
@@ -63,16 +64,17 @@ module Cutaneous
           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))
+            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))
+          template.convert(File.read(filepath), filepath)
         end
       when Proc
         template = template_class.new(nil, format)

data/lib/cutaneous/request_context.rb CHANGED Viewed

@@ -3,6 +3,7 @@
 module Cutaneous
   class RequestContext
     include ContextHelper
+    include Spontaneous::Render::RequestContext
   end
 end

data/lib/cutaneous/{second_pass_renderer.rb → request_renderer.rb} RENAMED Viewed

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 module Cutaneous
-  class SecondPassRenderer < Renderer
+  class RequestRenderer < Renderer
     def template_class
-      Cutaneous::SecondPassParser
+      Cutaneous::RequestTemplate
     end
     def context_class
@@ -13,6 +13,3 @@ module Cutaneous
   end
 end

data/lib/cutaneous/request_template.rb ADDED Viewed

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

data/lib/cutaneous/request_token_parser.rb ADDED Viewed

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

data/lib/cutaneous/token_parser.rb ADDED Viewed

@@ -0,0 +1,125 @@
+# 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