skylinecms 3.1.0 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +5 -0
- data/CHANGELOG +51 -1
- data/Gemfile +8 -0
- data/Rakefile +0 -43
- data/app/controllers/skyline/application_controller.rb +30 -26
- data/app/controllers/skyline/articles_controller.rb +8 -28
- data/app/controllers/skyline/authentications_controller.rb +6 -8
- data/app/controllers/skyline/browser/links_controller.rb +12 -8
- data/app/controllers/skyline/browser/tabs/linkables_controller.rb +9 -0
- data/app/controllers/skyline/browser/tabs/media_library/media_files_controller.rb +0 -12
- data/app/controllers/skyline/content/editors/editable_list_controller.rb +0 -4
- data/app/controllers/skyline/content/editors/joinable_list_controller.rb +1 -19
- data/app/controllers/skyline/content_controller.rb +14 -30
- data/app/controllers/skyline/content_items_controller.rb +3 -9
- data/app/controllers/skyline/content_sections_controller.rb +3 -10
- data/app/controllers/skyline/link_section_links_controller.rb +2 -10
- data/app/controllers/skyline/media/data_controller.rb +24 -14
- data/app/controllers/skyline/media/dirs_controller.rb +12 -26
- data/app/controllers/skyline/media/files_controller.rb +12 -28
- data/app/controllers/skyline/publications_controller.rb +0 -12
- data/app/controllers/skyline/published_publications_controller.rb +0 -4
- data/app/controllers/skyline/sections_controller.rb +4 -18
- data/app/controllers/skyline/site/media_files_data_controller.rb +11 -13
- data/app/controllers/skyline/site/pages_controller.rb +4 -3
- data/app/controllers/skyline/skyline2_controller.rb +1 -1
- data/app/controllers/skyline/users_controller.rb +7 -31
- data/app/controllers/skyline/variant_current_editor_controller.rb +5 -5
- data/app/controllers/skyline/variants_controller.rb +3 -3
- data/app/helpers/skyline/application_helper.rb +16 -5
- data/app/helpers/skyline/button_helper.rb +12 -18
- data/app/helpers/skyline/content_helper.rb +11 -11
- data/app/helpers/skyline/dialog_helper.rb +3 -2
- data/app/helpers/skyline/editors/checkable_list.rb +4 -2
- data/app/helpers/skyline/editors/date_time.rb +1 -1
- data/app/helpers/skyline/editors/display.rb +1 -1
- data/app/helpers/skyline/editors/editable_list.rb +13 -8
- data/app/helpers/skyline/editors/editor.rb +10 -10
- data/app/helpers/skyline/editors/list.rb +2 -2
- data/app/helpers/skyline/editors/page_browser.rb +1 -0
- data/app/helpers/skyline/editors/wysiwyg.rb +2 -3
- data/app/helpers/skyline/form_helper.rb +36 -0
- data/app/helpers/skyline/media/files_helper.rb +1 -1
- data/app/helpers/skyline/message_generator.rb +13 -4
- data/app/helpers/skyline/pages_helper.rb +1 -1
- data/app/helpers/skyline/plugin_helper.rb +1 -1
- data/app/helpers/skyline/presenters/presenter.rb +12 -8
- data/app/helpers/skyline/ref_object_helper.rb +9 -7
- data/app/helpers/skyline/translation_helper.rb +1 -1
- data/app/helpers/skyline/tree_helper.rb +1 -3
- data/app/middleware/skyline/flash_session_cookie_middleware.rb +6 -1
- data/app/middleware/skyline/plugins_loader_middleware.rb +1 -1
- data/app/middleware/skyline/sprockets_middleware.rb +1 -1
- data/app/models/skyline/article.rb +94 -26
- data/app/models/skyline/article_version.rb +22 -9
- data/app/models/skyline/image_ref.rb +1 -1
- data/app/models/skyline/inline_ref.rb +78 -62
- data/app/models/skyline/link_ref.rb +1 -1
- data/app/models/skyline/media_cache.rb +4 -2
- data/app/models/skyline/media_file.rb +2 -5
- data/app/models/skyline/media_node.rb +2 -2
- data/app/models/skyline/object_ref.rb +2 -2
- data/app/models/skyline/page.rb +8 -6
- data/app/models/skyline/page_fragment.rb +4 -2
- data/app/models/skyline/publication.rb +1 -1
- data/app/models/skyline/sections/content_collection_section.rb +1 -1
- data/app/models/skyline/sections/link_section.rb +1 -1
- data/app/models/skyline/user.rb +17 -7
- data/app/models/skyline/user_preference.rb +1 -1
- data/app/models/skyline/variant.rb +11 -5
- data/app/templates/skyline/page/default/index.html.erb +1 -1
- data/app/templates/skyline/sections/raw_section/default/index.html.erb +1 -1
- data/app/templates/skyline/sections/wysiwyg_section/default/index.html.erb +1 -1
- data/app/views/skyline/articles/_currently_editing.html.erb +1 -1
- data/app/views/skyline/articles/_meta.html.erb +24 -11
- data/app/views/skyline/articles/_security.html.erb +2 -2
- data/app/views/skyline/articles/_takeover_action.html.erb +1 -1
- data/app/views/skyline/articles/edit.html.erb +29 -16
- data/app/views/skyline/articles/edit_preview_only.html.erb +2 -2
- data/app/views/skyline/articles/index.html.erb +2 -2
- data/app/views/skyline/articles/page/_header.html.erb +1 -1
- data/app/views/skyline/articles/page/_index.html.erb +9 -3
- data/app/views/skyline/articles/page_fragment/_index.html.erb +7 -2
- data/app/views/skyline/articles/update.js.erb +20 -0
- data/app/views/skyline/authentications/new.html.erb +1 -1
- data/app/views/skyline/browser/links/_index.html.erb +2 -0
- data/app/views/skyline/browser/tabs/linkables/_index.html.erb +29 -0
- data/app/views/skyline/browser/tabs/linkables/_show.html.erb +67 -0
- data/app/views/skyline/browser/tabs/linkables/show.js.erb +4 -0
- data/app/views/skyline/browser/tabs/media_library/_index.html.erb +2 -2
- data/app/views/skyline/browser/tabs/media_library/media_files/_index.html.erb +4 -35
- data/app/views/skyline/browser/tabs/media_library/media_files/_show.html.erb +1 -3
- data/app/views/skyline/browser/tabs/media_library/media_files/index.js.erb +1 -0
- data/app/views/skyline/browser/tabs/media_library/media_files/show.js.erb +1 -0
- data/app/views/skyline/browser/tabs/pages/_index.html.erb +1 -1
- data/app/views/skyline/content/_add.rhtml +6 -1
- data/app/views/skyline/content/_filter.rhtml +1 -1
- data/app/views/skyline/content/_import.html.erb +1 -1
- data/app/views/skyline/content/_index.html.erb +2 -2
- data/app/views/skyline/content/_meta.html.erb +2 -2
- data/app/views/skyline/content/create.rhtml +1 -1
- data/app/views/skyline/content/edit.rhtml +1 -1
- data/app/views/skyline/content/editors/editable_list/new.js.erb +2 -0
- data/app/views/skyline/content/editors/joinable_list/_add.html.erb +17 -10
- data/app/views/skyline/content/editors/joinable_list/_list.html.erb +24 -8
- data/app/views/skyline/content/editors/joinable_list/cancel.js.erb +1 -0
- data/app/views/skyline/content/editors/joinable_list/index.js.erb +1 -0
- data/app/views/skyline/content/editors/joinable_list/new.js.erb +5 -0
- data/app/views/skyline/content/field.js.erb +2 -0
- data/app/views/skyline/content/import.js.erb +4 -0
- data/app/views/skyline/content/order.js.erb +6 -0
- data/app/views/skyline/content/presenters/_table.html.erb +1 -1
- data/app/views/skyline/content_items/_content_item.html.erb +2 -2
- data/app/views/skyline/content_items/new.js.erb +6 -0
- data/app/views/skyline/content_sections/_tags.html.erb +2 -2
- data/app/views/skyline/content_sections/new.js.erb +6 -0
- data/app/views/skyline/link_section_links/_form.html.erb +1 -1
- data/app/views/skyline/link_section_links/new.js.erb +4 -0
- data/app/views/skyline/locales/show.js.erb +3 -3
- data/app/views/skyline/media/dirs/_edit.html.erb +9 -7
- data/app/views/skyline/media/dirs/edit.js.erb +1 -0
- data/app/views/skyline/media/dirs/index.html.erb +16 -6
- data/app/views/skyline/media/dirs/index.js.erb +6 -0
- data/app/views/skyline/media/dirs/show.js.erb +5 -0
- data/app/views/skyline/media/files/_edit.html.erb +13 -11
- data/app/views/skyline/media/files/_index.html.erb +2 -2
- data/app/views/skyline/media/files/_new.html.erb +2 -2
- data/app/views/skyline/media/files/edit.js.erb +4 -0
- data/app/views/skyline/media/files/index.js.erb +4 -0
- data/app/views/skyline/media/files/update.js.erb +8 -0
- data/app/views/skyline/publications/_index.html.erb +2 -2
- data/app/views/skyline/publications/index.js.erb +9 -0
- data/app/views/skyline/sections/_content_collection_section.html.erb +6 -6
- data/app/views/skyline/sections/_content_item_section.html.erb +1 -1
- data/app/views/skyline/sections/_form.html.erb +4 -4
- data/app/views/skyline/sections/_link_section.html.erb +6 -1
- data/app/views/skyline/sections/_splitter_section.html.erb +1 -1
- data/app/views/skyline/sections/_wysiwyg_section.html.erb +2 -2
- data/app/views/skyline/sections/new.js.erb +12 -0
- data/app/views/skyline/settings/edit.html.erb +1 -1
- data/app/views/skyline/shared/_head.html.erb +3 -0
- data/app/views/skyline/shared/_header_area.html.erb +5 -5
- data/app/views/skyline/users/_edit.html.erb +1 -1
- data/app/views/skyline/users/_form.html.erb +1 -1
- data/app/views/skyline/users/_new.html.erb +1 -1
- data/app/views/skyline/users/create.js.erb +2 -0
- data/app/views/skyline/users/edit.js.erb +1 -0
- data/app/views/skyline/users/index.html.erb +21 -6
- data/app/views/skyline/users/new.js.erb +1 -0
- data/app/views/skyline/users/update.js.erb +2 -0
- data/config/initializers/dependencies.rb +1 -17
- data/config/initializers/gem_dependencies.rb +10 -0
- data/config/initializers/locales.rb +8 -1
- data/config/initializers/middlewares.rb +7 -3
- data/config/initializers/observers.rb +6 -4
- data/config/locales/en-US.yml +44 -34
- data/config/locales/nl-NL.yml +45 -33
- data/config/routes.rb +65 -74
- data/db/migrate/20090508145820_create_skyline_pages.rb +2 -2
- data/db/migrate/20090508145852_create_skyline_page_versions.rb +2 -2
- data/db/migrate/20090508150149_create_skyline_sections.rb +1 -1
- data/db/migrate/20090610142139_add_skyline_tags_taggable_type.rb +2 -2
- data/db/migrate/20090624154251_create_skyline_link_section_links.rb +1 -1
- data/db/migrate/20100120113953_remove_unused_articles_index.rb +1 -1
- data/db/migrate/20110816080626_add_skyline_test_article_data.rb +13 -0
- data/db/migrate/20111101092405_rename_indexes.rb +24 -0
- data/doc/INSTALL.md +54 -27
- data/doc/MIGRATION.md +27 -2
- data/lib/skyline.rb +2 -1
- data/lib/skyline/authentication/user.rb +80 -0
- data/lib/skyline/belongs_to_referable.rb +1 -1
- data/lib/skyline/cli/init.rb +14 -26
- data/lib/skyline/cli/init/templates/config/initializers/skyline_configuration.rb +0 -1
- data/lib/skyline/configuration.rb +74 -32
- data/lib/skyline/content/content.rb +7 -6
- data/lib/skyline/content/field_meta_data.rb +2 -2
- data/lib/skyline/content/stack.rb +1 -1
- data/lib/skyline/content_item_section_selectable.rb +4 -4
- data/lib/skyline/deprecated/version3_0_8.rb +2 -2
- data/lib/skyline/engine.rb +37 -0
- data/lib/skyline/form_builder.rb +8 -8
- data/lib/skyline/linkable.rb +28 -0
- data/lib/skyline/plugins/manager.rb +77 -0
- data/lib/skyline/plugins/plugin.rb +89 -0
- data/lib/skyline/rendering/helpers/renderer_helper.rb +1 -1
- data/lib/skyline/rendering/renderer.rb +27 -13
- data/lib/skyline/route_constraint.rb +15 -0
- data/lib/skyline/settings.rb +9 -7
- data/lib/skyline/taggable.rb +2 -2
- data/lib/skyline/version.rb +4 -4
- data/lib/skylinecms.rb +5 -3
- data/lib/tasks/database.rake +2 -2
- data/public/skyline/javascripts/src/application.js +5 -4
- data/public/skyline/javascripts/src/rails.js +165 -0
- data/public/skyline/javascripts/src/sections.js +6 -9
- data/public/skyline/javascripts/src/skyline.editor/src/plugins/autoresize/editor_plugin.js +72 -27
- data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylineimage/dialog.js +13 -12
- data/public/skyline/javascripts/src/skyline.editor/src/plugins/skylinelink/dialog.js +7 -7
- data/public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js +4 -3
- data/public/skyline/javascripts/src/skyline.editor/src/theme.js +101 -536
- data/public/skyline/javascripts/src/skyline.editor/test/multiple_editors.html +1 -0
- data/public/skyline/javascripts/src/skyline.editor/test/single.html +56 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/changelog.txt +1410 -1091
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/accessibility.html +101 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/custom_formats.html +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/full.html +12 -12
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/lists/media_list.js +5 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/media/sample.flv +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/menu.html +2 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/skins.html +4 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/word.html +3 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/langs/en.js +1 -170
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js +1 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm +30 -29
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm +34 -31
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +32 -13
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js +1 -43
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js +21 -17
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js +1 -52
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm +35 -30
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js +31 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js +172 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js +23 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js +14 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +34 -21
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm +15 -14
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js +1 -20
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js +50 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css +3 -42
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js +315 -63
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm +18 -330
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js +199 -438
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js +1 -85
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js +12 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm +2 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js +80 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js +2 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +31 -28
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js +781 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/media.css +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js +703 -295
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js +361 -602
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js +1 -103
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm +365 -285
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +4 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js +7 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js +1 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +148 -239
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js +1 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js +4 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js +18 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js +1 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm +17 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js +55 -38
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/js/props.js +3 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js +1 -63
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/style/props.htm +515 -398
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js +122 -112
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/cell.htm +16 -14
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js +1364 -1139
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js +44 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js +18 -18
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/table.js +15 -14
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js +1 -74
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm +11 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/row.htm +12 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/table/table.htm +54 -53
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/js/template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js +1 -15
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js +36 -20
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm +6 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm +9 -8
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js +6 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm +11 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js +1 -16
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js +2 -12
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js +3 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js +4 -13
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js +1 -32
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/about.htm +3 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm +5 -5
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm +39 -40
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm +10 -9
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +195 -54
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/image.htm +51 -51
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/pagebreak → themes/advanced}/img/pagebreak.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/realmedia.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/trans.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/{plugins/media → themes/advanced}/img/windowsmedia.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js +5 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js +26 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js +108 -32
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js +12 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js +4 -7
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js +6 -12
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js +1 -62
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -51
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/link.htm +27 -28
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm +47 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css +14 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css +5 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +105 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +102 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css +12 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +1 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +8 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm +3 -3
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js +1 -2
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js +1 -11
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_popup.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/tiny_mce_src.js +7838 -5579
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/editable_selects.js +1 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/form_utils.js +14 -4
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/mctabs.js +95 -10
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/utils/validate.js +35 -3
- data/public/skyline/javascripts/src/skyline/src/drag.js +10 -7
- data/public/skyline/javascripts/src/skyline/src/layout.js +13 -12
- data/public/skyline/javascripts/src/skyline/src/menubutton.js +1 -3
- data/public/skyline/javascripts/src/skyline/src/sortable.js +7 -5
- data/public/skyline/javascripts/src/skyline/src/tree.js +8 -4
- data/public/skyline/javascripts/src/skyline/test/sortable.html +73 -12
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-core.js +485 -2
- data/public/skyline/javascripts/src/skyline/vendor/mootools/mootools-more.js +130 -81
- data/public/skyline/stylesheets/general.css +23 -6
- data/skylinecms.gemspec +45 -0
- data/test/mocks/test_article.rb +11 -0
- data/test/mocks/test_section.rb +1 -1
- data/test/test_helper.rb +2 -1
- data/test/unit/article_test.rb +142 -0
- data/test/unit/inline_ref_test.rb +38 -16
- data/test/unit/test_content_object_test.rb +2 -1
- data/vendor/digitpaint/nested_attributes_positioning.rb +1 -1
- metadata +207 -487
- data/app/helpers/skyline/media_files_helper.rb +0 -7
- data/config/initializers/javascript_generator_methods.rb +0 -4
- data/config/initializers/rails_defaults.rb +0 -6
- data/doc/Bundler.md +0 -76
- data/lib/skyline/plugins_manager.rb +0 -150
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/examples/translate.html +0 -84
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css +0 -6
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css +0 -1
- data/public/skyline/javascripts/src/skyline.editor/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif +0 -0
- data/rails/init.rb +0 -32
- data/vendor/digitpaint/personify/README.md +0 -86
- data/vendor/digitpaint/personify/lib/parser/personify.rb +0 -838
- data/vendor/digitpaint/personify/lib/parser/personify.treetop +0 -126
- data/vendor/digitpaint/personify/lib/parser/personify_node_classes.rb +0 -7
- data/vendor/digitpaint/personify/lib/template.rb +0 -16
- data/vendor/digitpaint/personify/personify.rb +0 -7
- data/vendor/digitpaint/personify/script/generate_parser.rb +0 -6
- data/vendor/digitpaint/personify/test/fixtures/multiple_tags.txt +0 -8
- data/vendor/digitpaint/personify/test/parse_runner.rb +0 -25
- data/vendor/digitpaint/personify/test/parser_test.rb +0 -109
- data/vendor/digitpaint/personify/test/test_helper.rb +0 -16
- data/vendor/digitpaint/personify/vendor/treetop/.gitignore +0 -5
- data/vendor/digitpaint/personify/vendor/treetop/History.txt +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/README +0 -164
- data/vendor/digitpaint/personify/vendor/treetop/Rakefile +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/grammar ___ end.tmSnippet +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Snippets/rule ___ end.tmSnippet +0 -18
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/Syntaxes/Treetop Grammar.tmLanguage +0 -251
- data/vendor/digitpaint/personify/vendor/treetop/Treetop.tmbundle/info.plist +0 -10
- data/vendor/digitpaint/personify/vendor/treetop/bin/tt +0 -28
- data/vendor/digitpaint/personify/vendor/treetop/doc/contributing_and_planned_features.markdown +0 -103
- data/vendor/digitpaint/personify/vendor/treetop/doc/grammar_composition.markdown +0 -65
- data/vendor/digitpaint/personify/vendor/treetop/doc/index.markdown +0 -90
- data/vendor/digitpaint/personify/vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown +0 -51
- data/vendor/digitpaint/personify/vendor/treetop/doc/semantic_interpretation.markdown +0 -189
- data/vendor/digitpaint/personify/vendor/treetop/doc/site.rb +0 -110
- data/vendor/digitpaint/personify/vendor/treetop/doc/sitegen.rb +0 -60
- data/vendor/digitpaint/personify/vendor/treetop/doc/syntactic_recognition.markdown +0 -100
- data/vendor/digitpaint/personify/vendor/treetop/doc/using_in_ruby.markdown +0 -21
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.rb +0 -551
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic.treetop +0 -97
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_node_classes.rb +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/arithmetic_test.rb +0 -54
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus +0 -0
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.rb +0 -718
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus.treetop +0 -132
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_node_classes.rb +0 -5
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/lambda_calculus_test.rb +0 -89
- data/vendor/digitpaint/personify/vendor/treetop/examples/lambda_calculus/test_helper.rb +0 -18
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop.rb +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb +0 -45
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler.rb +0 -6
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb +0 -40
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb +0 -17
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.rb +0 -2955
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/metagrammar.treetop +0 -404
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes.rb +0 -19
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb +0 -14
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb +0 -22
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb +0 -31
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb +0 -24
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb +0 -28
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb +0 -27
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb +0 -13
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb +0 -19
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb +0 -138
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb +0 -55
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb +0 -45
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb +0 -55
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb +0 -68
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb +0 -20
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/ruby_builder.rb +0 -113
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions.rb +0 -2
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/ruby_extensions/string.rb +0 -42
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime.rb +0 -5
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/compiled_parser.rb +0 -95
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb +0 -4
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb +0 -15
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb +0 -200
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb +0 -164
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/syntax_node.rb +0 -72
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb +0 -16
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb +0 -17
- data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/version.rb +0 -9
- data/vendor/digitpaint/personify/vendor/treetop/script/generate_metagrammar.rb +0 -14
- data/vendor/digitpaint/personify/vendor/treetop/script/svnadd +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/script/svnrm +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/and_predicate_spec.rb +0 -36
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/anything_symbol_spec.rb +0 -52
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/character_class_spec.rb +0 -188
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/choice_spec.rb +0 -80
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/circular_compilation_spec.rb +0 -28
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb +0 -21
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_compiler_spec.rb +0 -84
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/grammar_spec.rb +0 -41
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb +0 -40
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/not_predicate_spec.rb +0 -38
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/one_or_more_spec.rb +0 -35
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/optional_spec.rb +0 -37
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb +0 -19
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/parsing_rule_spec.rb +0 -32
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/sequence_spec.rb +0 -115
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_spec.rb +0 -81
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/terminal_symbol_spec.rb +0 -37
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.treetop +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar.tt +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/test_grammar_do.treetop +0 -7
- data/vendor/digitpaint/personify/vendor/treetop/spec/compiler/zero_or_more_spec.rb +0 -56
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/a.treetop +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/b.treetop +0 -11
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/c.treetop +0 -10
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/d.treetop +0 -10
- data/vendor/digitpaint/personify/vendor/treetop/spec/composition/grammar_composition_spec.rb +0 -26
- data/vendor/digitpaint/personify/vendor/treetop/spec/ruby_extensions/string_spec.rb +0 -32
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/compiled_parser_spec.rb +0 -101
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb +0 -147
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb +0 -349
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb +0 -385
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb +0 -660
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle +0 -6175
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb +0 -58
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb +0 -23
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb +0 -164
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb +0 -84
- data/vendor/digitpaint/personify/vendor/treetop/spec/runtime/syntax_node_spec.rb +0 -53
- data/vendor/digitpaint/personify/vendor/treetop/spec/spec_helper.rb +0 -106
- data/vendor/digitpaint/personify/vendor/treetop/spec/spec_suite.rb +0 -4
- data/vendor/digitpaint/personify/vendor/treetop/treetop.gemspec +0 -18
- data/vendor/mootools-on-rails/README +0 -54
- data/vendor/mootools-on-rails/Rakefile +0 -22
- data/vendor/mootools-on-rails/lib/mootools_on_rails.rb +0 -30
- data/vendor/mootools-on-rails/lib/mootools_on_rails/mootools_helper.rb +0 -510
- data/vendor/mootools-on-rails/test/mootools_helper_test.rb +0 -138
- data/vendor/mootools-on-rails/test/test_helper.rb +0 -5
@@ -1,65 +0,0 @@
|
|
1
|
-
#Grammar Composition
|
2
|
-
A unique property of parsing expression grammars is that they are _closed under composition_. This means that when you compose two grammars they yield another grammar that can be composed yet again. This is a radical departure from parsing frameworks require on lexical scanning, which makes compositionally impossible. Treetop's facilities for composition are built upon those of Ruby.
|
3
|
-
|
4
|
-
##The Mapping of Treetop Constructs to Ruby Constructs
|
5
|
-
When Treetop compiles a grammar definition, it produces a module and a class. The module contains methods implementing all of the rules defined in the grammar. The generated class is a subclass of Treetop::Runtime::CompiledParser and includes the module. For example:
|
6
|
-
|
7
|
-
grammar Foo
|
8
|
-
...
|
9
|
-
end
|
10
|
-
|
11
|
-
results in a Ruby module named `Foo` and a Ruby class named `FooParser` that `include`s the `Foo` module.
|
12
|
-
|
13
|
-
##Using Mixin Semantics to Compose Grammars
|
14
|
-
Because grammars are just modules, they can be mixed into one another. This enables grammars to share rules.
|
15
|
-
|
16
|
-
grammar A
|
17
|
-
rule a
|
18
|
-
'a'
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
grammar B
|
23
|
-
include A
|
24
|
-
|
25
|
-
rule ab
|
26
|
-
a 'b'
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
Grammar `B` above references rule `a` defined in a separate grammar that it includes. Because module inclusion places modules in the ancestor chain, rules may also be overridden with the use of the `super` keyword accessing the overridden rule.
|
31
|
-
|
32
|
-
grammar A
|
33
|
-
rule a
|
34
|
-
'a'
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
grammar B
|
39
|
-
include A
|
40
|
-
|
41
|
-
rule a
|
42
|
-
super / 'b'
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
Now rule `a` in grammar `B` matches either `'a'` or `'b'`.
|
47
|
-
|
48
|
-
##Motivation
|
49
|
-
Imagine a grammar for Ruby that took account of SQL queries embedded in strings within the language. That could be achieved by combining two existing grammars.
|
50
|
-
|
51
|
-
grammar RubyPlusSQL
|
52
|
-
include Ruby
|
53
|
-
include SQL
|
54
|
-
|
55
|
-
rule expression
|
56
|
-
ruby_expression
|
57
|
-
end
|
58
|
-
|
59
|
-
rule ruby_string
|
60
|
-
ruby_quote sql_expression ruby_quote / ruby_string
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
##Work to be Done
|
65
|
-
It has become clear that the include facility in grammars would be more useful if it had the ability to name prefix all rules from the included grammar to avoid collision. This is a planned but currently unimplemented feature.
|
@@ -1,90 +0,0 @@
|
|
1
|
-
<p class="intro_text">
|
2
|
-
|
3
|
-
Treetop is a language for describing languages. Combining the elegance of Ruby with cutting-edge <em>parsing expression grammars</em>, it helps you analyze syntax with revolutionarily ease.
|
4
|
-
|
5
|
-
</p>
|
6
|
-
|
7
|
-
sudo gem install treetop
|
8
|
-
|
9
|
-
#Intuitive Grammar Specifications
|
10
|
-
Parsing expression grammars (PEGs) are simple to write and easy to maintain. They are a simple but powerful generalization of regular expressions that are easier to work with than the LALR or LR-1 grammars of traditional parser generators. There's no need for a tokenization phase, and _lookahead assertions_ can be used for a limited degree of context-sensitivity. Here's an extremely simple Treetop grammar that matches a subset of arithmetic, respecting operator precedence:
|
11
|
-
|
12
|
-
grammar Arithmetic
|
13
|
-
rule additive
|
14
|
-
multitive '+' additive / multitive
|
15
|
-
end
|
16
|
-
|
17
|
-
rule multitive
|
18
|
-
primary '*' multitive / primary
|
19
|
-
end
|
20
|
-
|
21
|
-
rule primary
|
22
|
-
'(' additive ')' / number
|
23
|
-
end
|
24
|
-
|
25
|
-
rule number
|
26
|
-
[1-9] [0-9]*
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
|
31
|
-
#Syntax-Oriented Programming
|
32
|
-
Rather than implementing semantic actions that construct parse trees, Treetop lets you define methods on trees that it constructs for you automatically. You can define these methods directly within the grammar...
|
33
|
-
|
34
|
-
grammar Arithmetic
|
35
|
-
rule additive
|
36
|
-
multitive '+' additive {
|
37
|
-
def value
|
38
|
-
multitive.value + additive.value
|
39
|
-
end
|
40
|
-
}
|
41
|
-
/
|
42
|
-
multitive
|
43
|
-
end
|
44
|
-
|
45
|
-
# other rules below ...
|
46
|
-
end
|
47
|
-
|
48
|
-
...or associate rules with classes of nodes you wish your parsers to instantiate upon matching a rule.
|
49
|
-
|
50
|
-
grammar Arithmetic
|
51
|
-
rule additive
|
52
|
-
multitive '+' additive <AdditiveNode>
|
53
|
-
/
|
54
|
-
multitive
|
55
|
-
end
|
56
|
-
|
57
|
-
# other rules below ...
|
58
|
-
end
|
59
|
-
|
60
|
-
|
61
|
-
#Reusable, Composable Language Descriptions
|
62
|
-
Because PEGs are closed under composition, Treetop grammars can be treated like Ruby modules. You can mix them into one another and override rules with access to the `super` keyword. You can break large grammars down into coherent units or make your language's syntax modular. This is especially useful if you want other programmers to be able to reuse your work.
|
63
|
-
|
64
|
-
grammar RubyWithEmbeddedSQL
|
65
|
-
include SQL
|
66
|
-
|
67
|
-
rule string
|
68
|
-
quote sql_expression quote / super
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
|
73
|
-
#Acknowledgements
|
74
|
-
|
75
|
-
|
76
|
-
<a href="http://pivotallabs.com"><img id="pivotal_logo" src="./images/pivotal.gif"></a>
|
77
|
-
|
78
|
-
First, thank you to my employer Rob Mee of <a href="http://pivotallabs.com"/>Pivotal Labs</a> for funding a substantial portion of Treetop's development. He gets it.
|
79
|
-
|
80
|
-
|
81
|
-
I'd also like to thank:
|
82
|
-
|
83
|
-
* Damon McCormick for several hours of pair programming.
|
84
|
-
* Nick Kallen for lots of well-considered feedback and a few afternoons of programming.
|
85
|
-
* Brian Takita for a night of pair programming.
|
86
|
-
* Eliot Miranda for urging me rewrite as a compiler right away rather than putting it off.
|
87
|
-
* Ryan Davis and Eric Hodel for hurting my code.
|
88
|
-
* Dav Yaginuma for kicking me into action on my idea.
|
89
|
-
* Bryan Ford for his seminal work on Packrat Parsers.
|
90
|
-
* The editors of Lambda the Ultimate, where I discovered parsing expression grammars.
|
data/vendor/digitpaint/personify/vendor/treetop/doc/pitfalls_and_advanced_techniques.markdown
DELETED
@@ -1,51 +0,0 @@
|
|
1
|
-
#Pitfalls
|
2
|
-
##Left Recursion
|
3
|
-
An weakness shared by all recursive descent parsers is the inability to parse left-recursive rules. Consider the following rule:
|
4
|
-
|
5
|
-
rule left_recursive
|
6
|
-
left_recursive 'a' / 'a'
|
7
|
-
end
|
8
|
-
|
9
|
-
Logically it should match a list of 'a' characters. But it never consumes anything, because attempting to recognize `left_recursive` begins by attempting to recognize `left_recursive`, and so goes an infinite recursion. There's always a way to eliminate these types of structures from your grammar. There's a mechanistic transformation called _left factorization_ that can eliminate it, but it isn't always pretty, especially in combination with automatically constructed syntax trees. So far, I have found more thoughtful ways around the problem. For instance, in the interpreter example I interpret inherently left-recursive function application right recursively in syntax, then correct the directionality in my semantic interpretation. You may have to be clever.
|
10
|
-
|
11
|
-
#Advanced Techniques
|
12
|
-
Here are a few interesting problems I've encountered. I figure sharing them may give you insight into how these types of issues are addressed with the tools of parsing expressions.
|
13
|
-
|
14
|
-
##Matching a String
|
15
|
-
|
16
|
-
rule string
|
17
|
-
'"' (!'"' . / '\"')* '"'
|
18
|
-
end
|
19
|
-
|
20
|
-
This expression says: Match a quote, then zero or more of any character but a quote or an escaped quote followed by a quote. Lookahead assertions are essential for these types of problems.
|
21
|
-
|
22
|
-
##Matching Nested Structures With Non-Unique Delimeters
|
23
|
-
Say I want to parse a diabolical wiki syntax in which the following interpretations apply.
|
24
|
-
|
25
|
-
** *hello* ** --> <strong><em>hello</em></strong>
|
26
|
-
* **hello** * --> <em><strong>hello</strong></em>
|
27
|
-
|
28
|
-
rule strong
|
29
|
-
'**' (em / !'*' . / '\*')+ '**'
|
30
|
-
end
|
31
|
-
|
32
|
-
rule em
|
33
|
-
'**' (strong / !'*' . / '\*')+ '**'
|
34
|
-
end
|
35
|
-
|
36
|
-
Emphasized text is allowed within strong text by virtue of `em` being the first alternative. Since `em` will only successfully parse if a matching `*` is found, it is permitted, but other than that, no `*` characters are allowed unless they are escaped.
|
37
|
-
|
38
|
-
##Matching a Keyword But Not Words Prefixed Therewith
|
39
|
-
Say I want to consider a given string a characters only when it occurs in isolation. Lets use the `end` keyword as an example. We don't want the prefix of `'enders_game'` to be considered a keyword. A naiive implementation might be the following.
|
40
|
-
|
41
|
-
rule end_keyword
|
42
|
-
'end' &space
|
43
|
-
end
|
44
|
-
|
45
|
-
This says that `'end'` must be followed by a space, but this space is not consumed as part of the matching of `keyword`. This works in most cases, but is actually incorrect. What if `end` occurs at the end of the buffer? In that case, it occurs in isolation but will not match the above expression. What we really mean is that `'end'` cannot be followed by a _non-space_ character.
|
46
|
-
|
47
|
-
rule end_keyword
|
48
|
-
'end' !(!' ' .)
|
49
|
-
end
|
50
|
-
|
51
|
-
In general, when the syntax gets tough, it helps to focus on what you really mean. A keyword is a character not followed by another character that isn't a space.
|
@@ -1,189 +0,0 @@
|
|
1
|
-
#Semantic Interpretation
|
2
|
-
Lets use the below grammar as an example. It describes parentheses wrapping a single character to an arbitrary depth.
|
3
|
-
|
4
|
-
grammar ParenLanguage
|
5
|
-
rule parenthesized_letter
|
6
|
-
'(' parenthesized_letter ')'
|
7
|
-
/
|
8
|
-
[a-z]
|
9
|
-
end
|
10
|
-
end
|
11
|
-
|
12
|
-
Matches:
|
13
|
-
|
14
|
-
* `'a'`
|
15
|
-
* `'(a)'`
|
16
|
-
* `'((a))'`
|
17
|
-
* etc.
|
18
|
-
|
19
|
-
|
20
|
-
Output from a parser for this grammar looks like this:
|
21
|
-
|
22
|
-
![Tree Returned By ParenLanguageParser](./images/paren_language_output.png)
|
23
|
-
|
24
|
-
This is a parse tree whose nodes are instances of `Treetop::Runtime::SyntaxNode`. What if we could define methods on these node objects? We would then have an object-oriented program whose structure corresponded to the structure of our language. Treetop provides two techniques for doing just this.
|
25
|
-
|
26
|
-
##Associating Methods with Node-Instantiating Expressions
|
27
|
-
Sequences and all types of terminals are node-instantiating expressions. When they match, they create instances of `Treetop::Runtime::SyntaxNode`. Methods can be added to these nodes in the following ways:
|
28
|
-
|
29
|
-
###Inline Method Definition
|
30
|
-
Methods can be added to the nodes instantiated by the successful match of an expression
|
31
|
-
|
32
|
-
grammar ParenLanguage
|
33
|
-
rule parenthesized_letter
|
34
|
-
'(' parenthesized_letter ')' {
|
35
|
-
def depth
|
36
|
-
parenthesized_letter.depth + 1
|
37
|
-
end
|
38
|
-
}
|
39
|
-
/
|
40
|
-
[a-z] {
|
41
|
-
def depth
|
42
|
-
0
|
43
|
-
end
|
44
|
-
}
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
Note that each alternative expression is followed by a block containing a method definition. A `depth` method is defined on both expressions. The recursive `depth` method defined in the block following the first expression determines the depth of the nested parentheses and adds one two it. The base case is implemented in the block following the second expression; a single character has a depth of 0.
|
49
|
-
|
50
|
-
|
51
|
-
###Custom `SyntaxNode` Subclass Declarations
|
52
|
-
You can instruct the parser to instantiate a custom subclass of Treetop::Runtime::SyntaxNode for an expression by following it by the name of that class enclosed in angle brackets (`<>`). The above inline method definitions could have been moved out into a single class like so.
|
53
|
-
|
54
|
-
# in .treetop file
|
55
|
-
grammar ParenLanguage
|
56
|
-
rule parenthesized_letter
|
57
|
-
'(' parenthesized_letter ')' <ParenNode>
|
58
|
-
/
|
59
|
-
[a-z] <ParenNode>
|
60
|
-
end
|
61
|
-
end
|
62
|
-
|
63
|
-
# in separate .rb file
|
64
|
-
class ParenNode < Treetop::Runtime::SyntaxNode
|
65
|
-
def depth
|
66
|
-
if nonterminal?
|
67
|
-
parenthesized_letter.depth + 1
|
68
|
-
else
|
69
|
-
0
|
70
|
-
end
|
71
|
-
end
|
72
|
-
end
|
73
|
-
|
74
|
-
##Automatic Extension of Results
|
75
|
-
Nonterminal and ordered choice expressions do not instantiate new nodes, but rather pass through nodes that are instantiated by other expressions. They can extend nodes they propagate with anonymous or declared modules, using similar constructs used with expressions that instantiate their own syntax nodes.
|
76
|
-
|
77
|
-
###Extending a Propagated Node with an Anonymous Module
|
78
|
-
rule parenthesized_letter
|
79
|
-
('(' parenthesized_letter ')' / [a-z]) {
|
80
|
-
def depth
|
81
|
-
if nonterminal?
|
82
|
-
parenthesized_letter.depth + 1
|
83
|
-
else
|
84
|
-
0
|
85
|
-
end
|
86
|
-
end
|
87
|
-
}
|
88
|
-
end
|
89
|
-
|
90
|
-
The parenthesized choice above can result in a node matching either of the two choices. Than node will be extended with methods defined in the subsequent block. Note that a choice must always be parenthesized to be associated with a following block.
|
91
|
-
|
92
|
-
###Extending A Propagated Node with a Declared Module
|
93
|
-
# in .treetop file
|
94
|
-
rule parenthesized_letter
|
95
|
-
('(' parenthesized_letter ')' / [a-z]) <ParenNode>
|
96
|
-
end
|
97
|
-
|
98
|
-
# in separate .rb file
|
99
|
-
module ParenNode
|
100
|
-
def depth
|
101
|
-
if nonterminal?
|
102
|
-
parenthesized_letter.depth + 1
|
103
|
-
else
|
104
|
-
0
|
105
|
-
end
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
Here the result is extended with the `ParenNode` module. Note the previous example for node-instantiating expressions, the constant in the declaration must be a module because the result is extended with it.
|
110
|
-
|
111
|
-
##Automatically-Defined Element Accessor Methods
|
112
|
-
###Default Accessors
|
113
|
-
Nodes instantiated upon the matching of sequences have methods automatically defined for any nonterminals in the sequence.
|
114
|
-
|
115
|
-
rule abc
|
116
|
-
a b c {
|
117
|
-
def to_s
|
118
|
-
a.to_s + b.to_s + c.to_s
|
119
|
-
end
|
120
|
-
}
|
121
|
-
end
|
122
|
-
|
123
|
-
In the above code, the `to_s` method calls automatically-defined element accessors for the nodes returned by parsing nonterminals `a`, `b`, and `c`.
|
124
|
-
|
125
|
-
###Labels
|
126
|
-
Subexpressions can be given an explicit label to have an element accessor method defined for them. This is useful in cases of ambiguity between two references to the same nonterminal or when you need to access an unnamed subexpression.
|
127
|
-
|
128
|
-
rule labels
|
129
|
-
first_letter:[a-z] rest_letters:(', ' letter:[a-z])* {
|
130
|
-
def letters
|
131
|
-
[first_letter] + rest_letters.map do |comma_and_letter|
|
132
|
-
comma_and_letter.letter
|
133
|
-
end
|
134
|
-
end
|
135
|
-
}
|
136
|
-
end
|
137
|
-
|
138
|
-
The above grammar uses label-derived accessors to determine the letters in a comma-delimited list of letters. The labeled expressions _could_ have been extracted to their own rules, but if they aren't used elsewhere, labels still enable them to be referenced by a name within the expression's methods.
|
139
|
-
|
140
|
-
###Overriding Element Accessors
|
141
|
-
The module containing automatically defined element accessor methods is an ancestor of the module in which you define your own methods, meaning you can override them with access to the `super` keyword. Here's an example of how this fact can improve the readability of the example above.
|
142
|
-
|
143
|
-
rule labels
|
144
|
-
first_letter:[a-z] rest_letters:(', ' letter:[a-z])* {
|
145
|
-
def letters
|
146
|
-
[first_letter] + rest_letters
|
147
|
-
end
|
148
|
-
|
149
|
-
def rest_letters
|
150
|
-
super.map { |comma_and_letter| comma_and_letter.letter }
|
151
|
-
end
|
152
|
-
}
|
153
|
-
end
|
154
|
-
|
155
|
-
|
156
|
-
##Methods Available on `Treetop::Runtime::SyntaxNode`
|
157
|
-
|
158
|
-
<table>
|
159
|
-
<tr>
|
160
|
-
<td>
|
161
|
-
<code>terminal?</code>
|
162
|
-
</td>
|
163
|
-
<td>
|
164
|
-
Was this node produced by the matching of a terminal symbol?
|
165
|
-
</td>
|
166
|
-
</tr>
|
167
|
-
<tr>
|
168
|
-
<td>
|
169
|
-
<code>nonterminal?</code>
|
170
|
-
</td>
|
171
|
-
<td>
|
172
|
-
Was this node produced by the matching of a nonterminal symbol?
|
173
|
-
</td>
|
174
|
-
<tr>
|
175
|
-
<td>
|
176
|
-
<code>text_value</code>
|
177
|
-
</td>
|
178
|
-
<td>
|
179
|
-
The substring of the input represented by this node.
|
180
|
-
</td>
|
181
|
-
<tr>
|
182
|
-
<td>
|
183
|
-
<code>elements</code>
|
184
|
-
</td>
|
185
|
-
<td>
|
186
|
-
Available only on nonterminal nodes, returns the nodes parsed by the elements of the matched sequence.
|
187
|
-
</td>
|
188
|
-
</tr>
|
189
|
-
</table>
|
@@ -1,110 +0,0 @@
|
|
1
|
-
require 'rubygems'
|
2
|
-
require 'erector'
|
3
|
-
require "#{File.dirname(__FILE__)}/sitegen"
|
4
|
-
|
5
|
-
class Layout < Erector::Widget
|
6
|
-
def render
|
7
|
-
html do
|
8
|
-
head do
|
9
|
-
link :rel => "stylesheet",
|
10
|
-
:type => "text/css",
|
11
|
-
:href => "./screen.css"
|
12
|
-
|
13
|
-
rawtext %(
|
14
|
-
<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
|
15
|
-
</script>
|
16
|
-
<script type="text/javascript">
|
17
|
-
_uacct = "UA-3418876-1";
|
18
|
-
urchinTracker();
|
19
|
-
</script>
|
20
|
-
)
|
21
|
-
end
|
22
|
-
|
23
|
-
body do
|
24
|
-
div :id => 'top' do
|
25
|
-
div :id => 'main_navigation' do
|
26
|
-
main_navigation
|
27
|
-
end
|
28
|
-
end
|
29
|
-
div :id => 'middle' do
|
30
|
-
div :id => 'content' do
|
31
|
-
content
|
32
|
-
end
|
33
|
-
end
|
34
|
-
div :id => 'bottom' do
|
35
|
-
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
40
|
-
|
41
|
-
def main_navigation
|
42
|
-
ul do
|
43
|
-
li { link_to "Documentation", SyntacticRecognition, Documentation }
|
44
|
-
li { link_to "Contribute", Contribute }
|
45
|
-
li { link_to "Home", Index }
|
46
|
-
end
|
47
|
-
end
|
48
|
-
|
49
|
-
def content
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
class Index < Layout
|
54
|
-
def content
|
55
|
-
bluecloth "index.markdown"
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
class Documentation < Layout
|
60
|
-
abstract
|
61
|
-
|
62
|
-
def content
|
63
|
-
div :id => 'secondary_navigation' do
|
64
|
-
ul do
|
65
|
-
li { link_to 'Syntax', SyntacticRecognition }
|
66
|
-
li { link_to 'Semantics', SemanticInterpretation }
|
67
|
-
li { link_to 'Using In Ruby', UsingInRuby }
|
68
|
-
li { link_to 'Advanced Techniques', PitfallsAndAdvancedTechniques }
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
div :id => 'documentation_content' do
|
73
|
-
documentation_content
|
74
|
-
end
|
75
|
-
end
|
76
|
-
end
|
77
|
-
|
78
|
-
class SyntacticRecognition < Documentation
|
79
|
-
def documentation_content
|
80
|
-
bluecloth "syntactic_recognition.markdown"
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
class SemanticInterpretation < Documentation
|
85
|
-
def documentation_content
|
86
|
-
bluecloth "semantic_interpretation.markdown"
|
87
|
-
end
|
88
|
-
end
|
89
|
-
|
90
|
-
class UsingInRuby < Documentation
|
91
|
-
def documentation_content
|
92
|
-
bluecloth "using_in_ruby.markdown"
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
class PitfallsAndAdvancedTechniques < Documentation
|
97
|
-
def documentation_content
|
98
|
-
bluecloth "pitfalls_and_advanced_techniques.markdown"
|
99
|
-
end
|
100
|
-
end
|
101
|
-
|
102
|
-
|
103
|
-
class Contribute < Layout
|
104
|
-
def content
|
105
|
-
bluecloth "contributing_and_planned_features.markdown"
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
|
110
|
-
Layout.generate_site
|