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
data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb
DELETED
@@ -1,68 +0,0 @@
|
|
1
|
-
module Treetop
|
2
|
-
module Compiler
|
3
|
-
class Sequence < ParsingExpression
|
4
|
-
def compile(address, builder, parent_expression = nil)
|
5
|
-
super
|
6
|
-
begin_comment(self)
|
7
|
-
use_vars :result, :start_index, :accumulator
|
8
|
-
compile_sequence_elements(sequence_elements)
|
9
|
-
builder.if__ "#{accumulator_var}.last" do
|
10
|
-
assign_result "instantiate_node(#{node_class_name},input, #{start_index_var}...index, #{accumulator_var})"
|
11
|
-
extend_result sequence_element_accessor_module_name if sequence_element_accessor_module_name
|
12
|
-
extend_result_with_inline_module
|
13
|
-
end
|
14
|
-
builder.else_ do
|
15
|
-
reset_index
|
16
|
-
assign_failure start_index_var
|
17
|
-
end
|
18
|
-
end_comment(self)
|
19
|
-
end
|
20
|
-
|
21
|
-
def node_class_name
|
22
|
-
node_class_declarations.node_class_name || 'SyntaxNode'
|
23
|
-
end
|
24
|
-
|
25
|
-
def compile_sequence_elements(elements)
|
26
|
-
obtain_new_subexpression_address
|
27
|
-
elements.first.compile(subexpression_address, builder)
|
28
|
-
accumulate_subexpression_result
|
29
|
-
if elements.size > 1
|
30
|
-
builder.if_ subexpression_success? do
|
31
|
-
compile_sequence_elements(elements[1..-1])
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
def sequence_element_accessor_module
|
37
|
-
@sequence_element_accessor_module ||= SequenceElementAccessorModule.new(sequence_elements)
|
38
|
-
end
|
39
|
-
|
40
|
-
def sequence_element_accessor_module_name
|
41
|
-
sequence_element_accessor_module.module_name
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
class SequenceElementAccessorModule
|
46
|
-
include InlineModuleMixin
|
47
|
-
attr_reader :sequence_elements
|
48
|
-
|
49
|
-
def initialize(sequence_elements)
|
50
|
-
@sequence_elements = sequence_elements
|
51
|
-
end
|
52
|
-
|
53
|
-
def compile(index, builder, rule)
|
54
|
-
super
|
55
|
-
builder.module_declaration(module_name) do
|
56
|
-
sequence_elements.each_with_index do |element, index|
|
57
|
-
if element.label_name
|
58
|
-
builder.method_declaration(element.label_name) do
|
59
|
-
builder << "elements[#{index}]"
|
60
|
-
end
|
61
|
-
builder.newline unless index == sequence_elements.size - 1
|
62
|
-
end
|
63
|
-
end
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
end
|
data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb
DELETED
@@ -1,20 +0,0 @@
|
|
1
|
-
module Treetop
|
2
|
-
module Compiler
|
3
|
-
class Terminal < AtomicExpression
|
4
|
-
def compile(address, builder, parent_expression = nil)
|
5
|
-
super
|
6
|
-
string_length = eval(text_value).length
|
7
|
-
|
8
|
-
builder.if__ "input.index(#{text_value}, index) == index" do
|
9
|
-
assign_result "instantiate_node(#{node_class_name},input, index...(index + #{string_length}))"
|
10
|
-
extend_result_with_inline_module
|
11
|
-
builder << "@index += #{string_length}"
|
12
|
-
end
|
13
|
-
builder.else_ do
|
14
|
-
builder << "terminal_parse_failure(#{text_value})"
|
15
|
-
assign_result 'nil'
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|
20
|
-
end
|
@@ -1,113 +0,0 @@
|
|
1
|
-
module Treetop
|
2
|
-
module Compiler
|
3
|
-
class RubyBuilder
|
4
|
-
|
5
|
-
attr_reader :level, :address_space, :ruby
|
6
|
-
|
7
|
-
def initialize
|
8
|
-
@level = 0
|
9
|
-
@address_space = LexicalAddressSpace.new
|
10
|
-
@ruby = ""
|
11
|
-
end
|
12
|
-
|
13
|
-
def <<(ruby_line)
|
14
|
-
return if ruby_line.blank?
|
15
|
-
ruby << ruby_line.tabto(level) << "\n"
|
16
|
-
end
|
17
|
-
|
18
|
-
def newline
|
19
|
-
ruby << "\n"
|
20
|
-
end
|
21
|
-
|
22
|
-
def indented(depth = 2)
|
23
|
-
self.in(depth)
|
24
|
-
yield
|
25
|
-
self.out(depth)
|
26
|
-
end
|
27
|
-
|
28
|
-
def class_declaration(name, &block)
|
29
|
-
self << "class #{name}"
|
30
|
-
indented(&block)
|
31
|
-
self << "end"
|
32
|
-
end
|
33
|
-
|
34
|
-
def module_declaration(name, &block)
|
35
|
-
self << "module #{name}"
|
36
|
-
indented(&block)
|
37
|
-
self << "end"
|
38
|
-
end
|
39
|
-
|
40
|
-
def method_declaration(name, &block)
|
41
|
-
self << "def #{name}"
|
42
|
-
indented(&block)
|
43
|
-
self << "end"
|
44
|
-
end
|
45
|
-
|
46
|
-
def assign(left, right)
|
47
|
-
if left.instance_of? Array
|
48
|
-
self << "#{left.join(', ')} = #{right.join(', ')}"
|
49
|
-
else
|
50
|
-
self << "#{left} = #{right}"
|
51
|
-
end
|
52
|
-
end
|
53
|
-
|
54
|
-
def extend(var, module_name)
|
55
|
-
self << "#{var}.extend(#{module_name})"
|
56
|
-
end
|
57
|
-
|
58
|
-
def accumulate(left, right)
|
59
|
-
self << "#{left} << #{right}"
|
60
|
-
end
|
61
|
-
|
62
|
-
def if__(condition, &block)
|
63
|
-
self << "if #{condition}"
|
64
|
-
indented(&block)
|
65
|
-
end
|
66
|
-
|
67
|
-
def if_(condition, &block)
|
68
|
-
if__(condition, &block)
|
69
|
-
self << 'end'
|
70
|
-
end
|
71
|
-
|
72
|
-
def else_(&block)
|
73
|
-
self << 'else'
|
74
|
-
indented(&block)
|
75
|
-
self << 'end'
|
76
|
-
end
|
77
|
-
|
78
|
-
def loop(&block)
|
79
|
-
self << 'loop do'
|
80
|
-
indented(&block)
|
81
|
-
self << 'end'
|
82
|
-
end
|
83
|
-
|
84
|
-
def break
|
85
|
-
self << 'break'
|
86
|
-
end
|
87
|
-
|
88
|
-
def in(depth = 2)
|
89
|
-
@level += depth
|
90
|
-
self
|
91
|
-
end
|
92
|
-
|
93
|
-
def out(depth = 2)
|
94
|
-
@level -= depth
|
95
|
-
self
|
96
|
-
end
|
97
|
-
|
98
|
-
def next_address
|
99
|
-
address_space.next_address
|
100
|
-
end
|
101
|
-
|
102
|
-
def reset_addresses
|
103
|
-
address_space.reset_addresses
|
104
|
-
end
|
105
|
-
|
106
|
-
protected
|
107
|
-
|
108
|
-
def indent
|
109
|
-
" " * level
|
110
|
-
end
|
111
|
-
end
|
112
|
-
end
|
113
|
-
end
|
@@ -1,42 +0,0 @@
|
|
1
|
-
class String
|
2
|
-
def column_of(index)
|
3
|
-
return 1 if index == 0
|
4
|
-
newline_index = rindex("\n", index - 1)
|
5
|
-
if newline_index
|
6
|
-
index - newline_index
|
7
|
-
else
|
8
|
-
index + 1
|
9
|
-
end
|
10
|
-
end
|
11
|
-
|
12
|
-
def line_of(index)
|
13
|
-
self[0...index].count("\n") + 1
|
14
|
-
end
|
15
|
-
|
16
|
-
unless method_defined?(:blank?)
|
17
|
-
def blank?
|
18
|
-
self == ""
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
# The following methods are lifted from Facets 2.0.2
|
23
|
-
def tabto(n)
|
24
|
-
if self =~ /^( *)\S/
|
25
|
-
indent(n - $1.length)
|
26
|
-
else
|
27
|
-
self
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
def indent(n)
|
32
|
-
if n >= 0
|
33
|
-
gsub(/^/, ' ' * n)
|
34
|
-
else
|
35
|
-
gsub(/^ {0,#{-n}}/, "")
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
def treetop_camelize
|
40
|
-
to_s.gsub(/\/(.?)/){ "::" + $1.upcase }.gsub(/(^|_)(.)/){ $2.upcase }
|
41
|
-
end
|
42
|
-
end
|
@@ -1,95 +0,0 @@
|
|
1
|
-
module Treetop
|
2
|
-
module Runtime
|
3
|
-
class CompiledParser
|
4
|
-
include Treetop::Runtime
|
5
|
-
|
6
|
-
attr_reader :input, :index, :terminal_failures, :max_terminal_failure_index
|
7
|
-
attr_writer :root
|
8
|
-
attr_accessor :consume_all_input
|
9
|
-
alias :consume_all_input? :consume_all_input
|
10
|
-
|
11
|
-
def initialize
|
12
|
-
self.consume_all_input = true
|
13
|
-
end
|
14
|
-
|
15
|
-
def parse(input, options = {})
|
16
|
-
prepare_to_parse(input)
|
17
|
-
@index = options[:index] if options[:index]
|
18
|
-
result = send("_nt_#{root}")
|
19
|
-
return nil if (consume_all_input? && index != input.size)
|
20
|
-
return result
|
21
|
-
end
|
22
|
-
|
23
|
-
def failure_index
|
24
|
-
max_terminal_failure_index
|
25
|
-
end
|
26
|
-
|
27
|
-
def failure_line
|
28
|
-
terminal_failures && input.line_of(failure_index)
|
29
|
-
end
|
30
|
-
|
31
|
-
def failure_column
|
32
|
-
terminal_failures && input.column_of(failure_index)
|
33
|
-
end
|
34
|
-
|
35
|
-
def failure_reason
|
36
|
-
return nil unless (tf = terminal_failures) && tf.size > 0
|
37
|
-
"Expected " +
|
38
|
-
(tf.size == 1 ?
|
39
|
-
tf[0].expected_string :
|
40
|
-
"one of #{tf.map{|f| f.expected_string}.uniq*', '}"
|
41
|
-
) +
|
42
|
-
" at line #{failure_line}, column #{failure_column} (byte #{failure_index+1})" +
|
43
|
-
" after #{input[index...failure_index]}"
|
44
|
-
end
|
45
|
-
|
46
|
-
|
47
|
-
protected
|
48
|
-
|
49
|
-
attr_reader :node_cache, :input_length
|
50
|
-
attr_writer :index
|
51
|
-
|
52
|
-
def prepare_to_parse(input)
|
53
|
-
@input = input
|
54
|
-
@input_length = input.length
|
55
|
-
reset_index
|
56
|
-
@node_cache = Hash.new {|hash, key| hash[key] = Hash.new}
|
57
|
-
@terminal_failures = []
|
58
|
-
@max_terminal_failure_index = 0
|
59
|
-
end
|
60
|
-
|
61
|
-
def reset_index
|
62
|
-
@index = 0
|
63
|
-
end
|
64
|
-
|
65
|
-
def parse_anything(node_class = SyntaxNode, inline_module = nil)
|
66
|
-
if index < input.length
|
67
|
-
result = instantiate_node(node_class,input, index...(index + 1))
|
68
|
-
result.extend(inline_module) if inline_module
|
69
|
-
@index += 1
|
70
|
-
result
|
71
|
-
else
|
72
|
-
terminal_parse_failure("any character")
|
73
|
-
end
|
74
|
-
end
|
75
|
-
|
76
|
-
def instantiate_node(node_type,*args)
|
77
|
-
if node_type.respond_to? :new
|
78
|
-
node_type.new(*args)
|
79
|
-
else
|
80
|
-
SyntaxNode.new(*args).extend(node_type)
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
def terminal_parse_failure(expected_string)
|
85
|
-
return nil if index < max_terminal_failure_index
|
86
|
-
if index > max_terminal_failure_index
|
87
|
-
@max_terminal_failure_index = index
|
88
|
-
@terminal_failures = []
|
89
|
-
end
|
90
|
-
terminal_failures << TerminalParseFailure.new(index, expected_string)
|
91
|
-
return nil
|
92
|
-
end
|
93
|
-
end
|
94
|
-
end
|
95
|
-
end
|
data/vendor/digitpaint/personify/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb
DELETED
@@ -1,15 +0,0 @@
|
|
1
|
-
class IntervalSkipList
|
2
|
-
class HeadNode
|
3
|
-
attr_reader :height, :forward, :forward_markers
|
4
|
-
|
5
|
-
def initialize(height)
|
6
|
-
@height = height
|
7
|
-
@forward = Array.new(height, nil)
|
8
|
-
@forward_markers = Array.new(height) {|i| []}
|
9
|
-
end
|
10
|
-
|
11
|
-
def top_level
|
12
|
-
height - 1
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
@@ -1,200 +0,0 @@
|
|
1
|
-
class IntervalSkipList
|
2
|
-
attr_reader :probability
|
3
|
-
|
4
|
-
def initialize
|
5
|
-
@head = HeadNode.new(max_height)
|
6
|
-
@ranges = {}
|
7
|
-
@probability = 0.5
|
8
|
-
end
|
9
|
-
|
10
|
-
def max_height
|
11
|
-
3
|
12
|
-
end
|
13
|
-
|
14
|
-
def empty?
|
15
|
-
head.forward[0].nil?
|
16
|
-
end
|
17
|
-
|
18
|
-
def expire(range, length_change)
|
19
|
-
expired_markers, first_node_after_range = overlapping(range)
|
20
|
-
expired_markers.each { |marker| delete(marker) }
|
21
|
-
first_node_after_range.propagate_length_change(length_change)
|
22
|
-
end
|
23
|
-
|
24
|
-
def overlapping(range)
|
25
|
-
markers, first_node = containing_with_node(range.first)
|
26
|
-
|
27
|
-
cur_node = first_node
|
28
|
-
begin
|
29
|
-
markers.concat(cur_node.forward_markers.flatten)
|
30
|
-
cur_node = cur_node.forward[0]
|
31
|
-
end while cur_node.key < range.last
|
32
|
-
|
33
|
-
return markers.uniq, cur_node
|
34
|
-
end
|
35
|
-
|
36
|
-
def containing(n)
|
37
|
-
containing_with_node(n).first
|
38
|
-
end
|
39
|
-
|
40
|
-
def insert(range, marker)
|
41
|
-
ranges[marker] = range
|
42
|
-
first_node = insert_node(range.first)
|
43
|
-
first_node.endpoint_of.push(marker)
|
44
|
-
last_node = insert_node(range.last)
|
45
|
-
last_node.endpoint_of.push(marker)
|
46
|
-
|
47
|
-
cur_node = first_node
|
48
|
-
cur_level = first_node.top_level
|
49
|
-
while next_node_at_level_inside_range?(cur_node, cur_level, range)
|
50
|
-
while can_ascend_from?(cur_node, cur_level) && next_node_at_level_inside_range?(cur_node, cur_level + 1, range)
|
51
|
-
cur_level += 1
|
52
|
-
end
|
53
|
-
cur_node = mark_forward_path_at_level(cur_node, cur_level, marker)
|
54
|
-
end
|
55
|
-
|
56
|
-
while node_inside_range?(cur_node, range)
|
57
|
-
while can_descend_from?(cur_level) && next_node_at_level_outside_range?(cur_node, cur_level, range)
|
58
|
-
cur_level -= 1
|
59
|
-
end
|
60
|
-
cur_node = mark_forward_path_at_level(cur_node, cur_level, marker)
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def delete(marker)
|
65
|
-
range = ranges[marker]
|
66
|
-
path_to_first_node = make_path
|
67
|
-
first_node = find(range.first, path_to_first_node)
|
68
|
-
|
69
|
-
cur_node = first_node
|
70
|
-
cur_level = first_node.top_level
|
71
|
-
while next_node_at_level_inside_range?(cur_node, cur_level, range)
|
72
|
-
while can_ascend_from?(cur_node, cur_level) && next_node_at_level_inside_range?(cur_node, cur_level + 1, range)
|
73
|
-
cur_level += 1
|
74
|
-
end
|
75
|
-
cur_node = unmark_forward_path_at_level(cur_node, cur_level, marker)
|
76
|
-
end
|
77
|
-
|
78
|
-
while node_inside_range?(cur_node, range)
|
79
|
-
while can_descend_from?(cur_level) && next_node_at_level_outside_range?(cur_node, cur_level, range)
|
80
|
-
cur_level -= 1
|
81
|
-
end
|
82
|
-
cur_node = unmark_forward_path_at_level(cur_node, cur_level, marker)
|
83
|
-
end
|
84
|
-
last_node = cur_node
|
85
|
-
|
86
|
-
first_node.endpoint_of.delete(marker)
|
87
|
-
if first_node.endpoint_of.empty?
|
88
|
-
first_node.delete(path_to_first_node)
|
89
|
-
end
|
90
|
-
|
91
|
-
last_node.endpoint_of.delete(marker)
|
92
|
-
if last_node.endpoint_of.empty?
|
93
|
-
path_to_last_node = make_path
|
94
|
-
find(range.last, path_to_last_node)
|
95
|
-
last_node.delete(path_to_last_node)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
|
99
|
-
protected
|
100
|
-
attr_reader :head, :ranges
|
101
|
-
|
102
|
-
def insert_node(key)
|
103
|
-
path = make_path
|
104
|
-
found_node = find(key, path)
|
105
|
-
if found_node && found_node.key == key
|
106
|
-
return found_node
|
107
|
-
else
|
108
|
-
return Node.new(key, next_node_height, path)
|
109
|
-
end
|
110
|
-
end
|
111
|
-
|
112
|
-
def containing_with_node(n)
|
113
|
-
containing = []
|
114
|
-
cur_node = head
|
115
|
-
(max_height - 1).downto(0) do |cur_level|
|
116
|
-
while (next_node = cur_node.forward[cur_level]) && next_node.key <= n
|
117
|
-
cur_node = next_node
|
118
|
-
if cur_node.key == n
|
119
|
-
return containing + (cur_node.markers - cur_node.endpoint_of), cur_node
|
120
|
-
end
|
121
|
-
end
|
122
|
-
containing.concat(cur_node.forward_markers[cur_level])
|
123
|
-
end
|
124
|
-
|
125
|
-
return containing, cur_node
|
126
|
-
end
|
127
|
-
|
128
|
-
def delete_node(key)
|
129
|
-
path = make_path
|
130
|
-
found_node = find(key, path)
|
131
|
-
found_node.delete(path) if found_node.key == key
|
132
|
-
end
|
133
|
-
|
134
|
-
def find(key, path)
|
135
|
-
cur_node = head
|
136
|
-
(max_height - 1).downto(0) do |cur_level|
|
137
|
-
while (next_node = cur_node.forward[cur_level]) && next_node.key < key
|
138
|
-
cur_node = next_node
|
139
|
-
end
|
140
|
-
path[cur_level] = cur_node
|
141
|
-
end
|
142
|
-
cur_node.forward[0]
|
143
|
-
end
|
144
|
-
|
145
|
-
def make_path
|
146
|
-
Array.new(max_height, nil)
|
147
|
-
end
|
148
|
-
|
149
|
-
def next_node_height
|
150
|
-
height = 1
|
151
|
-
while rand < probability && height < max_height
|
152
|
-
height += 1
|
153
|
-
end
|
154
|
-
height
|
155
|
-
end
|
156
|
-
|
157
|
-
def can_ascend_from?(node, level)
|
158
|
-
level < node.top_level
|
159
|
-
end
|
160
|
-
|
161
|
-
def can_descend_from?(level)
|
162
|
-
level > 0
|
163
|
-
end
|
164
|
-
|
165
|
-
def node_inside_range?(node, range)
|
166
|
-
node.key < range.last
|
167
|
-
end
|
168
|
-
|
169
|
-
def next_node_at_level_inside_range?(node, level, range)
|
170
|
-
node.forward[level] && node.forward[level].key <= range.last
|
171
|
-
end
|
172
|
-
|
173
|
-
def next_node_at_level_outside_range?(node, level, range)
|
174
|
-
(node.forward[level].nil? || node.forward[level].key > range.last)
|
175
|
-
end
|
176
|
-
|
177
|
-
def mark_forward_path_at_level(node, level, marker)
|
178
|
-
node.forward_markers[level].push(marker)
|
179
|
-
next_node = node.forward[level]
|
180
|
-
next_node.markers.push(marker)
|
181
|
-
node = next_node
|
182
|
-
end
|
183
|
-
|
184
|
-
def unmark_forward_path_at_level(node, level, marker)
|
185
|
-
node.forward_markers[level].delete(marker)
|
186
|
-
next_node = node.forward[level]
|
187
|
-
next_node.markers.delete(marker)
|
188
|
-
node = next_node
|
189
|
-
end
|
190
|
-
|
191
|
-
def nodes
|
192
|
-
nodes = []
|
193
|
-
cur_node = head.forward[0]
|
194
|
-
until cur_node.nil?
|
195
|
-
nodes << cur_node
|
196
|
-
cur_node = cur_node.forward[0]
|
197
|
-
end
|
198
|
-
nodes
|
199
|
-
end
|
200
|
-
end
|