typo 5.0.2 → 5.0.3.98
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGES-5.0.4 +33 -0
- data/MAINTAINERS +4 -8
- data/README +10 -8
- data/{README.SIDEBARS → SIDEBARS} +0 -0
- data/app/apis/blogger_service.rb +2 -3
- data/app/apis/meta_weblog_service.rb +6 -7
- data/app/apis/movable_type_service.rb +6 -6
- data/app/controllers/accounts_controller.rb +9 -9
- data/app/controllers/admin/base_controller.rb +3 -22
- data/app/controllers/admin/blacklist_controller.rb +4 -4
- data/app/controllers/admin/cache_controller.rb +0 -9
- data/app/controllers/admin/categories_controller.rb +4 -8
- data/app/controllers/admin/comments_controller.rb +4 -4
- data/app/controllers/admin/content_controller.rb +44 -44
- data/app/controllers/admin/dashboard_controller.rb +8 -0
- data/app/controllers/admin/feedback_controller.rb +1 -2
- data/app/controllers/admin/pages_controller.rb +49 -24
- data/app/controllers/admin/resources_controller.rb +5 -5
- data/app/controllers/admin/settings_controller.rb +7 -0
- data/app/controllers/admin/sidebar_controller.rb +5 -8
- data/app/controllers/admin/tags_controller.rb +43 -0
- data/app/controllers/admin/themes_controller.rb +1 -0
- data/app/controllers/admin/trackbacks_controller.rb +4 -13
- data/app/controllers/admin/users_controller.rb +7 -13
- data/app/controllers/application.rb +2 -24
- data/app/controllers/articles_controller.rb +28 -23
- data/app/controllers/comments_controller.rb +4 -6
- data/app/controllers/content_controller.rb +1 -4
- data/app/controllers/feedback_controller.rb +12 -2
- data/app/controllers/grouping_controller.rb +7 -1
- data/app/controllers/redirect_controller.rb +6 -0
- data/app/controllers/theme_controller.rb +2 -3
- data/app/controllers/trackbacks_controller.rb +4 -6
- data/app/controllers/xml_controller.rb +1 -1
- data/app/helpers/admin/base_helper.rb +58 -9
- data/app/helpers/admin/content_helper.rb +7 -0
- data/app/helpers/admin/pages_helper.rb +21 -0
- data/app/helpers/admin/settings_helper.rb +1 -1
- data/app/helpers/application_helper.rb +11 -9
- data/app/helpers/content_helper.rb +5 -14
- data/app/helpers/sidebar_helper.rb +1 -1
- data/app/models/article.rb +81 -68
- data/app/models/blog.rb +14 -44
- data/app/models/blog_sweeper.rb +30 -10
- data/app/models/category.rb +1 -1
- data/app/models/comment.rb +0 -7
- data/app/models/content.rb +40 -18
- data/app/models/feedback.rb +8 -0
- data/app/models/notification_mailer.rb +8 -1
- data/app/models/page.rb +5 -0
- data/app/models/page_cache.rb +22 -7
- data/app/models/profile.rb +10 -0
- data/app/models/right.rb +4 -0
- data/app/models/sidebar.rb +10 -3
- data/app/models/tag.rb +20 -8
- data/app/models/trackback.rb +1 -1
- data/app/models/url_policy.rb +179 -0
- data/app/models/user.rb +30 -0
- data/app/views/accounts/login.html.erb +1 -1
- data/app/views/accounts/logout.html.erb +1 -1
- data/app/views/accounts/signup.html.erb +1 -1
- data/app/views/admin/blacklist/_blacklist_patterns.html.erb +2 -2
- data/app/views/admin/blacklist/_form.html.erb +13 -14
- data/app/views/admin/blacklist/_quick_post.html.erb +4 -13
- data/app/views/admin/blacklist/edit.html.erb +8 -11
- data/app/views/admin/blacklist/index.html.erb +10 -0
- data/app/views/admin/categories/_categories.html.erb +8 -8
- data/app/views/admin/categories/_form.html.erb +8 -3
- data/app/views/admin/categories/_quick_post.html.erb +1 -1
- data/app/views/admin/categories/edit.html.erb +3 -7
- data/app/views/admin/categories/index.html.erb +15 -0
- data/app/views/admin/comments/_form.html.erb +19 -18
- data/app/views/admin/comments/edit.html.erb +3 -7
- data/app/views/admin/comments/index.html.erb +30 -0
- data/app/views/admin/comments/show.html.erb +24 -8
- data/app/views/admin/content/_articles.html.erb +31 -10
- data/app/views/admin/content/_attachment.html.erb +18 -2
- data/app/views/admin/content/_form.html.erb +76 -86
- data/app/views/admin/content/_pages.html.erb +3 -3
- data/app/views/admin/content/edit.html.erb +2 -9
- data/app/views/admin/content/index.html.erb +17 -0
- data/app/views/admin/content/new.html.erb +1 -4
- data/app/views/admin/content/show.html.erb +2 -23
- data/app/views/admin/dashboard/_comments.html.erb +17 -0
- data/app/views/admin/dashboard/_overview.html.erb +4 -0
- data/app/views/admin/dashboard/_popular.html.erb +12 -0
- data/app/views/admin/dashboard/_posts.html.erb +15 -0
- data/app/views/admin/dashboard/_sysinfo.html.erb +13 -0
- data/app/views/admin/dashboard/_welcome.html.erb +3 -0
- data/app/views/admin/dashboard/index.html.erb +13 -57
- data/app/views/admin/feedback/index.html.erb +41 -0
- data/app/views/admin/pages/_form.html.erb +31 -35
- data/app/views/admin/pages/_pages.html.erb +48 -23
- data/app/views/admin/pages/edit.html.erb +3 -8
- data/app/views/admin/pages/index.html.erb +6 -0
- data/app/views/admin/pages/new.html.erb +2 -5
- data/app/views/admin/pages/show.html.erb +2 -12
- data/app/views/admin/resources/_resources.html.erb +6 -5
- data/app/views/admin/resources/index.html.erb +12 -0
- data/app/views/admin/settings/feedback.html.erb +1 -19
- data/app/views/admin/settings/index.html.erb +3 -23
- data/app/views/admin/settings/podcast.html.erb +1 -10
- data/app/views/admin/settings/read.html.erb +1 -10
- data/app/views/admin/settings/spam.html.erb +1 -10
- data/app/views/admin/settings/write.html.erb +2 -14
- data/app/views/admin/shared/_edit.html.erb +1 -4
- data/app/views/admin/sidebar/index.html.erb +11 -8
- data/app/views/admin/tags/_form.html.erb +4 -0
- data/app/views/admin/tags/_tags.html.erb +19 -0
- data/app/views/admin/tags/destroy.html.erb +11 -0
- data/app/views/admin/tags/edit.html.erb +13 -0
- data/app/views/admin/tags/index.html.erb +12 -0
- data/app/views/admin/textfilters/edit.html.erb +3 -5
- data/app/views/admin/textfilters/index.html.erb +12 -0
- data/app/views/admin/textfilters/macro_help.html.erb +1 -1
- data/app/views/admin/textfilters/new.html.erb +2 -8
- data/app/views/admin/textfilters/show.html.erb +1 -6
- data/app/views/admin/textfilters/show_help.html.erb +1 -5
- data/app/views/admin/themes/index.html.erb +19 -15
- data/app/views/admin/trackbacks/edit.html.erb +1 -4
- data/app/views/admin/trackbacks/index.html.erb +22 -0
- data/app/views/admin/users/_form.html.erb +0 -10
- data/app/views/admin/users/edit.html.erb +3 -6
- data/app/views/admin/users/index.html.erb +29 -0
- data/app/views/admin/users/new.html.erb +1 -4
- data/app/views/articles/_atom_feed.atom.builder +1 -1
- data/app/views/articles/archives.html.erb +2 -2
- data/app/views/articles/groupings.html.erb +1 -1
- data/app/views/layouts/administration.html.erb +44 -51
- data/app/views/notification_mailer/_mail_footer.html.erb +1 -1
- data/app/views/notification_mailer/article.html.erb +1 -1
- data/app/views/notification_mailer/comment.html.erb +1 -1
- data/app/views/notification_mailer/notif_user.html.erb +12 -0
- data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder +1 -1
- data/config/environment.rb +0 -1
- data/config/environments/development.rb +5 -0
- data/config/initializers/access_rules.rb +110 -0
- data/config/initializers/active_record_hacks.rb +17 -0
- data/config/initializers/benchmark_hacks.rb +9 -0
- data/config/routes.rb +36 -15
- data/db/converters/README +2 -2
- data/db/migrate/004_add_sidebars.rb +8 -9
- data/db/migrate/067_remove_blog_ids.rb +22 -0
- data/db/migrate/068_fix_grants.rb +113 -0
- data/db/migrate/069_add_modules_to_profile.rb +18 -0
- data/db/schema.mysql-v3.sql +3 -217
- data/db/schema.mysql.sql +3 -217
- data/db/schema.postgresql.sql +3 -217
- data/db/schema.rb +32 -29
- data/db/schema.sqlite.sql +3 -217
- data/db/schema.sqlserver.sql +3 -231
- data/db/schema_version +1 -1
- data/lang/de_DE.rb +6 -9
- data/lang/en_US.rb +3 -0
- data/lang/es_MX.rb +556 -0
- data/lang/fr_FR.rb +171 -45
- data/lang/it_IT.rb +566 -0
- data/lang/ja_JP.rb +553 -0
- data/lang/pl_PL.rb +553 -0
- data/lang/ro_RO.rb +6 -10
- data/lib/sidebars/plugin.rb +1 -3
- data/lib/stateful.rb +6 -2
- data/lib/tasks/release.rake +3 -8
- data/lib/typo_version.rb +1 -1
- data/public/.DS_Store +0 -0
- data/public/.htaccess +1 -1
- data/public/images/admin/arrow_comment_group.gif +0 -0
- data/public/images/admin/typologo.gif +0 -0
- data/public/javascripts/controls.js +484 -354
- data/public/javascripts/dragdrop.js +88 -58
- data/public/javascripts/effects.js +396 -364
- data/public/javascripts/fckcustom.js +27 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js +209 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js +119 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js +46 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js +58 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js +808 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js +103 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js +198 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js +306 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js +344 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckelementpath.js +70 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckenterkey.js +629 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckevents.js +66 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckicon.js +103 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js +68 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js +64 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js +141 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js +150 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js +54 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js +160 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js +338 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js +56 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js +377 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js +1280 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbar.js +103 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js +36 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js +38 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbutton.js +76 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js +194 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js +139 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js +98 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js +76 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js +92 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js +143 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js +200 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckw3crange.js +447 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml.js +108 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml_gecko.js +87 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml_ie.js +88 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fck_othercommands.js +462 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js +194 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js +59 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.js +180 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.js +280 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.js +173 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.js +382 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.js +37 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js +38 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js +40 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js +45 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.js +76 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js +39 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js +67 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.js +60 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.js +106 -0
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +183 -0
- data/public/javascripts/fckeditor/editor/_source/fckconstants.js +56 -0
- data/public/javascripts/fckeditor/editor/_source/fckeditorapi.js +168 -0
- data/public/javascripts/fckeditor/editor/_source/fckjscoreextensions.js +166 -0
- data/public/javascripts/fckeditor/editor/_source/fckscriptloader.js +122 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fck.js +1065 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fck_contextmenu.js +325 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fck_gecko.js +458 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fck_ie.js +420 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckbrowserinfo.js +59 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckcodeformatter.js +100 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckcommands.js +167 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckconfig.js +239 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckdebug.js +56 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckdialog.js +38 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckdialog_gecko.js +103 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckdialog_ie.js +48 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckdocumentprocessor.js +225 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckdomtools.js +884 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.js +162 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.js +152 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.js +60 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.js +46 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.js +96 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection.js +42 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection_gecko.js +211 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection_ie.js +201 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.js +372 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler.js +858 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_gecko.js +56 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_ie.js +64 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbaritems.js +123 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbarset.js +373 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools.js +581 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools_gecko.js +270 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools_ie.js +227 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckundo.js +220 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.js +39 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.js +460 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_gecko.js +105 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_ie.js +208 -0
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtmlentities.js +354 -0
- data/public/javascripts/fckeditor/editor/css/behaviors/disablehandles.htc +15 -0
- data/public/javascripts/fckeditor/editor/css/behaviors/showtableborders.htc +36 -0
- data/public/javascripts/fckeditor/editor/css/fck_editorarea.css +91 -0
- data/public/javascripts/fckeditor/editor/css/fck_internal.css +182 -0
- data/public/javascripts/fckeditor/editor/css/fck_showtableborders_gecko.css +42 -0
- data/public/javascripts/fckeditor/editor/css/images/block_address.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_blockquote.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_div.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_h1.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_h2.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_h3.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_h4.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_h5.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_h6.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_p.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/block_pre.png +0 -0
- data/public/javascripts/fckeditor/editor/css/images/fck_anchor.gif +0 -0
- data/public/javascripts/fckeditor/editor/css/images/fck_flashlogo.gif +0 -0
- data/public/javascripts/fckeditor/editor/css/images/fck_hiddenfield.gif +0 -0
- data/public/javascripts/fckeditor/editor/css/images/fck_pagebreak.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.css +78 -0
- data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.js +165 -0
- data/public/javascripts/fckeditor/editor/dialog/common/images/locked.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/common/images/reset.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/common/images/unlocked.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_about.html +155 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_about/logo_fredck.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_anchor.html +207 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_button.html +109 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_checkbox.html +109 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_colorselector.html +171 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_docprops.html +600 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html +113 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_find.html +173 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_flash.html +146 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash.js +285 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html +46 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_form.html +106 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_hiddenfield.html +118 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_image.html +252 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image.js +492 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image_preview.html +66 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_link.html +293 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_link/fck_link.js +715 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html +116 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_paste.html +340 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html +109 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_replace.html +452 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_select.html +177 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_select/fck_select.js +194 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_smiley.html +106 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_source.html +65 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_specialchar.html +118 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages.html +64 -0
- data/{spec/fixtures/notifications.yml → public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html} +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js +87 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html +153 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm +146 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php +196 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +180 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js +462 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html +71 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css +49 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js +272 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_table.html +293 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_tablecell.html +255 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_template.html +242 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_template/images/template1.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_template/images/template2.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_template/images/template3.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_textarea.html +95 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_textfield.html +140 -0
- data/public/javascripts/fckeditor/editor/dtd/fck_dtd_test.html +43 -0
- data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10strict.js +116 -0
- data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10transitional.js +140 -0
- data/public/javascripts/fckeditor/editor/fckdebug.html +153 -0
- data/public/javascripts/fckeditor/editor/fckdialog.html +336 -0
- data/public/javascripts/fckeditor/editor/fckeditor.html +228 -0
- data/public/javascripts/fckeditor/editor/fckeditor.original.html +331 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.css +89 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.html +163 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +67 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html +113 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmfolders.html +196 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +167 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +65 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmupload.html +114 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/ButtonArrow.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/Folder.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/Folder32.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/FolderOpened.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/FolderOpened32.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/FolderUp.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/ai.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/avi.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/cs.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/dll.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/doc.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/exe.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/fla.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/gif.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/htm.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/html.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/js.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/png.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/swf.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/swt.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/txt.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/xls.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/xml.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/32/zip.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/ai.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/avi.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/bmp.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/cs.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/dll.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/doc.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/exe.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/fla.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/gif.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/htm.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/html.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/jpg.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/js.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/mdb.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/mp3.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/pdf.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/png.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/ppt.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/rdp.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/swf.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/swt.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/txt.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/vsd.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/xls.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/xml.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/icons/zip.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/images/spacer.gif +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/common.js +55 -0
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/fckxml.js +129 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/basexml.asp +62 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/class_upload.asp +353 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/commands.asp +198 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/config.asp +128 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/connector.asp +88 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/io.asp +222 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/upload.asp +61 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/util.asp +55 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/connector.aspx +30 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/upload.aspx +30 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc +273 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm +315 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm +296 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm +68 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm +225 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm +89 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm +288 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm +68 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm +132 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/config.cfm +183 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/connector.cfm +31 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/image.cfc +1325 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/upload.cfm +31 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/config.lasso +65 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/connector.lasso +257 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/upload.lasso +157 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/basexml.pl +63 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/commands.pl +168 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/connector.cgi +137 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/io.pl +131 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload.cgi +118 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl +667 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/util.pl +68 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/basexml.php +93 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/commands.php +245 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/config.php +140 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/connector.php +87 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/io.php +272 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/phpcompat.php +17 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/upload.php +59 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/util.php +185 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/config.py +135 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py +118 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py +181 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py +90 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py +111 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py +127 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt +23 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py +88 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py +58 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/zope.py +189 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/test.html +177 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/uploadtest.html +149 -0
- data/public/javascripts/fckeditor/editor/images/anchor.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/arrow_ltr.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/arrow_rtl.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/angel_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/angry_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/broken_heart.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/cake.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/confused_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/cry_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/devil_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/embaressed_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/envelope.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/heart.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/kiss.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/lightbulb.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/omg_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/regular_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/sad_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/shades_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/teeth_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/thumbs_down.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/thumbs_up.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/tounge_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif +0 -0
- data/public/javascripts/fckeditor/editor/images/smiley/msn/wink_smile.gif +0 -0
- data/{test/mocks/themes/standard_issue → public/javascripts/fckeditor/editor}/images/spacer.gif +0 -0
- data/public/javascripts/fckeditor/editor/js/fckeditorcode_gecko.js +108 -0
- data/public/javascripts/fckeditor/editor/js/fckeditorcode_ie.js +109 -0
- data/public/javascripts/fckeditor/editor/lang/_translationstatus.txt +76 -0
- data/public/javascripts/fckeditor/editor/lang/af.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ar.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/bg.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/bn.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/bs.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ca.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/cs.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/da.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/de.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/el.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/en-au.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/en-ca.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/en-uk.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/en.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/eo.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/es.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/et.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/eu.js +517 -0
- data/public/javascripts/fckeditor/editor/lang/fa.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/fi.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/fo.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/fr.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/gl.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/he.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/hi.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/hr.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/hu.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/it.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ja.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/km.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ko.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/lt.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/lv.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/mn.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ms.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/nb.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/nl.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/no.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/pl.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/pt-br.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/pt.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ro.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/ru.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/sk.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/sl.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/sr-latn.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/sr.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/sv.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/th.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/tr.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/uk.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/vi.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/zh-cn.js +516 -0
- data/public/javascripts/fckeditor/editor/lang/zh.js +516 -0
- data/public/javascripts/fckeditor/editor/plugins/autogrow/fckplugin.js +92 -0
- data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.config.js +26 -0
- data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.html +67 -0
- data/public/javascripts/fckeditor/editor/plugins/bbcode/fckplugin.js +123 -0
- data/public/javascripts/fckeditor/editor/plugins/dragresizetable/fckplugin.js +503 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/fck_placeholder.html +100 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/fckplugin.js +187 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/de.js +27 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/en.js +27 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/fr.js +27 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/it.js +27 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/pl.js +27 -0
- data/public/javascripts/fckeditor/editor/plugins/placeholder/placeholder.gif +0 -0
- data/public/javascripts/fckeditor/editor/plugins/simplecommands/fckplugin.js +29 -0
- data/public/javascripts/fckeditor/editor/plugins/tablecommands/fckplugin.js +33 -0
- data/public/javascripts/fckeditor/editor/skins/_fckviewstrips.html +121 -0
- data/public/javascripts/fckeditor/editor/skins/default/fck_dialog.css +139 -0
- data/public/javascripts/fckeditor/editor/skins/default/fck_editor.css +464 -0
- data/public/javascripts/fckeditor/editor/skins/default/fck_strip.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.arrowright.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.collapse.gif +0 -0
- data/{themes/standard_issue/images/spacer.gif → public/javascripts/fckeditor/editor/skins/default/images/toolbar.end.gif} +0 -0
- data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.expand.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.separator.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/default/images/toolbar.start.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_dialog.css +140 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_editor.css +476 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_strip.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.bg.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.end.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.expand.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.separator.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/office2003/images/toolbar.start.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/fck_dialog.css +143 -0
- data/public/javascripts/fckeditor/editor/skins/silver/fck_editor.css +473 -0
- data/public/javascripts/fckeditor/editor/skins/silver/fck_strip.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.collapse.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.end.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.expand.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.separator.gif +0 -0
- data/public/javascripts/fckeditor/editor/skins/silver/images/toolbar.start.gif +0 -0
- data/public/javascripts/fckeditor/fckconfig.js +306 -0
- data/public/javascripts/fckeditor/fckeditor.afp +161 -0
- data/public/javascripts/fckeditor/fckeditor.asp +235 -0
- data/public/javascripts/fckeditor/fckeditor.cfc +273 -0
- data/public/javascripts/fckeditor/fckeditor.cfm +210 -0
- data/public/javascripts/fckeditor/fckeditor.js +212 -0
- data/public/javascripts/fckeditor/fckeditor.lasso +112 -0
- data/public/javascripts/fckeditor/fckeditor.py +162 -0
- data/public/javascripts/fckeditor/fckpackager.xml +262 -0
- data/public/javascripts/fckeditor/fckstyles.xml +114 -0
- data/public/javascripts/fckeditor/fcktemplates.xml +103 -0
- data/public/javascripts/fckeditor/license.txt +1247 -0
- data/public/javascripts/lang/default.js +21 -0
- data/public/javascripts/lang/fr_FR.js +21 -0
- data/public/javascripts/lightbox.js +169 -315
- data/public/javascripts/prototype.js +2817 -1107
- data/public/javascripts/typo.js +51 -11
- data/public/stylesheets/administration.css +170 -94
- data/public/stylesheets/lightbox.css +59 -19
- data/public/stylesheets/typo_code.css +62 -0
- data/public/stylesheets/user-styles.css +16 -0
- data/spec/controllers/accounts_controller_spec.rb +2 -7
- data/spec/controllers/admin/article_preview_spec.rb +20 -0
- data/spec/controllers/admin/blacklist_controller_spec.rb +59 -0
- data/spec/controllers/admin/categories_controller_spec.rb +97 -0
- data/spec/controllers/admin/comments_controller_spec.rb +74 -0
- data/spec/controllers/admin/content_controller_spec.rb +212 -0
- data/spec/controllers/admin/feedback_controller_spec.rb +45 -0
- data/spec/controllers/admin/pages_controller_spec.rb +83 -0
- data/spec/controllers/admin/profiles_controller_spec.rb +13 -0
- data/spec/controllers/admin/resources_controller_spec.rb +46 -0
- data/spec/controllers/admin/settings_controller_spec.rb +22 -0
- data/spec/controllers/admin/textfilters_controller_spec.rb +24 -0
- data/spec/controllers/admin/themes_controller_spec.rb +30 -0
- data/spec/controllers/admin/trackbacks_controller_spec.rb +57 -0
- data/spec/controllers/admin/users_controller_spec.rb +65 -0
- data/spec/controllers/articles_controller_spec.rb +4 -8
- data/spec/controllers/authors_controller_spec.rb +2 -2
- data/spec/controllers/backend_controller_spec.rb +318 -0
- data/spec/controllers/categories_controller_spec.rb +2 -2
- data/spec/controllers/comments_controller_spec.rb +8 -20
- data/spec/controllers/redirect_controller_spec.rb +35 -0
- data/spec/controllers/tags_controller_spec.rb +2 -2
- data/spec/controllers/textfilter_controller_spec.rb +264 -0
- data/spec/controllers/theme_controller_spec.rb +43 -0
- data/spec/controllers/xml_controller_spec.rb +232 -0
- data/spec/models/article_closing_spec.rb +38 -0
- data/spec/models/article_spec.rb +285 -9
- data/spec/models/blacklist_pattern_spec.rb +12 -0
- data/spec/models/blog_spec.rb +10 -4
- data/spec/models/cache_support_spec.rb +0 -4
- data/spec/models/category_spec.rb +1 -5
- data/spec/models/comment_spec.rb +186 -0
- data/spec/models/configuration_spec.rb +7 -9
- data/spec/models/content_state/feedback_states_spec.rb +64 -0
- data/spec/models/notification_spec.rb +8 -0
- data/spec/models/page_spec.rb +2 -10
- data/spec/models/ping_pinger_spec.rb +33 -0
- data/spec/models/ping_spec.rb +2 -9
- data/spec/models/resource_spec.rb +0 -2
- data/spec/models/route_cache_spec.rb +11 -0
- data/spec/models/sidebar_spec.rb +7 -0
- data/spec/models/tag_spec.rb +19 -8
- data/spec/models/theme_spec.rb +6 -7
- data/spec/models/trackback_spec.rb +1 -1
- data/spec/models/trigger_spec.rb +0 -2
- data/spec/models/typo_deprecated_spec.rb +18 -0
- data/spec/models/url_policy_spec.rb +65 -0
- data/spec/models/user_spec.rb +9 -4
- data/spec/spec.opts +2 -5
- data/spec/spec_helper.rb +5 -2
- data/spec/views/comments/html_sanitization_spec.rb +0 -14
- data/test/fixtures/blacklist_patterns.yml +1 -3
- data/test/fixtures/blogs.yml +2 -44
- data/test/fixtures/categories.yml +0 -6
- data/test/fixtures/categorizations.yml +17 -17
- data/test/fixtures/contents.yml +15 -53
- data/test/fixtures/feedback.yml +11 -31
- data/test/fixtures/profiles.yml +9 -0
- data/test/fixtures/redirects.yml +0 -3
- data/test/fixtures/resources.yml +3 -6
- data/test/fixtures/sidebars.yml +0 -2
- data/test/fixtures/tags.yml +3 -6
- data/test/fixtures/text_filters.yml +1 -6
- data/test/fixtures/users.yml +0 -10
- data/test/mocks/themes/typographic/.DS_Store +0 -0
- data/test/mocks/themes/typographic/about.markdown +7 -0
- data/test/mocks/themes/typographic/images/Thumbs.db +0 -0
- data/test/mocks/themes/typographic/images/accept.png +0 -0
- data/test/mocks/themes/typographic/images/accept50.png +0 -0
- data/test/mocks/themes/typographic/images/bg_body.jpg +0 -0
- data/test/mocks/themes/typographic/images/bg_white.png +0 -0
- data/test/mocks/themes/typographic/images/bg_wrapper.jpg +0 -0
- data/test/mocks/themes/typographic/images/bullet_bottom.png +0 -0
- data/test/mocks/themes/typographic/images/bullet_right.png +0 -0
- data/test/mocks/themes/typographic/images/email_open.png +0 -0
- data/test/mocks/themes/typographic/images/email_open50.png +0 -0
- data/test/mocks/themes/typographic/images/meta.png +0 -0
- data/test/mocks/themes/typographic/images/page_edit.png +0 -0
- data/test/mocks/themes/typographic/images/page_edit50.png +0 -0
- data/test/mocks/themes/typographic/images/tag.png +0 -0
- data/test/mocks/themes/typographic/images/user.png +0 -0
- data/test/mocks/themes/typographic/images/user50.png +0 -0
- data/test/mocks/themes/typographic/images/world_link.png +0 -0
- data/test/mocks/themes/typographic/images/world_link50.png +0 -0
- data/test/mocks/themes/typographic/layouts/default.html.erb +42 -0
- data/test/mocks/themes/typographic/preview.png +0 -0
- data/test/mocks/themes/typographic/stylesheets/colors.css +51 -0
- data/test/mocks/themes/typographic/stylesheets/layout.css +346 -0
- data/test/mocks/themes/typographic/stylesheets/reset.css +5 -0
- data/test/mocks/themes/typographic/stylesheets/style.css +36 -0
- data/test/mocks/themes/typographic/views/articles/_article.html.erb +41 -0
- data/test/mocks/themes/typographic/views/articles/_comment.html.erb +14 -0
- data/test/mocks/themes/typographic/views/articles/_comment_form.html.erb +48 -0
- data/test/mocks/themes/typographic/views/articles/_comment_list.html.erb +7 -0
- data/test/mocks/themes/typographic/views/articles/_trackback.html.erb +9 -0
- data/test/mocks/themes/typographic/views/articles/comment_preview.html.erb +10 -0
- data/test/mocks/themes/typographic/views/articles/index.html.erb +5 -0
- data/test/mocks/themes/typographic/views/articles/read.html.erb +42 -0
- data/test/mocks/themes/typographic/views/shared/_search.html.erb +17 -0
- data/test/mocks/themes/typographic/views/theme/static_view_test.html.erb +1 -0
- data/test/test_helper.rb +4 -0
- data/themes/scribbish/layouts/default.html.erb +4 -2
- data/themes/scribbish/stylesheets/content.css +1 -0
- data/themes/scribbish/views/articles/_article.html.erb +6 -6
- data/themes/scribbish/views/articles/_comment.html.erb +1 -1
- data/themes/scribbish/views/articles/_comment_form.html.erb +10 -10
- data/themes/scribbish/views/articles/_comment_list.html.erb +1 -1
- data/themes/scribbish/views/articles/_trackback.html.erb +1 -1
- data/themes/scribbish/views/articles/comment_preview.html.erb +1 -1
- data/themes/scribbish/views/articles/index.html.erb +1 -1
- data/themes/scribbish/views/articles/read.html.erb +4 -4
- data/themes/scribbish/views/shared/_search.html.erb +1 -1
- data/themes/typographic/.DS_Store +0 -0
- data/themes/typographic/about.markdown +7 -0
- data/themes/typographic/images/accept.png +0 -0
- data/themes/typographic/images/accept50.png +0 -0
- data/themes/typographic/images/bg_body.jpg +0 -0
- data/themes/typographic/images/bg_white.png +0 -0
- data/themes/typographic/images/bg_wrapper.jpg +0 -0
- data/themes/typographic/images/bullet_bottom.png +0 -0
- data/themes/typographic/images/bullet_right.png +0 -0
- data/themes/typographic/images/email_open.png +0 -0
- data/themes/typographic/images/email_open50.png +0 -0
- data/themes/typographic/images/meta.png +0 -0
- data/themes/typographic/images/page_edit.png +0 -0
- data/themes/typographic/images/page_edit50.png +0 -0
- data/themes/typographic/images/tag.png +0 -0
- data/themes/typographic/images/user.png +0 -0
- data/themes/typographic/images/user50.png +0 -0
- data/themes/typographic/images/world_link.png +0 -0
- data/themes/typographic/images/world_link50.png +0 -0
- data/themes/typographic/layouts/default.html.erb +42 -0
- data/themes/typographic/preview.png +0 -0
- data/themes/typographic/stylesheets/colors.css +51 -0
- data/themes/typographic/stylesheets/layout.css +346 -0
- data/themes/typographic/stylesheets/reset.css +5 -0
- data/themes/typographic/stylesheets/style.css +36 -0
- data/themes/typographic/views/articles/_article.html.erb +41 -0
- data/themes/typographic/views/articles/_comment.html.erb +14 -0
- data/themes/typographic/views/articles/_comment_form.html.erb +48 -0
- data/themes/typographic/views/articles/_comment_list.html.erb +7 -0
- data/themes/typographic/views/articles/_trackback.html.erb +9 -0
- data/themes/typographic/views/articles/comment_preview.html.erb +10 -0
- data/themes/typographic/views/articles/index.html.erb +5 -0
- data/themes/typographic/views/articles/read.html.erb +42 -0
- data/themes/typographic/views/shared/_search.html.erb +17 -0
- data/themes/typographic/views/theme/static_view_test.html.erb +1 -0
- data/themes/typographic2/.DS_Store +0 -0
- data/themes/typographic2/about.markdown +7 -0
- data/themes/typographic2/images/Thumbs.db +0 -0
- data/themes/typographic2/images/accept.png +0 -0
- data/themes/typographic2/images/accept50.png +0 -0
- data/themes/typographic2/images/bg_body.jpg +0 -0
- data/themes/typographic2/images/bg_white.png +0 -0
- data/themes/typographic2/images/bg_wrapper.jpg +0 -0
- data/themes/typographic2/images/bullet_bottom.png +0 -0
- data/themes/typographic2/images/bullet_right.png +0 -0
- data/themes/typographic2/images/email_open.png +0 -0
- data/themes/typographic2/images/email_open50.png +0 -0
- data/themes/typographic2/images/meta.png +0 -0
- data/themes/typographic2/images/page_edit.png +0 -0
- data/themes/typographic2/images/page_edit50.png +0 -0
- data/themes/typographic2/images/tag.png +0 -0
- data/themes/typographic2/images/user.png +0 -0
- data/themes/typographic2/images/user50.png +0 -0
- data/themes/typographic2/images/world_link.png +0 -0
- data/themes/typographic2/images/world_link50.png +0 -0
- data/themes/typographic2/layouts/default.html.erb +42 -0
- data/themes/typographic2/preview.png +0 -0
- data/themes/typographic2/stylesheets/colors.css +51 -0
- data/themes/typographic2/stylesheets/layout.css +346 -0
- data/themes/typographic2/stylesheets/reset.css +5 -0
- data/themes/typographic2/stylesheets/style.css +36 -0
- data/themes/typographic2/views/articles/_article.html.erb +41 -0
- data/themes/typographic2/views/articles/_comment.html.erb +14 -0
- data/themes/typographic2/views/articles/_comment_form.html.erb +48 -0
- data/themes/typographic2/views/articles/_comment_list.html.erb +7 -0
- data/themes/typographic2/views/articles/_trackback.html.erb +9 -0
- data/themes/typographic2/views/articles/comment_preview.html.erb +10 -0
- data/themes/typographic2/views/articles/index.html.erb +5 -0
- data/themes/typographic2/views/articles/read.html.erb +42 -0
- data/themes/typographic2/views/shared/_search.html.erb +17 -0
- data/themes/{standard_issue → typographic2}/views/theme/static_view_test.html.erb +0 -0
- data/vendor/plugins/archives_sidebar/lib/archives_sidebar.rb +1 -1
- data/vendor/plugins/auto_complete/README +23 -0
- data/vendor/plugins/auto_complete/Rakefile +22 -0
- data/vendor/plugins/auto_complete/init.rb +2 -0
- data/vendor/plugins/auto_complete/lib/auto_complete.rb +47 -0
- data/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb +143 -0
- data/vendor/plugins/auto_complete/test/auto_complete_test.rb +67 -0
- data/vendor/plugins/datestamped_resources/lib/datestamped_resources.rb +2 -1
- data/vendor/plugins/fckeditor/CHANGELOG +3 -0
- data/vendor/plugins/fckeditor/README +125 -0
- data/vendor/plugins/fckeditor/Rakefile +72 -0
- data/vendor/plugins/fckeditor/app/controllers/fckeditor_controller.rb +158 -0
- data/vendor/plugins/fckeditor/app/helpers/fckeditor_helper.rb +4 -0
- data/vendor/plugins/fckeditor/app/views/fckeditor/spell_check.rhtml +52 -0
- data/vendor/plugins/fckeditor/init.rb +35 -0
- data/vendor/plugins/fckeditor/install.rb +12 -0
- data/vendor/plugins/fckeditor/lib/fckeditor.rb +101 -0
- data/vendor/plugins/fckeditor/lib/fckeditor_file_utils.rb +81 -0
- data/vendor/plugins/fckeditor/lib/fckeditor_spell_check.rb +43 -0
- data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +9 -0
- data/vendor/plugins/fckeditor/tasks/fckeditor_tasks.rake +97 -0
- data/vendor/plugins/rspec/.autotest +3 -0
- data/vendor/plugins/rspec/CHANGES +33 -1
- data/vendor/plugins/rspec/README +2 -3
- data/vendor/plugins/rspec/Rakefile +7 -5
- data/vendor/plugins/rspec/bin/spec +1 -0
- data/vendor/plugins/rspec/examples/pure/helper_method_example.rb +9 -6
- data/vendor/plugins/rspec/failing_examples/README.txt +7 -0
- data/vendor/plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb +19 -0
- data/vendor/plugins/rspec/lib/autotest/rspec.rb +36 -56
- data/vendor/plugins/rspec/lib/spec.rb +0 -7
- data/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb +10 -4
- data/vendor/plugins/rspec/lib/spec/example/example_methods.rb +13 -8
- data/vendor/plugins/rspec/lib/spec/interop/test.rb +3 -1
- data/vendor/plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/matchers.rb +1 -7
- data/vendor/plugins/rspec/lib/spec/matchers/be.rb +3 -2
- data/vendor/plugins/rspec/lib/spec/matchers/have.rb +3 -0
- data/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb +19 -15
- data/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb +10 -3
- data/vendor/plugins/rspec/lib/spec/runner.rb +14 -0
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb +6 -2
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb +15 -7
- data/vendor/plugins/rspec/lib/spec/runner/option_parser.rb +5 -33
- data/vendor/plugins/rspec/lib/spec/runner/options.rb +51 -18
- data/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb +49 -31
- data/vendor/plugins/rspec/lib/spec/story/extensions.rb +2 -0
- data/vendor/plugins/rspec/lib/spec/story/extensions/regexp.rb +9 -0
- data/vendor/plugins/rspec/lib/spec/story/extensions/string.rb +9 -0
- data/vendor/plugins/rspec/lib/spec/story/runner.rb +0 -2
- data/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb +8 -8
- data/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb +2 -1
- data/vendor/plugins/rspec/lib/spec/story/step.rb +18 -8
- data/vendor/plugins/rspec/lib/spec/story/world.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/version.rb +22 -22
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit.rb +4 -0
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/core.rb +50 -0
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb +54 -0
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec.rb +111 -0
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb +313 -0
- data/vendor/plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb +15 -0
- data/vendor/plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb +36 -0
- data/vendor/plugins/rspec/pre_commit/spec/spec_helper.rb +3 -0
- data/vendor/plugins/rspec/pre_commit/spec/spec_suite.rb +11 -0
- data/vendor/plugins/rspec/report.html +4358 -0
- data/vendor/plugins/rspec/spec/README.jruby +1 -0
- data/vendor/plugins/rspec/spec/autotest/rspec_spec.rb +15 -84
- data/vendor/plugins/rspec/spec/autotest_helper.rb +2 -1
- data/vendor/plugins/rspec/spec/autotest_matchers.rb +47 -0
- data/vendor/plugins/rspec/spec/rspec_suite.rb +1 -1
- data/vendor/plugins/rspec/{spec.opts → spec/spec.opts} +0 -0
- data/vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb +11 -2
- data/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb +70 -41
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_fails.rb +10 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_passes.rb +10 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_errors.rb +10 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_fails.rb +10 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_passes.rb +10 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_with_errors.rb +10 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb +38 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb +45 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb +1 -1
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb +40 -5
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/testsuite_adapter_spec.rb +2 -2
- data/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb +19 -0
- data/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb +3 -3
- data/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb +7 -1
- data/vendor/plugins/rspec/spec/spec/mocks/bug_report_10263.rb +1 -1
- data/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb +3 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html +381 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb +5 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb +97 -51
- data/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb +50 -49
- data/vendor/plugins/rspec/spec/spec/runner/options_spec.rb +72 -2
- data/vendor/plugins/rspec/spec/spec/runner/resources/a_bar.rb +0 -0
- data/vendor/plugins/rspec/spec/spec/runner/resources/a_foo.rb +0 -0
- data/vendor/plugins/rspec/spec/spec/runner/resources/a_spec.rb +1 -0
- data/vendor/plugins/rspec/spec/spec/runner/spec_parser/spec_parser_fixture.rb +70 -0
- data/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb +31 -76
- data/vendor/plugins/rspec/spec/spec/spec_classes.rb +7 -0
- data/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb +37 -0
- data/vendor/plugins/rspec/spec/spec/story/step_spec.rb +53 -0
- data/vendor/plugins/rspec/spec/spec/story/world_spec.rb +7 -0
- data/vendor/plugins/rspec/stories/example_groups/autogenerated_docstrings +27 -8
- data/vendor/plugins/rspec/stories/example_groups/output +5 -0
- data/vendor/plugins/rspec/stories/interop/test_case_with_should_methods +1 -1
- data/vendor/plugins/rspec/stories/resources/stories/failing_story.rb +15 -0
- data/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts +0 -1
- data/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb +1 -2
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb +1 -3
- data/vendor/plugins/rspec_on_rails/lib/autotest/discover.rb +1 -0
- data/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb +47 -47
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb +14 -4
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/functional_example_group.rb +4 -4
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb +0 -1
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb +8 -0
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/view_example_group.rb +4 -5
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb +2 -2
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb +4 -0
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb +23 -23
- data/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb +14 -17
- data/vendor/plugins/rspec_on_rails/spec/rails/example/controller_spec_spec.rb +13 -0
- data/vendor/plugins/rspec_on_rails/spec/rails/example/view_spec_spec.rb +15 -1
- data/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb +37 -26
- data/vendor/plugins/rspec_on_rails/spec/rails/matchers/have_text_spec.rb +62 -0
- data/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb +73 -36
- data/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb +9 -1
- data/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb +4 -0
- data/vendor/plugins/rspec_on_rails/stories/all.rb +4 -0
- data/vendor/plugins/rspec_on_rails/tasks/rspec.rake +10 -8
- data/vendor/plugins/static_sidebar/lib/static_sidebar.rb +4 -8
- data/vendor/plugins/typo_converter/README +71 -0
- data/vendor/plugins/typo_converter/Rakefile +22 -0
- data/vendor/plugins/typo_converter/init.rb +8 -0
- data/vendor/plugins/typo_converter/lib/converters/base.rb +249 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear.rb +98 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear/category.rb +7 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear/comment.rb +8 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear/post.rb +9 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear/user.rb +8 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear_2.rb +122 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear_2/category.rb +11 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear_2/comment.rb +13 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear_2/post.rb +15 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear_2/tag.rb +13 -0
- data/vendor/plugins/typo_converter/lib/converters/dotclear_2/user.rb +13 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25.rb +128 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25/comment.rb +12 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25/post.rb +37 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25/term.rb +11 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25/term_relationship.rb +13 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25/term_taxonomy.rb +19 -0
- data/vendor/plugins/typo_converter/lib/converters/wp25/user.rb +12 -0
- data/vendor/plugins/typo_converter/tasks/typo_converters_tasks.rake +4 -0
- data/vendor/plugins/typo_login_system/init.rb +2 -0
- data/vendor/plugins/typo_login_system/lib/access_control.rb +159 -0
- data/vendor/plugins/typo_login_system/lib/login_system.rb +90 -0
- data/vendor/plugins/xml_sidebar/lib/xml_sidebar.rb +1 -1
- metadata +823 -527
- data/CHANGES-5.0 +0 -82
- data/TODO.MULTIUSERS +0 -45
- data/app/views/admin/advanced/index.html.erb +0 -20
- data/app/views/admin/blacklist/list.html.erb +0 -13
- data/app/views/admin/cache/list.html.erb +0 -8
- data/app/views/admin/categories/list.html.erb +0 -18
- data/app/views/admin/categories/show.html.erb +0 -37
- data/app/views/admin/comments/comments.html.erb +0 -4
- data/app/views/admin/comments/list.html.erb +0 -37
- data/app/views/admin/comments/new.html.erb +0 -19
- data/app/views/admin/content/_show_categories.html.erb +0 -9
- data/app/views/admin/content/list.html.erb +0 -21
- data/app/views/admin/content/preview.html.erb +0 -10
- data/app/views/admin/feedback/list.html.erb +0 -48
- data/app/views/admin/pages/list.html.erb +0 -12
- data/app/views/admin/pages/preview.html.erb +0 -1
- data/app/views/admin/resources/list.html.erb +0 -17
- data/app/views/admin/textfilters/list.html.erb +0 -16
- data/app/views/admin/trackbacks/list.html.erb +0 -31
- data/app/views/admin/trackbacks/new.html.erb +0 -15
- data/app/views/admin/users/list.html.erb +0 -32
- data/app/views/admin/users/show.html.erb +0 -23
- data/app/views/layouts/minimal.html.erb +0 -145
- data/db/converters/wordpress.rb +0 -187
- data/db/converters/wordpress2.rb +0 -291
- data/lib/jabber_notify.rb +0 -37
- data/lib/login_system.rb +0 -85
- data/lib/tasks/rcov.rake +0 -38
- data/public/images/admin/bgdivider.gif +0 -0
- data/public/images/admin/bgoff2.png +0 -0
- data/public/images/admin/bgon.png +0 -0
- data/public/images/admin/foot.jpg +0 -0
- data/public/images/admin/table-header-last.png +0 -0
- data/public/images/admin/table-header.png +0 -0
- data/public/images/admin/top.gif +0 -0
- data/public/images/admin/typo.gif +0 -0
- data/public/images/admin/typologo.png +0 -0
- data/public/images/bracket.gif +0 -0
- data/public/images/header.jpg +0 -0
- data/public/images/loading.gif +0 -0
- data/public/javascripts/tiny_mce/langs/en.js +0 -154
- data/public/javascripts/tiny_mce/license.txt +0 -504
- data/public/javascripts/tiny_mce/plugins/advimage/css/advimage.css +0 -13
- data/public/javascripts/tiny_mce/plugins/advimage/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/advimage/editor_plugin_src.js +0 -49
- data/public/javascripts/tiny_mce/plugins/advimage/image.htm +0 -237
- data/public/javascripts/tiny_mce/plugins/advimage/img/sample.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/advimage/js/image.js +0 -403
- data/public/javascripts/tiny_mce/plugins/advimage/langs/en_dlg.js +0 -43
- data/public/javascripts/tiny_mce/plugins/advlink/css/advlink.css +0 -8
- data/public/javascripts/tiny_mce/plugins/advlink/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/advlink/editor_plugin_src.js +0 -58
- data/public/javascripts/tiny_mce/plugins/advlink/js/advlink.js +0 -551
- data/public/javascripts/tiny_mce/plugins/advlink/langs/en_dlg.js +0 -52
- data/public/javascripts/tiny_mce/plugins/advlink/link.htm +0 -339
- data/public/javascripts/tiny_mce/plugins/autosave/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/autosave/editor_plugin_src.js +0 -51
- data/public/javascripts/tiny_mce/plugins/contextmenu/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js +0 -84
- data/public/javascripts/tiny_mce/plugins/emotions/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/emotions/editor_plugin_src.js +0 -40
- data/public/javascripts/tiny_mce/plugins/emotions/emotions.htm +0 -41
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cool.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cry.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-frown.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-smile.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-wink.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/img/smiley-yell.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/emotions/js/emotions.js +0 -22
- data/public/javascripts/tiny_mce/plugins/emotions/langs/en_dlg.js +0 -20
- data/public/javascripts/tiny_mce/plugins/media/css/content.css +0 -6
- data/public/javascripts/tiny_mce/plugins/media/css/media.css +0 -68
- data/public/javascripts/tiny_mce/plugins/media/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/media/editor_plugin_src.js +0 -323
- data/public/javascripts/tiny_mce/plugins/media/img/flash.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/media/img/flv_player.swf +0 -0
- data/public/javascripts/tiny_mce/plugins/media/img/quicktime.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/media/img/realmedia.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/media/img/shockwave.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/media/img/trans.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/media/img/windowsmedia.gif +0 -0
- data/public/javascripts/tiny_mce/plugins/media/js/embed.js +0 -73
- data/public/javascripts/tiny_mce/plugins/media/js/media.js +0 -616
- data/public/javascripts/tiny_mce/plugins/media/langs/en_dlg.js +0 -103
- data/public/javascripts/tiny_mce/plugins/media/media.htm +0 -823
- data/public/javascripts/tiny_mce/plugins/nonbreaking/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js +0 -50
- data/public/javascripts/tiny_mce/plugins/paste/blank.htm +0 -22
- data/public/javascripts/tiny_mce/plugins/paste/css/blank.css +0 -14
- data/public/javascripts/tiny_mce/plugins/paste/css/pasteword.css +0 -3
- data/public/javascripts/tiny_mce/plugins/paste/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/paste/editor_plugin_src.js +0 -382
- data/public/javascripts/tiny_mce/plugins/paste/js/pastetext.js +0 -42
- data/public/javascripts/tiny_mce/plugins/paste/js/pasteword.js +0 -56
- data/public/javascripts/tiny_mce/plugins/paste/langs/en_dlg.js +0 -5
- data/public/javascripts/tiny_mce/plugins/paste/pastetext.htm +0 -34
- data/public/javascripts/tiny_mce/plugins/paste/pasteword.htm +0 -29
- data/public/javascripts/tiny_mce/plugins/safari/blank.htm +0 -1
- data/public/javascripts/tiny_mce/plugins/safari/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/safari/editor_plugin_src.js +0 -401
- data/public/javascripts/tiny_mce/plugins/save/editor_plugin.js +0 -1
- data/public/javascripts/tiny_mce/plugins/save/editor_plugin_src.js +0 -103
- data/public/javascripts/tiny_mce/themes/advanced/about.htm +0 -56
- data/public/javascripts/tiny_mce/themes/advanced/anchor.htm +0 -32
- data/public/javascripts/tiny_mce/themes/advanced/charmap.htm +0 -53
- data/public/javascripts/tiny_mce/themes/advanced/color_picker.htm +0 -74
- data/public/javascripts/tiny_mce/themes/advanced/editor_template.js +0 -1
- data/public/javascripts/tiny_mce/themes/advanced/editor_template_src.js +0 -990
- data/public/javascripts/tiny_mce/themes/advanced/image.htm +0 -86
- data/public/javascripts/tiny_mce/themes/advanced/img/colorpicker.jpg +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/js/about.js +0 -76
- data/public/javascripts/tiny_mce/themes/advanced/js/anchor.js +0 -30
- data/public/javascripts/tiny_mce/themes/advanced/js/charmap.js +0 -327
- data/public/javascripts/tiny_mce/themes/advanced/js/color_picker.js +0 -245
- data/public/javascripts/tiny_mce/themes/advanced/js/image.js +0 -232
- data/public/javascripts/tiny_mce/themes/advanced/js/link.js +0 -110
- data/public/javascripts/tiny_mce/themes/advanced/js/source_editor.js +0 -62
- data/public/javascripts/tiny_mce/themes/advanced/langs/en.js +0 -62
- data/public/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +0 -51
- data/public/javascripts/tiny_mce/themes/advanced/link.htm +0 -64
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/content.css +0 -18
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +0 -111
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/buttons.png +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/items.gif +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/progress.gif +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +0 -193
- data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +0 -18
- data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +0 -111
- data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png +0 -0
- data/public/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +0 -193
- data/public/javascripts/tiny_mce/themes/advanced/source_editor.htm +0 -32
- data/public/javascripts/tiny_mce/themes/simple/editor_template.js +0 -1
- data/public/javascripts/tiny_mce/themes/simple/editor_template_src.js +0 -85
- data/public/javascripts/tiny_mce/themes/simple/img/icons.gif +0 -0
- data/public/javascripts/tiny_mce/themes/simple/langs/en.js +0 -11
- data/public/javascripts/tiny_mce/themes/simple/skins/default/content.css +0 -25
- data/public/javascripts/tiny_mce/themes/simple/skins/default/ui.css +0 -32
- data/public/javascripts/tiny_mce/themes/simple/skins/o2k7/content.css +0 -17
- data/public/javascripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png +0 -0
- data/public/javascripts/tiny_mce/themes/simple/skins/o2k7/ui.css +0 -35
- data/public/javascripts/tiny_mce/tiny_mce.js +0 -1
- data/public/javascripts/tiny_mce/tiny_mce_popup.js +0 -221
- data/public/javascripts/tiny_mce/tiny_mce_src.js +0 -8803
- data/public/javascripts/tiny_mce/utils/editable_selects.js +0 -61
- data/public/javascripts/tiny_mce/utils/form_utils.js +0 -193
- data/public/javascripts/tiny_mce/utils/mclayer.js +0 -210
- data/public/javascripts/tiny_mce/utils/mctabs.js +0 -74
- data/public/javascripts/tiny_mce/utils/validate.js +0 -219
- data/public/stylesheets/minimal.css +0 -143
- data/spec/fixtures/blacklist_patterns.yml +0 -10
- data/spec/fixtures/blogs.yml +0 -77
- data/spec/fixtures/categories.yml +0 -35
- data/spec/fixtures/categorizations.yml +0 -31
- data/spec/fixtures/contents.yml +0 -205
- data/spec/fixtures/feedback.yml +0 -159
- data/spec/fixtures/page_caches.yml +0 -7
- data/spec/fixtures/profiles.yml +0 -11
- data/spec/fixtures/redirects.yml +0 -13
- data/spec/fixtures/resources.yml +0 -24
- data/spec/fixtures/sidebars.yml +0 -12
- data/spec/fixtures/tags.yml +0 -10
- data/spec/fixtures/text_filters.yml +0 -42
- data/spec/fixtures/triggers.yml +0 -1
- data/spec/fixtures/users.yml +0 -56
- data/spec/helpers/comments_helper_spec.rb +0 -11
- data/test/fixtures/articles_tags.yml +0 -19
- data/test/functional/accounts_controller_test.rb +0 -78
- data/test/functional/admin/article_preview_test.rb +0 -82
- data/test/functional/admin/blacklist_controller_test.rb +0 -63
- data/test/functional/admin/categories_controller_test.rb +0 -106
- data/test/functional/admin/comments_controller_test.rb +0 -78
- data/test/functional/admin/content_controller_test.rb +0 -232
- data/test/functional/admin/feedback_controller_test.rb +0 -59
- data/test/functional/admin/pages_controller_test.rb +0 -88
- data/test/functional/admin/profiles_controller_test.rb +0 -18
- data/test/functional/admin/resources_controller_test.rb +0 -49
- data/test/functional/admin/settings_controller_test.rb +0 -26
- data/test/functional/admin/textfilters_controller_test.rb +0 -29
- data/test/functional/admin/themes_controller_test.rb +0 -34
- data/test/functional/admin/trackbacks_controller_test.rb +0 -76
- data/test/functional/admin/users_controller_test.rb +0 -78
- data/test/functional/articles_controller_test.rb +0 -263
- data/test/functional/backend_controller_test.rb +0 -287
- data/test/functional/redirect_controller_test.rb +0 -40
- data/test/functional/textfilter_controller_test.rb +0 -273
- data/test/functional/theme_controller_test.rb +0 -45
- data/test/functional/xml_controller_test.rb +0 -235
- data/test/mocks/themes/standard_issue/about.markdown +0 -5
- data/test/mocks/themes/standard_issue/images/img01.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img02.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img03.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img04.jpg +0 -0
- data/test/mocks/themes/standard_issue/images/img05.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img06.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img07.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img08.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img09.gif +0 -0
- data/test/mocks/themes/standard_issue/images/img10.gif +0 -0
- data/test/mocks/themes/standard_issue/images/spinner.gif +0 -0
- data/test/mocks/themes/standard_issue/layouts/default.html.erb +0 -61
- data/test/mocks/themes/standard_issue/preview.png +0 -0
- data/test/mocks/themes/standard_issue/stylesheets/application.css +0 -461
- data/test/mocks/themes/standard_issue/views/articles/_article.html.erb +0 -32
- data/test/mocks/themes/standard_issue/views/articles/_comment.html.erb +0 -12
- data/test/mocks/themes/standard_issue/views/articles/_comment_form.html.erb +0 -48
- data/test/mocks/themes/standard_issue/views/articles/_comment_list.html.erb +0 -7
- data/test/mocks/themes/standard_issue/views/articles/_trackback.html.erb +0 -9
- data/test/mocks/themes/standard_issue/views/articles/comment_preview.html.erb +0 -10
- data/test/mocks/themes/standard_issue/views/articles/index.html.erb +0 -5
- data/test/mocks/themes/standard_issue/views/articles/read.html.erb +0 -42
- data/test/mocks/themes/standard_issue/views/shared/_search.html.erb +0 -17
- data/test/mocks/themes/standard_issue/views/theme/static_view_test.rhtml +0 -1
- data/test/unit/amazon_sidebar_test.rb +0 -36
- data/test/unit/article_closing_test.rb +0 -40
- data/test/unit/article_test.rb +0 -304
- data/test/unit/assumptions_tests.rb +0 -54
- data/test/unit/blacklist_pattern_test.rb +0 -14
- data/test/unit/blog_test.rb +0 -52
- data/test/unit/cache_support_test.rb +0 -62
- data/test/unit/category_test.rb +0 -42
- data/test/unit/comment_test.rb +0 -188
- data/test/unit/configuration_test.rb +0 -21
- data/test/unit/content_state/feedback_states_test.rb +0 -67
- data/test/unit/metafragment_test.rb +0 -63
- data/test/unit/notification_mailer_test.rb +0 -55
- data/test/unit/notification_test.rb +0 -10
- data/test/unit/page_test.rb +0 -45
- data/test/unit/ping_pinger_test.rb +0 -30
- data/test/unit/ping_test.rb +0 -127
- data/test/unit/redirect_test.rb +0 -19
- data/test/unit/resource_test.rb +0 -71
- data/test/unit/route_cache_test.rb +0 -11
- data/test/unit/sidebar_test.rb +0 -9
- data/test/unit/static_sidebar_test.rb +0 -19
- data/test/unit/tag_test.rb +0 -71
- data/test/unit/text_filter_test.rb +0 -126
- data/test/unit/theme_test.rb +0 -44
- data/test/unit/trackback_test.rb +0 -22
- data/test/unit/trigger_test.rb +0 -40
- data/test/unit/typo_deprecated_test.rb +0 -22
- data/test/unit/user_test.rb +0 -111
- data/themes/dirtylicious/about.markdown +0 -3
- data/themes/dirtylicious/images/body.jpg +0 -0
- data/themes/dirtylicious/images/container.jpg +0 -0
- data/themes/dirtylicious/images/gravatar.gif +0 -0
- data/themes/dirtylicious/images/header.jpg +0 -0
- data/themes/dirtylicious/images/li.gif +0 -0
- data/themes/dirtylicious/images/main.gif +0 -0
- data/themes/dirtylicious/images/nav.gif +0 -0
- data/themes/dirtylicious/images/quote.gif +0 -0
- data/themes/dirtylicious/images/spinner.gif +0 -0
- data/themes/dirtylicious/layouts/default.html.erb +0 -60
- data/themes/dirtylicious/preview.png +0 -0
- data/themes/dirtylicious/stylesheets/application.css +0 -327
- data/themes/dirtylicious/views/articles/_article.html.erb +0 -33
- data/themes/dirtylicious/views/articles/_comment.html.erb +0 -14
- data/themes/dirtylicious/views/articles/_comment_form.html.erb +0 -37
- data/themes/dirtylicious/views/articles/_comment_list.html.erb +0 -7
- data/themes/dirtylicious/views/articles/_trackback.html.erb +0 -9
- data/themes/dirtylicious/views/articles/comment_preview.html.erb +0 -10
- data/themes/dirtylicious/views/articles/index.html.erb +0 -5
- data/themes/dirtylicious/views/articles/read.html.erb +0 -42
- data/themes/dirtylicious/views/shared/_search.html.erb +0 -16
- data/themes/standard_issue/about.markdown +0 -5
- data/themes/standard_issue/images/img01.gif +0 -0
- data/themes/standard_issue/images/img02.gif +0 -0
- data/themes/standard_issue/images/img03.gif +0 -0
- data/themes/standard_issue/images/img04.jpg +0 -0
- data/themes/standard_issue/images/img05.gif +0 -0
- data/themes/standard_issue/images/img06.gif +0 -0
- data/themes/standard_issue/images/img07.gif +0 -0
- data/themes/standard_issue/images/img08.gif +0 -0
- data/themes/standard_issue/images/img09.gif +0 -0
- data/themes/standard_issue/images/img10.gif +0 -0
- data/themes/standard_issue/images/spinner.gif +0 -0
- data/themes/standard_issue/layouts/default.html.erb +0 -59
- data/themes/standard_issue/preview.png +0 -0
- data/themes/standard_issue/stylesheets/application.css +0 -461
- data/themes/standard_issue/views/articles/_article.html.erb +0 -32
- data/themes/standard_issue/views/articles/_comment.html.erb +0 -12
- data/themes/standard_issue/views/articles/_comment_form.html.erb +0 -48
- data/themes/standard_issue/views/articles/_comment_list.html.erb +0 -7
- data/themes/standard_issue/views/articles/_trackback.html.erb +0 -9
- data/themes/standard_issue/views/articles/comment_preview.html.erb +0 -10
- data/themes/standard_issue/views/articles/index.html.erb +0 -5
- data/themes/standard_issue/views/articles/read.html.erb +0 -42
- data/themes/standard_issue/views/shared/_search.html.erb +0 -17
- data/vendor/jabber4r/CHANGES +0 -8
- data/vendor/jabber4r/LICENSE.txt +0 -12
- data/vendor/jabber4r/README +0 -180
- data/vendor/jabber4r/Rakefile.rb +0 -143
- data/vendor/jabber4r/lib/jabber4r/jabber4r.rb +0 -22
- data/vendor/jabber4r/lib/jabber4r/jid.rb +0 -93
- data/vendor/jabber4r/lib/jabber4r/protocol.rb +0 -1384
- data/vendor/jabber4r/lib/jabber4r/rexml_1.8_patch.rb +0 -16
- data/vendor/jabber4r/lib/jabber4r/roster.rb +0 -322
- data/vendor/jabber4r/lib/jabber4r/session.rb +0 -615
- data/vendor/jabber4r/lib/jabber4r/vcard.rb +0 -42
- data/vendor/plugins/haml/MIT-LICENSE +0 -20
- data/vendor/plugins/haml/REFERENCE +0 -662
- data/vendor/plugins/haml/Rakefile +0 -171
- data/vendor/plugins/haml/VERSION +0 -1
- data/vendor/plugins/haml/bin/haml +0 -18
- data/vendor/plugins/haml/init.rb +0 -3
- data/vendor/plugins/haml/lib/haml/buffer.rb +0 -224
- data/vendor/plugins/haml/lib/haml/engine.rb +0 -557
- data/vendor/plugins/haml/lib/haml/helpers.rb +0 -220
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +0 -54
- data/vendor/plugins/haml/lib/haml/template.rb +0 -138
- data/vendor/plugins/haml/test/benchmark.rb +0 -62
- data/vendor/plugins/haml/test/engine_test.rb +0 -93
- data/vendor/plugins/haml/test/helper_test.rb +0 -105
- data/vendor/plugins/haml/test/mocks/article.rb +0 -6
- data/vendor/plugins/haml/test/profile.rb +0 -45
- data/vendor/plugins/haml/test/results/content_for_layout.xhtml +0 -16
- data/vendor/plugins/haml/test/results/eval_suppressed.xhtml +0 -2
- data/vendor/plugins/haml/test/results/helpers.xhtml +0 -50
- data/vendor/plugins/haml/test/results/helpful.xhtml +0 -5
- data/vendor/plugins/haml/test/results/just_stuff.xhtml +0 -38
- data/vendor/plugins/haml/test/results/list.xhtml +0 -12
- data/vendor/plugins/haml/test/results/original_engine.xhtml +0 -24
- data/vendor/plugins/haml/test/results/partials.xhtml +0 -20
- data/vendor/plugins/haml/test/results/silent_script.xhtml +0 -74
- data/vendor/plugins/haml/test/results/standard.xhtml +0 -42
- data/vendor/plugins/haml/test/results/tag_parsing.xhtml +0 -28
- data/vendor/plugins/haml/test/results/very_basic.xhtml +0 -7
- data/vendor/plugins/haml/test/results/whitespace_handling.xhtml +0 -51
- data/vendor/plugins/haml/test/rhtml/standard.rhtml +0 -51
- data/vendor/plugins/haml/test/runner.rb +0 -15
- data/vendor/plugins/haml/test/template_test.rb +0 -137
- data/vendor/plugins/haml/test/templates/_partial.haml +0 -7
- data/vendor/plugins/haml/test/templates/_text_area.haml +0 -3
- data/vendor/plugins/haml/test/templates/content_for_layout.haml +0 -10
- data/vendor/plugins/haml/test/templates/eval_suppressed.haml +0 -5
- data/vendor/plugins/haml/test/templates/helpers.haml +0 -39
- data/vendor/plugins/haml/test/templates/helpful.haml +0 -6
- data/vendor/plugins/haml/test/templates/just_stuff.haml +0 -34
- data/vendor/plugins/haml/test/templates/list.haml +0 -12
- data/vendor/plugins/haml/test/templates/original_engine.haml +0 -17
- data/vendor/plugins/haml/test/templates/partialize.haml +0 -1
- data/vendor/plugins/haml/test/templates/partials.haml +0 -12
- data/vendor/plugins/haml/test/templates/silent_script.haml +0 -40
- data/vendor/plugins/haml/test/templates/standard.haml +0 -40
- data/vendor/plugins/haml/test/templates/tag_parsing.haml +0 -24
- data/vendor/plugins/haml/test/templates/very_basic.haml +0 -4
- data/vendor/plugins/haml/test/templates/whitespace_handling.haml +0 -66
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec_with_test_unit.rb +0 -20
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/testsuite_adapter_spec_with_test_unit.rb +0 -34
- data/vendor/plugins/rspec_on_rails/generators/helpers/rails_identifier.rb +0 -16
- data/vendor/plugins/tiny_mce/README +0 -10
- data/vendor/plugins/tiny_mce/Rakefile +0 -22
- data/vendor/plugins/tiny_mce/TODO +0 -2
- data/vendor/plugins/tiny_mce/changelog +0 -1017
- data/vendor/plugins/tiny_mce/init.rb +0 -3
- data/vendor/plugins/tiny_mce/install.rb +0 -1
- data/vendor/plugins/tiny_mce/lib/tiny_mce.rb +0 -36
- data/vendor/plugins/tiny_mce/lib/tiny_mce_helper.rb +0 -48
- data/vendor/plugins/tiny_mce/tasks/tiny_mce.rake +0 -40
- data/vendor/plugins/tiny_mce/test/helper_testcase.rb +0 -38
- data/vendor/plugins/tiny_mce/test/tiny_mce_helper_test.rb +0 -67
- data/vendor/plugins/tiny_mce/test/tiny_mce_test.rb +0 -85
- data/vendor/plugins/tiny_mce/tiny_mce_options.yml +0 -121
@@ -1,22 +0,0 @@
|
|
1
|
-
# License: see LICENSE.txt
|
2
|
-
# Jabber4R - Jabber Instant Messaging Library for Ruby
|
3
|
-
# Copyright (C) 2002 Rich Kilmer <rich@infoether.com>
|
4
|
-
#
|
5
|
-
|
6
|
-
##
|
7
|
-
# The Jabber module is the main namespace for all Jabber modules
|
8
|
-
# and classes.
|
9
|
-
#
|
10
|
-
module Jabber
|
11
|
-
VERSION_MAJOR = 0
|
12
|
-
VERSION_MINOR = 6
|
13
|
-
RELEASE = 0
|
14
|
-
DEBUG = false
|
15
|
-
end
|
16
|
-
|
17
|
-
require "jabber4r/session"
|
18
|
-
require "jabber4r/protocol"
|
19
|
-
require "jabber4r/roster"
|
20
|
-
require "jabber4r/jid"
|
21
|
-
require "jabber4r/vcard"
|
22
|
-
|
@@ -1,93 +0,0 @@
|
|
1
|
-
# License: see LICENSE.txt
|
2
|
-
# Jabber4R - Jabber Instant Messaging Library for Ruby
|
3
|
-
# Copyright (C) 2002 Rich Kilmer <rich@infoether.com>
|
4
|
-
#
|
5
|
-
|
6
|
-
module Jabber
|
7
|
-
|
8
|
-
##
|
9
|
-
# The Jabber ID class is used to hold a parsed jabber identifier (account+host+resource)
|
10
|
-
#
|
11
|
-
class JID
|
12
|
-
|
13
|
-
# The node (account)
|
14
|
-
attr_accessor :node
|
15
|
-
|
16
|
-
# The resource id
|
17
|
-
attr_accessor :resource
|
18
|
-
|
19
|
-
# The host name (or IP address)
|
20
|
-
attr_accessor :host
|
21
|
-
|
22
|
-
def JID.to_jid(id)
|
23
|
-
return id if id.kind_of? JID
|
24
|
-
return JID.new(id)
|
25
|
-
end
|
26
|
-
|
27
|
-
#@@Pattern = /([^@""'\s:]+)\@([-.\w]+)\/?(.*)/
|
28
|
-
|
29
|
-
##
|
30
|
-
# Constructs a JID from the supplied string of the format:
|
31
|
-
# node@host[/resource] (e.g. "rich_kilmer@jabber.com/laptop")
|
32
|
-
#
|
33
|
-
# id:: [String] The jabber id string to parse
|
34
|
-
#
|
35
|
-
def initialize(id)
|
36
|
-
at_loc = id.index('@')
|
37
|
-
slash_loc = id.index('/')
|
38
|
-
if at_loc.nil? and slash_loc.nil?
|
39
|
-
@host = id
|
40
|
-
end
|
41
|
-
if at_loc
|
42
|
-
@node = id[0,at_loc]
|
43
|
-
host_end = slash_loc ? slash_loc-(at_loc+1) : id.size-(at_loc+1)
|
44
|
-
@host = id[at_loc+1,host_end]
|
45
|
-
@resource = id[slash_loc+1, id.size] if slash_loc
|
46
|
-
end
|
47
|
-
end
|
48
|
-
|
49
|
-
##
|
50
|
-
# Evalutes whether the node, resource and host are the same
|
51
|
-
#
|
52
|
-
# other:: [Jabber::JID] The other jabber id
|
53
|
-
# return:: [Boolean] True if they match
|
54
|
-
def ==(other)
|
55
|
-
return true if other.node==@node and other.resource==@resource and other.host==@host
|
56
|
-
return false
|
57
|
-
end
|
58
|
-
|
59
|
-
def same_account?(other)
|
60
|
-
other = JID.to_jid(other)
|
61
|
-
return true if other.node==@node and other.host==@host
|
62
|
-
return false
|
63
|
-
end
|
64
|
-
|
65
|
-
##
|
66
|
-
# Removes the resource from this JID
|
67
|
-
#
|
68
|
-
def strip_resource
|
69
|
-
@resource=nil
|
70
|
-
return self
|
71
|
-
end
|
72
|
-
|
73
|
-
##
|
74
|
-
# Returns the string ("node@host/resource") representation of this JID
|
75
|
-
#
|
76
|
-
# return:: [String] String form of JID
|
77
|
-
#
|
78
|
-
def to_s
|
79
|
-
result = (@node.to_s+"@"+@host.to_s)
|
80
|
-
result += ("/"+@resource) if @resource
|
81
|
-
return result
|
82
|
-
end
|
83
|
-
|
84
|
-
##
|
85
|
-
# Override #hash to hash based on the to_s method
|
86
|
-
#
|
87
|
-
def hash
|
88
|
-
return to_s.hash
|
89
|
-
end
|
90
|
-
end
|
91
|
-
|
92
|
-
end
|
93
|
-
|
@@ -1,1384 +0,0 @@
|
|
1
|
-
# License: see LICENSE.txt
|
2
|
-
# Jabber4R - Jabber Instant Messaging Library for Ruby
|
3
|
-
# Copyright (C) 2002 Rich Kilmer <rich@infoether.com>
|
4
|
-
#
|
5
|
-
|
6
|
-
|
7
|
-
require 'singleton'
|
8
|
-
require 'socket'
|
9
|
-
|
10
|
-
module Jabber
|
11
|
-
|
12
|
-
class JabberConnectionException < RuntimeError
|
13
|
-
attr_reader :data
|
14
|
-
|
15
|
-
def initialize(writing, data)
|
16
|
-
@writing = writing
|
17
|
-
@data = data
|
18
|
-
end
|
19
|
-
|
20
|
-
def writing?
|
21
|
-
@writing
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|
25
|
-
##
|
26
|
-
# The Protocol module contains helper methods for constructing
|
27
|
-
# Jabber protocol elements and classes that implement protocol
|
28
|
-
# elements.
|
29
|
-
#
|
30
|
-
module Protocol
|
31
|
-
|
32
|
-
USE_PARSER = :rexml # either :rexml or :xmlparser
|
33
|
-
|
34
|
-
##
|
35
|
-
# The parser to use for stream processing. The current
|
36
|
-
# available parsers are:
|
37
|
-
#
|
38
|
-
# * Jabber::Protocol::ExpatJabberParser uses XMLParser
|
39
|
-
# * Jabber::Protocol::REXMLJabberParser uses REXML
|
40
|
-
#
|
41
|
-
# return:: [Class] The parser class
|
42
|
-
#
|
43
|
-
def Protocol.Parser
|
44
|
-
if USE_PARSER==:xmlparser
|
45
|
-
Jabber::Protocol::ExpatJabberParser
|
46
|
-
else
|
47
|
-
Jabber::Protocol::REXMLJabberParser
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
##
|
52
|
-
# The connection class encapsulates the connection to the Jabber
|
53
|
-
# service including managing the socket and controlling the parsing
|
54
|
-
# of the Jabber XML stream.
|
55
|
-
#
|
56
|
-
class Connection
|
57
|
-
DISCONNECTED = 1
|
58
|
-
CONNECTED = 2
|
59
|
-
|
60
|
-
attr_reader :host, :port, :status, :input, :output
|
61
|
-
|
62
|
-
def initialize(host, port=5222)
|
63
|
-
@host = host
|
64
|
-
@port = port
|
65
|
-
@status = DISCONNECTED
|
66
|
-
@filters = {}
|
67
|
-
@threadBlocks = {}
|
68
|
-
@pollCounter = 10
|
69
|
-
end
|
70
|
-
|
71
|
-
##
|
72
|
-
# Connects to the Jabber server through a TCP Socket and
|
73
|
-
# starts the Jabber parser.
|
74
|
-
#
|
75
|
-
def connect
|
76
|
-
@socket = TCPSocket.new(@host, @port)
|
77
|
-
@parser = Jabber::Protocol.Parser.new(@socket, self)
|
78
|
-
@parserThread = Thread.new {@parser.parse}
|
79
|
-
@pollThread = Thread.new {poll}
|
80
|
-
@status = CONNECTED
|
81
|
-
end
|
82
|
-
|
83
|
-
##
|
84
|
-
# Mounts a block to handle exceptions if they occur during the
|
85
|
-
# poll send. This will likely be the first indication that
|
86
|
-
# the socket dropped in a Jabber Session.
|
87
|
-
#
|
88
|
-
def on_connection_exception(&block)
|
89
|
-
@exception_block = block
|
90
|
-
end
|
91
|
-
|
92
|
-
def parse_failure
|
93
|
-
Thread.new {@exception_block.call if @exception_block}
|
94
|
-
end
|
95
|
-
|
96
|
-
##
|
97
|
-
# Returns if this connection is connected to a Jabber service
|
98
|
-
#
|
99
|
-
# return:: [Boolean] Connection status
|
100
|
-
#
|
101
|
-
def is_connected?
|
102
|
-
return @status == CONNECTED
|
103
|
-
end
|
104
|
-
|
105
|
-
##
|
106
|
-
# Returns if this connection is NOT connected to a Jabber service
|
107
|
-
#
|
108
|
-
# return:: [Boolean] Connection status
|
109
|
-
#
|
110
|
-
def is_disconnected?
|
111
|
-
return @status == DISCONNECTED
|
112
|
-
end
|
113
|
-
|
114
|
-
##
|
115
|
-
# Processes a received ParsedXMLElement and executes
|
116
|
-
# registered thread blocks and filters against it.
|
117
|
-
#
|
118
|
-
# element:: [ParsedXMLElement] The received element
|
119
|
-
#
|
120
|
-
def receive(element)
|
121
|
-
while @threadBlocks.size==0 && @filters.size==0
|
122
|
-
sleep 0.1
|
123
|
-
end
|
124
|
-
Jabber::DEBUG && puts("RECEIVED:\n#{element.to_s}")
|
125
|
-
@threadBlocks.each do |thread, proc|
|
126
|
-
begin
|
127
|
-
proc.call(element)
|
128
|
-
if element.element_consumed?
|
129
|
-
@threadBlocks.delete(thread)
|
130
|
-
thread.wakeup if thread.alive?
|
131
|
-
return
|
132
|
-
end
|
133
|
-
rescue Exception => error
|
134
|
-
puts error.to_s
|
135
|
-
puts error.backtrace.join("\n")
|
136
|
-
end
|
137
|
-
end
|
138
|
-
@filters.each_value do |proc|
|
139
|
-
begin
|
140
|
-
proc.call(element)
|
141
|
-
return if element.element_consumed?
|
142
|
-
rescue Exception => error
|
143
|
-
puts error.to_s
|
144
|
-
puts error.backtrace.join("\n")
|
145
|
-
end
|
146
|
-
end
|
147
|
-
end
|
148
|
-
|
149
|
-
##
|
150
|
-
# Sends XML data to the socket and (optionally) waits
|
151
|
-
# to process received data.
|
152
|
-
#
|
153
|
-
# xml:: [String] The xml data to send
|
154
|
-
# proc:: [Proc = nil] The optional proc
|
155
|
-
# &block:: [Block] The optional block
|
156
|
-
#
|
157
|
-
def send(xml, proc=nil, &block)
|
158
|
-
Jabber::DEBUG && puts("SENDING:\n#{ xml.kind_of?(String) ? xml : xml.to_s }")
|
159
|
-
xml = xml.to_s if not xml.kind_of? String
|
160
|
-
block = proc if proc
|
161
|
-
@threadBlocks[Thread.current]=block if block
|
162
|
-
begin
|
163
|
-
@socket << xml
|
164
|
-
rescue
|
165
|
-
raise JabberConnectionException.new(true, xml)
|
166
|
-
end
|
167
|
-
@pollCounter = 10
|
168
|
-
end
|
169
|
-
|
170
|
-
##
|
171
|
-
# Starts a polling thread to send "keep alive" data to prevent
|
172
|
-
# the Jabber connection from closing for inactivity.
|
173
|
-
#
|
174
|
-
def poll
|
175
|
-
sleep 10
|
176
|
-
while true
|
177
|
-
sleep 2
|
178
|
-
@pollCounter = @pollCounter - 1
|
179
|
-
if @pollCounter < 0
|
180
|
-
begin
|
181
|
-
send(" \t ")
|
182
|
-
rescue
|
183
|
-
Thread.new {@exception_block.call if @exception_block}
|
184
|
-
break
|
185
|
-
end
|
186
|
-
end
|
187
|
-
end
|
188
|
-
end
|
189
|
-
|
190
|
-
##
|
191
|
-
# Adds a filter block/proc to process received XML messages
|
192
|
-
#
|
193
|
-
# xml:: [String] The xml data to send
|
194
|
-
# proc:: [Proc = nil] The optional proc
|
195
|
-
# &block:: [Block] The optional block
|
196
|
-
#
|
197
|
-
def add_filter(ref, proc=nil, &block)
|
198
|
-
block = proc if proc
|
199
|
-
raise "Must supply a block or Proc object to the addFilter method" if block.nil?
|
200
|
-
@filters[ref] = block
|
201
|
-
end
|
202
|
-
|
203
|
-
def delete_filter(ref)
|
204
|
-
@filters.delete(ref)
|
205
|
-
end
|
206
|
-
|
207
|
-
##
|
208
|
-
# Closes the connection to the Jabber service
|
209
|
-
#
|
210
|
-
def close
|
211
|
-
@parserThread.kill if @parserThread
|
212
|
-
@pollThread.kill
|
213
|
-
@socket.close if @socket
|
214
|
-
@status = DISCONNECTED
|
215
|
-
end
|
216
|
-
end
|
217
|
-
|
218
|
-
##
|
219
|
-
# Generates an open stream XML element
|
220
|
-
#
|
221
|
-
# host:: [String] The host being connected to
|
222
|
-
# return:: [String] The XML data to send
|
223
|
-
#
|
224
|
-
def Protocol.gen_open_stream(host)
|
225
|
-
return ('<?xml version="1.0" encoding="UTF-8" ?><stream:stream to="'+host+'" xmlns="jabber:client" xmlns:stream="http://etherx.jabber.org/streams">')
|
226
|
-
end
|
227
|
-
|
228
|
-
##
|
229
|
-
# Generates an close stream XML element
|
230
|
-
#
|
231
|
-
# return:: [String] The XML data to send
|
232
|
-
#
|
233
|
-
def Protocol.gen_close_stream
|
234
|
-
return "</stream:stream>"
|
235
|
-
end
|
236
|
-
|
237
|
-
##
|
238
|
-
# The presence class is used to construct presence messages to
|
239
|
-
# send to the Jabber service.
|
240
|
-
#
|
241
|
-
class Presence
|
242
|
-
attr_accessor :to, :from, :id, :type
|
243
|
-
|
244
|
-
# The state to show (chat, xa, dnd, away)
|
245
|
-
attr_accessor :show
|
246
|
-
|
247
|
-
# The status message
|
248
|
-
attr_accessor :status
|
249
|
-
attr_accessor :priority
|
250
|
-
|
251
|
-
##
|
252
|
-
# Constructs a Presence object w/the supplied id
|
253
|
-
#
|
254
|
-
# id:: [String] The message ID
|
255
|
-
# show:: [String] The state to show
|
256
|
-
# status:: [String] The status message
|
257
|
-
#
|
258
|
-
def initialize(id, show=nil, status=nil)
|
259
|
-
@id = id
|
260
|
-
@show = show if show
|
261
|
-
@status = status if status
|
262
|
-
end
|
263
|
-
|
264
|
-
##
|
265
|
-
# Generate a presence object for initial presence notification
|
266
|
-
#
|
267
|
-
# id:: [String] The message ID
|
268
|
-
# show:: [String] The state to show
|
269
|
-
# status:: [String] The status message
|
270
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
271
|
-
#
|
272
|
-
def Presence.gen_initial(id, show=nil, status=nil)
|
273
|
-
Presence.new(id, show, status)
|
274
|
-
end
|
275
|
-
|
276
|
-
##
|
277
|
-
# Generate a presence object w/show="normal" (normal availability)
|
278
|
-
#
|
279
|
-
# id:: [String] The message ID
|
280
|
-
# status:: [String=nil] The status message
|
281
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
282
|
-
#
|
283
|
-
def Presence.gen_normal(id, status=nil)
|
284
|
-
Presence.new(id, "normal", status)
|
285
|
-
end
|
286
|
-
|
287
|
-
##
|
288
|
-
# Generate a presence object w/show="chat" (free for chat)
|
289
|
-
#
|
290
|
-
# id:: [String] The message ID
|
291
|
-
# status:: [String=nil] The status message
|
292
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
293
|
-
#
|
294
|
-
def Presence.gen_chat(id, status=nil)
|
295
|
-
Presence.new(id, "chat", status)
|
296
|
-
end
|
297
|
-
|
298
|
-
##
|
299
|
-
# Generate a presence object w/show="xa" (extended away)
|
300
|
-
#
|
301
|
-
# id:: [String] The message ID
|
302
|
-
# status:: [String=nil] The status message
|
303
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
304
|
-
#
|
305
|
-
def Presence.gen_xa(id, status=nil)
|
306
|
-
Presence.new(id, "xa", status)
|
307
|
-
end
|
308
|
-
|
309
|
-
##
|
310
|
-
# Generate a presence object w/show="dnd" (do not disturb)
|
311
|
-
#
|
312
|
-
# id:: [String] The message ID
|
313
|
-
# status:: [String=nil] The status message
|
314
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
315
|
-
#
|
316
|
-
def Presence.gen_dnd(id, status=nil)
|
317
|
-
Presence.new(id, "dnd", status)
|
318
|
-
end
|
319
|
-
|
320
|
-
##
|
321
|
-
# Generate a presence object w/show="away" (away from resource)
|
322
|
-
#
|
323
|
-
# id:: [String] The message ID
|
324
|
-
# status:: [String=nil] The status message
|
325
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
326
|
-
#
|
327
|
-
def Presence.gen_away(id, status=nil)
|
328
|
-
Presence.new(id, "away", status)
|
329
|
-
end
|
330
|
-
|
331
|
-
##
|
332
|
-
# Generate a presence object w/show="unavailable" (not free for chat)
|
333
|
-
#
|
334
|
-
# id:: [String] The message ID
|
335
|
-
# status:: [String=nil] The status message
|
336
|
-
# return:: [Jabber::Protocol::Presence] The newly created Presence object
|
337
|
-
#
|
338
|
-
def Presence.gen_unavailable(id, status=nil)
|
339
|
-
p = Presence.new(id)
|
340
|
-
p.type="unavailable"
|
341
|
-
p
|
342
|
-
end
|
343
|
-
|
344
|
-
def Presence.gen_new_subscription(to)
|
345
|
-
p = Presence.new(Jabber.gen_random_id)
|
346
|
-
p.type = "subscribe"
|
347
|
-
p.to = to
|
348
|
-
p
|
349
|
-
end
|
350
|
-
|
351
|
-
def Presence.gen_accept_subscription(id, jid)
|
352
|
-
p = Presence.new(id)
|
353
|
-
p.type = "subscribed"
|
354
|
-
p.to = jid
|
355
|
-
p
|
356
|
-
end
|
357
|
-
|
358
|
-
def Presence.gen_accept_unsubscription(id, jid)
|
359
|
-
p = Presence.new(id)
|
360
|
-
p.type = "unsubscribed"
|
361
|
-
p.to = jid
|
362
|
-
p
|
363
|
-
end
|
364
|
-
|
365
|
-
##
|
366
|
-
# Generates the xml representation of this Presence object
|
367
|
-
#
|
368
|
-
# return:: [String] The presence XML message to send the Jabber service
|
369
|
-
#
|
370
|
-
def to_xml
|
371
|
-
e = XMLElement.new("presence")
|
372
|
-
e.add_attribute("id", @id) if @id
|
373
|
-
e.add_attribute("from", @from) if @from
|
374
|
-
e.add_attribute("to", @to) if @to
|
375
|
-
e.add_attribute("type", @type) if @type
|
376
|
-
e.add_child("show").add_data(@show) if @show
|
377
|
-
e.add_child("status").add_data(@status) if @status
|
378
|
-
e.add_child("priority") if @priority
|
379
|
-
e.to_s
|
380
|
-
end
|
381
|
-
|
382
|
-
##
|
383
|
-
# see _to_xml
|
384
|
-
#
|
385
|
-
def to_s
|
386
|
-
to_xml
|
387
|
-
end
|
388
|
-
end
|
389
|
-
|
390
|
-
##
|
391
|
-
# A class used to build/parse IQ requests/responses
|
392
|
-
#
|
393
|
-
class Iq
|
394
|
-
attr_accessor :session,:to, :from, :id, :type, :xmlns, :data,:error,:errorcode
|
395
|
-
ERROR="error"
|
396
|
-
GET="get"
|
397
|
-
SET="set"
|
398
|
-
RESULT="result"
|
399
|
-
|
400
|
-
##
|
401
|
-
# Factory to build an IQ object from xml element
|
402
|
-
#
|
403
|
-
# session:: [Jabber::Session] The Jabber session instance
|
404
|
-
# element:: [Jabber::Protocol::ParsedXMLElement] The received XML object
|
405
|
-
# return:: [Jabber::Protocol::Iq] The newly created Iq object
|
406
|
-
#
|
407
|
-
def Iq.from_element(session, element)
|
408
|
-
iq = Iq.new(session)
|
409
|
-
iq.from = Jabber::JID.new(element.attr_from) if element.attr_from
|
410
|
-
iq.to = Jabber::JID.new(element.attr_to) if element.attr_to
|
411
|
-
iq.type = element.attr_type
|
412
|
-
iq.id = element.attr_id
|
413
|
-
iq.session=session
|
414
|
-
iq.xmlns=element.query.attr_xmlns
|
415
|
-
iq.data=element.query
|
416
|
-
return iq
|
417
|
-
end
|
418
|
-
|
419
|
-
##
|
420
|
-
# Default constructor to build an Iq object
|
421
|
-
# session:: [Jabber::Session] The Jabber session instance
|
422
|
-
# id:: [String=nil] The (optional) id of the Iq object
|
423
|
-
def initialize(session,id=nil)
|
424
|
-
@session=session
|
425
|
-
@id=id
|
426
|
-
end
|
427
|
-
|
428
|
-
##
|
429
|
-
# Return an IQ object that uses the jabber:iq:private namespace
|
430
|
-
#
|
431
|
-
def Iq.get_private(session,id,ename,ns)
|
432
|
-
iq=Iq.new(session,id)
|
433
|
-
iq.type="get"
|
434
|
-
iq.xmlns="jabber:iq:private"
|
435
|
-
iq.data=XMLElement.new(ename,{'xmlns' => ns});
|
436
|
-
return iq
|
437
|
-
end
|
438
|
-
|
439
|
-
|
440
|
-
##
|
441
|
-
# Generates an IQ roster request XML element
|
442
|
-
#
|
443
|
-
# id:: [String] The message id
|
444
|
-
# return:: [String] The XML data to send
|
445
|
-
#
|
446
|
-
def Iq.gen_roster(session, id)
|
447
|
-
iq = Iq.new(session, id)
|
448
|
-
iq.type = "get"
|
449
|
-
iq.xmlns = "jabber:iq:roster"
|
450
|
-
return iq
|
451
|
-
#return XMLElement.new("iq", {"type"=>"get", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:roster"}).to_s
|
452
|
-
end
|
453
|
-
|
454
|
-
##
|
455
|
-
# Generates an IQ authortization request XML element
|
456
|
-
#
|
457
|
-
# id:: [String] The message id
|
458
|
-
# username:: [String] The username
|
459
|
-
# password:: [String] The password
|
460
|
-
# email:: [String] The email address of the account
|
461
|
-
# name:: [String] The full name
|
462
|
-
# return:: [String] The XML data to send
|
463
|
-
#
|
464
|
-
def Iq.gen_registration(session, id, username, password, email, name)
|
465
|
-
iq = Iq.new(session, id)
|
466
|
-
iq.type = "set"
|
467
|
-
iq.xmlns = "jabber:iq:register"
|
468
|
-
iq.data = XMLElement.new("username").add_data(username).to_s
|
469
|
-
iq.data << XMLElement.new("password").add_data(password).to_s
|
470
|
-
iq.data << XMLElement.new("email").add_data(email).to_s
|
471
|
-
iq.data << XMLElement.new("name").add_data(name).to_s
|
472
|
-
return iq
|
473
|
-
end
|
474
|
-
|
475
|
-
##
|
476
|
-
# Generates an IQ Roster Item add request XML element
|
477
|
-
#
|
478
|
-
# session:: [Session] The session
|
479
|
-
# id:: [String] The message id
|
480
|
-
# jid:: [JID] The Jabber ID to add to the roster
|
481
|
-
# name:: [String] The full name
|
482
|
-
# return:: [String] The XML data to send
|
483
|
-
#
|
484
|
-
def Iq.gen_add_rosteritem(session, id, jid, name)
|
485
|
-
iq = Iq.new(session, id)
|
486
|
-
iq.type = "set"
|
487
|
-
iq.xmlns = "jabber:iq:roster"
|
488
|
-
iq.data = XMLElement.new("item").add_attribute("jid", jid).add_attribute("name", name).to_s
|
489
|
-
return iq
|
490
|
-
end
|
491
|
-
|
492
|
-
##
|
493
|
-
# Generates an IQ authortization request XML element
|
494
|
-
#
|
495
|
-
# id:: [String] The message id
|
496
|
-
# username:: [String] The username
|
497
|
-
# password:: [String] The password
|
498
|
-
# resource:: [String] The resource to bind this session to
|
499
|
-
# return:: [String] The XML data to send
|
500
|
-
#
|
501
|
-
def Iq.gen_auth(session, id, username, password, resource)
|
502
|
-
iq = Iq.new(session, id)
|
503
|
-
iq.type = "set"
|
504
|
-
iq.xmlns = "jabber:iq:auth"
|
505
|
-
iq.data = XMLElement.new("username").add_data(username).to_s
|
506
|
-
iq.data << XMLElement.new("password").add_data(password).to_s
|
507
|
-
iq.data << XMLElement.new("resource").add_data(resource).to_s
|
508
|
-
return iq
|
509
|
-
#element = XMLElement.new("iq", {"type"=>"set", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:auth"}).add_child("username").add_data(username).to_parent.add_child("password").add_data(password).to_parent.add_child("resource").add_data(resource).to_parent.to_s
|
510
|
-
end
|
511
|
-
|
512
|
-
##
|
513
|
-
# Generates an IQ digest authortization request XML element
|
514
|
-
#
|
515
|
-
# id:: [String] The message id
|
516
|
-
# username:: [String] The username
|
517
|
-
# digest:: [String] The SHA-1 hash of the sessionid and the password
|
518
|
-
# resource:: [String] The resource to bind this session to
|
519
|
-
# return:: [String] The XML data to send
|
520
|
-
#
|
521
|
-
def Iq.gen_auth_digest(session, id, username, digest, resource)
|
522
|
-
iq = Iq.new(session, id)
|
523
|
-
iq.type = "set"
|
524
|
-
iq.xmlns = "jabber:iq:auth"
|
525
|
-
iq.data = XMLElement.new("username").add_data(username).to_s
|
526
|
-
iq.data << XMLElement.new("digest").add_data(digest).to_s
|
527
|
-
iq.data << XMLElement.new("resource").add_data(resource).to_s
|
528
|
-
return iq
|
529
|
-
#return XMLElement.new("iq", {"type"=>"set", "id"=>id}).add_child("query", {"xmlns"=>"jabber:iq:auth"}).add_child("username").add_data(username).to_parent.add_child("digest").add_data(digest).to_parent.add_child("resource").add_data(resource).to_parent.to_s
|
530
|
-
end
|
531
|
-
|
532
|
-
##
|
533
|
-
# Generates an IQ out of bounds XML element
|
534
|
-
#
|
535
|
-
# to:: [JID] The Jabber ID to send to
|
536
|
-
# url:: [String] The data to send
|
537
|
-
# desc:: [String=""] The description of the data
|
538
|
-
# return:: [String] The XML data to send
|
539
|
-
#
|
540
|
-
def Iq.gen_oob(session, to, url, desc="")
|
541
|
-
iq = Iq.new(session, nil)
|
542
|
-
iq.type = "set"
|
543
|
-
iq.xmlns = "jabber:iq:oob"
|
544
|
-
iq.data = XMLElement.new("url").add_data(url).to_s
|
545
|
-
iq.data << XMLElement.new("desc").add_data(desc).to_s
|
546
|
-
return iq
|
547
|
-
#return XMLElement.new("iq", {"type"=>"set"}).add_child("query", {"xmlns"=>"jabber:iq:oob"}).add_child("url").add_data(url).to_parent.add_child("desc").add_data(data).to_parent.to_s
|
548
|
-
end
|
549
|
-
|
550
|
-
##
|
551
|
-
# Generates an VCard request XML element
|
552
|
-
#
|
553
|
-
# id:: [String] The message ID
|
554
|
-
# to:: [JID] The jabber id of the account to get the VCard for
|
555
|
-
# return:: [String] The XML data to send
|
556
|
-
#
|
557
|
-
def Iq.gen_vcard(session, id, to)
|
558
|
-
iq = Iq.new(session, id)
|
559
|
-
iq.xmlns = "vcard-temp"
|
560
|
-
iq.type = "get"
|
561
|
-
iq.to = to
|
562
|
-
return iq
|
563
|
-
#return XMLElement.new("iq", {"type"=>"get", "id"=>id, "to"=>to}).add_child("query", {"xmlns"=>"vcard-temp"}).to_s
|
564
|
-
end
|
565
|
-
|
566
|
-
|
567
|
-
|
568
|
-
|
569
|
-
##
|
570
|
-
# Sends the IQ to the Jabber service for delivery
|
571
|
-
#
|
572
|
-
# wait:: [Boolean = false] Wait for reply before return?
|
573
|
-
# &block:: [Block] A block to process the message replies
|
574
|
-
#
|
575
|
-
def send(wait=false, &block)
|
576
|
-
if wait
|
577
|
-
iq = nil
|
578
|
-
blockedThread = Thread.current
|
579
|
-
@session.connection.send(self.to_s, block) do |je|
|
580
|
-
if je.element_tag == "iq" and je.attr_id == @id
|
581
|
-
je.consume_element
|
582
|
-
iq = Iq.from_element(@session, je)
|
583
|
-
blockedThread.wakeup
|
584
|
-
end
|
585
|
-
end
|
586
|
-
Thread.stop
|
587
|
-
rturn iq
|
588
|
-
else
|
589
|
-
@session.connection.send(self.to_s, block) if @session
|
590
|
-
end
|
591
|
-
end
|
592
|
-
|
593
|
-
##
|
594
|
-
# Builds a reply to an existing Iq
|
595
|
-
#
|
596
|
-
# return:: [Jabber::Protocol::Iq] The result Iq
|
597
|
-
#
|
598
|
-
def reply
|
599
|
-
iq = Iq.new(@session,@id)
|
600
|
-
iq.to = @from
|
601
|
-
iq.id = @id
|
602
|
-
iq.type = 'result'
|
603
|
-
@is_reply = true
|
604
|
-
return iq
|
605
|
-
end
|
606
|
-
|
607
|
-
##
|
608
|
-
# Generates XML that complies with the Jabber protocol for
|
609
|
-
# sending the Iq through the Jabber service.
|
610
|
-
#
|
611
|
-
# return:: [String] The XML string.
|
612
|
-
#
|
613
|
-
def to_xml
|
614
|
-
elem = XMLElement.new("iq", { "type"=>@type})
|
615
|
-
elem.add_attribute("to" ,@to) if @to
|
616
|
-
elem.add_attribute("id", @id) if @id
|
617
|
-
elem.add_child("query").add_attribute("xmlns",@xmlns).add_data(@data.to_s)
|
618
|
-
if @type=="error" then
|
619
|
-
e=elem.add_child("error");
|
620
|
-
e.add_attribute("code",@errorcode) if @errorcode
|
621
|
-
e.add_data(@error) if @error
|
622
|
-
end
|
623
|
-
return elem.to_s
|
624
|
-
end
|
625
|
-
|
626
|
-
##
|
627
|
-
# see to_xml
|
628
|
-
#
|
629
|
-
def to_s
|
630
|
-
to_xml
|
631
|
-
end
|
632
|
-
|
633
|
-
end
|
634
|
-
|
635
|
-
class Message
|
636
|
-
attr_accessor :to, :from, :id, :type, :body, :xhtml, :subject, :thread, :x, :oobData, :errorcode, :error
|
637
|
-
NORMAL = "normal"
|
638
|
-
ERROR="error"
|
639
|
-
CHAT="chat"
|
640
|
-
GROUPCHAT="groupchat"
|
641
|
-
HEADLINE="headline"
|
642
|
-
|
643
|
-
##
|
644
|
-
# Factory to build a Message from an XMLElement
|
645
|
-
#
|
646
|
-
# session:: [Jabber::Session] The Jabber session instance
|
647
|
-
# element:: [Jabber::Protocol::ParsedXMLElement] The received XML object
|
648
|
-
# return:: [Jabber::Protocol::Message] The newly created Message object
|
649
|
-
#
|
650
|
-
def Message.from_element(session, element)
|
651
|
-
message = Message.new(element.attr_to)
|
652
|
-
message.from = Jabber::JID.new(element.attr_from) if element.attr_from
|
653
|
-
message.type = element.attr_type
|
654
|
-
message.id = element.attr_id
|
655
|
-
message.thread = element.thread.element_data
|
656
|
-
message.body = element.body.element_data
|
657
|
-
message.xhtml = element.xhtml.element_data
|
658
|
-
message.subject = element.subject.element_data
|
659
|
-
message.oobData = element.x.element_data
|
660
|
-
message.session=session
|
661
|
-
return message
|
662
|
-
end
|
663
|
-
|
664
|
-
##
|
665
|
-
# Creates a Message
|
666
|
-
#
|
667
|
-
# to:: [String | Jabber::JID] The jabber id to send this message to (or from)
|
668
|
-
# type:: [Integer=NORMAL] The type of message...Message::(NORMAL, CHAT, GROUPCHAT, HEADLINE)
|
669
|
-
#
|
670
|
-
def initialize(to, type=NORMAL)
|
671
|
-
return unless to
|
672
|
-
to = Jabber::JID.new(to) if to.kind_of? String
|
673
|
-
@to = to if to.kind_of? Jabber::JID
|
674
|
-
@type = type
|
675
|
-
end
|
676
|
-
|
677
|
-
##
|
678
|
-
# Chaining method...sets the body of the message
|
679
|
-
#
|
680
|
-
# body:: [String] The message body
|
681
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
682
|
-
#
|
683
|
-
def set_body(body)
|
684
|
-
@body = body.gsub(/[&]/, '&').gsub(/[<]/, '<').gsub(/[']/, ''')
|
685
|
-
self
|
686
|
-
end
|
687
|
-
|
688
|
-
##
|
689
|
-
# Chaining method...sets the subject of the message
|
690
|
-
#
|
691
|
-
# subject:: [String] The message subject
|
692
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
693
|
-
#
|
694
|
-
def set_subject(subject)
|
695
|
-
@subject = subject.gsub(/[&]/, '&').gsub(/[<]/, '<').gsub(/[']/, ''')
|
696
|
-
self
|
697
|
-
end
|
698
|
-
|
699
|
-
##
|
700
|
-
# Chaining method...sets the XHTML body of the message
|
701
|
-
#
|
702
|
-
# body:: [String] The message body
|
703
|
-
# return:: [Jabber::Protocol::Message] The current message object
|
704
|
-
#
|
705
|
-
def set_xhtml(xhtml)
|
706
|
-
@xhtml=xhtml
|
707
|
-
self
|
708
|
-
end
|
709
|
-
|
710
|
-
##
|
711
|
-
# Chaining method...sets the thread of the message
|
712
|
-
#
|
713
|
-
# thread:: [String] The message thread id
|
714
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
715
|
-
#
|
716
|
-
def set_thread(thread)
|
717
|
-
@thread = thread
|
718
|
-
self
|
719
|
-
end
|
720
|
-
|
721
|
-
##
|
722
|
-
# Chaining method...sets the OOB data of the message
|
723
|
-
#
|
724
|
-
# data:: [String] The message OOB data
|
725
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
726
|
-
#
|
727
|
-
def set_outofband(data)
|
728
|
-
@oobData = data
|
729
|
-
self
|
730
|
-
end
|
731
|
-
|
732
|
-
##
|
733
|
-
# Chaining method...sets the extended data of the message
|
734
|
-
#
|
735
|
-
# x:: [String] The message x data
|
736
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
737
|
-
#
|
738
|
-
def set_x(x)
|
739
|
-
@x = x
|
740
|
-
self
|
741
|
-
end
|
742
|
-
|
743
|
-
##
|
744
|
-
# Sets an error code to be returned(chaining method)
|
745
|
-
#
|
746
|
-
# code:: [Integer] the jabber error code
|
747
|
-
# reason:: [String] Why the error was reported
|
748
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
749
|
-
#
|
750
|
-
|
751
|
-
def set_error(code,reason)
|
752
|
-
@errorcode=code
|
753
|
-
@error=reason
|
754
|
-
@type="error"
|
755
|
-
self
|
756
|
-
end
|
757
|
-
|
758
|
-
##
|
759
|
-
# Convenience method for send(true)
|
760
|
-
#
|
761
|
-
# ttl:: [Integer = nil] The time (in seconds) to wait for a reply before assuming nil
|
762
|
-
# &block:: [Block] A block to process the message replies
|
763
|
-
#
|
764
|
-
def request(ttl=nil, &block)
|
765
|
-
send(true, ttl, &block)
|
766
|
-
end
|
767
|
-
|
768
|
-
##
|
769
|
-
# Sends the message to the Jabber service for delivery
|
770
|
-
#
|
771
|
-
# wait:: [Boolean = false] Wait for reply before return?
|
772
|
-
# ttl:: [Integer = nil] The time (in seconds) to wait for a reply before assuming nil
|
773
|
-
# &block:: [Block] A block to process the message replies
|
774
|
-
#
|
775
|
-
def send(wait=false, ttl=nil, &block)
|
776
|
-
if wait
|
777
|
-
message = nil
|
778
|
-
blockedThread = Thread.current
|
779
|
-
timer_thread = nil
|
780
|
-
timeout = false
|
781
|
-
unless ttl.nil?
|
782
|
-
timer_thread = Thread.new {
|
783
|
-
sleep ttl
|
784
|
-
timeout = true
|
785
|
-
blockedThread.wakeup
|
786
|
-
}
|
787
|
-
end
|
788
|
-
@session.connection.send(self.to_s, block) do |je|
|
789
|
-
if je.element_tag == "message" and je.thread.element_data == @thread
|
790
|
-
je.consume_element
|
791
|
-
message = Message.from_element(@session, je)
|
792
|
-
blockedThread.wakeup unless timeout
|
793
|
-
unless timer_thread.nil?
|
794
|
-
timer_thread.kill
|
795
|
-
timer_thread = nil
|
796
|
-
end
|
797
|
-
end
|
798
|
-
end
|
799
|
-
Thread.stop
|
800
|
-
return message
|
801
|
-
else
|
802
|
-
@session.connection.send(self.to_s, block) if @session
|
803
|
-
end
|
804
|
-
end
|
805
|
-
|
806
|
-
##
|
807
|
-
# Sets the session instance
|
808
|
-
#
|
809
|
-
# session:: [Jabber::Session] The session instance
|
810
|
-
# return:: [Jabber::Protocol::Message] The current Message object
|
811
|
-
#
|
812
|
-
def session=(session)
|
813
|
-
@session = session
|
814
|
-
self
|
815
|
-
end
|
816
|
-
|
817
|
-
##
|
818
|
-
# Builds a reply to an existing message by setting:
|
819
|
-
# 1. to = from
|
820
|
-
# 2. id = id
|
821
|
-
# 3. thread = thread
|
822
|
-
# 4. type = type
|
823
|
-
# 5. session = session
|
824
|
-
#
|
825
|
-
# return:: [Jabber::Protocol::Message] The reply message
|
826
|
-
#
|
827
|
-
def reply
|
828
|
-
message = Message.new(nil)
|
829
|
-
message.to = @from
|
830
|
-
message.id = @id
|
831
|
-
message.thread = @thread
|
832
|
-
message.type = @type
|
833
|
-
message.session = @session
|
834
|
-
@is_reply = true
|
835
|
-
return message
|
836
|
-
end
|
837
|
-
|
838
|
-
##
|
839
|
-
# Generates XML that complies with the Jabber protocol for
|
840
|
-
# sending the message through the Jabber service.
|
841
|
-
#
|
842
|
-
# return:: [String] The XML string.
|
843
|
-
#
|
844
|
-
def to_xml
|
845
|
-
@thread = Jabber.gen_random_thread if @thread.nil? and (not @is_reply)
|
846
|
-
elem = XMLElement.new("message", {"to"=>@to, "type"=>@type})
|
847
|
-
elem.add_attribute("id", @id) if @id
|
848
|
-
elem.add_child("thread").add_data(@thread) if @thread
|
849
|
-
elem.add_child("subject").add_data(@subject) if @subject
|
850
|
-
elem.add_child("body").add_data(@body) if @body
|
851
|
-
if @xhtml then
|
852
|
-
t=elem.add_child("xhtml").add_attribute("xmlns","http://www.w3.org/1999/xhtml")
|
853
|
-
t.add_child("body").add_data(@xhtml)
|
854
|
-
end
|
855
|
-
if @type=="error" then
|
856
|
-
e=elem.add_child("error");
|
857
|
-
e.add_attribute("code",@errorcode) if @errorcode
|
858
|
-
e.add_data(@error) if @error
|
859
|
-
end
|
860
|
-
elem.add_child("x").add_attribute("xmlns", "jabber:x:oob").add_data(@oobData) if @oobData
|
861
|
-
elem.add_xml(@x.to_s) if @x
|
862
|
-
return elem.to_s
|
863
|
-
end
|
864
|
-
|
865
|
-
##
|
866
|
-
# see to_xml
|
867
|
-
#
|
868
|
-
def to_s
|
869
|
-
to_xml
|
870
|
-
end
|
871
|
-
|
872
|
-
end
|
873
|
-
|
874
|
-
##
|
875
|
-
# Utility class to create valid XML strings
|
876
|
-
#
|
877
|
-
class XMLElement
|
878
|
-
|
879
|
-
# The parent XMLElement
|
880
|
-
attr_accessor :parent
|
881
|
-
|
882
|
-
##
|
883
|
-
# Construct an XMLElement for the supplied tag and attributes
|
884
|
-
#
|
885
|
-
# tag:: [String] XML tag
|
886
|
-
# attributes:: [Hash = {}] The attribute hash[attribute]=value
|
887
|
-
def initialize(tag, attributes={})
|
888
|
-
@tag = tag
|
889
|
-
@elements = []
|
890
|
-
@attributes = attributes
|
891
|
-
@data = ""
|
892
|
-
end
|
893
|
-
|
894
|
-
##
|
895
|
-
# Adds an attribute to this element
|
896
|
-
#
|
897
|
-
# attrib:: [String] The attribute name
|
898
|
-
# value:: [String] The attribute value
|
899
|
-
# return:: [Jabber::Protocol::XMLElement] self for chaining
|
900
|
-
#
|
901
|
-
def add_attribute(attrib, value)
|
902
|
-
@attributes[attrib]=value
|
903
|
-
self
|
904
|
-
end
|
905
|
-
|
906
|
-
##
|
907
|
-
# Adds data to this element
|
908
|
-
#
|
909
|
-
# data:: [String] The data to add
|
910
|
-
# return:: [Jabber::Protocol::XMLElement] self for chaining
|
911
|
-
#
|
912
|
-
def add_data(data)
|
913
|
-
@data += data.to_s
|
914
|
-
self
|
915
|
-
end
|
916
|
-
|
917
|
-
##
|
918
|
-
# Sets the namespace for this tag
|
919
|
-
#
|
920
|
-
# ns:: [String] The namespace
|
921
|
-
# return:: [Jabber::Protocol::XMLElement] self for chaining
|
922
|
-
#
|
923
|
-
def set_namespace(ns)
|
924
|
-
@tag+=":#{ns}"
|
925
|
-
self
|
926
|
-
end
|
927
|
-
|
928
|
-
##
|
929
|
-
# Adds cdata to this element
|
930
|
-
#
|
931
|
-
# cdata:: [String] The cdata to add
|
932
|
-
# return:: [Jabber::Protocol::XMLElement] self for chaining
|
933
|
-
#
|
934
|
-
def add_cdata(cdata)
|
935
|
-
@data += "<![CDATA[#{cdata.to_s}]]>"
|
936
|
-
self
|
937
|
-
end
|
938
|
-
|
939
|
-
##
|
940
|
-
# Returns the parent element
|
941
|
-
#
|
942
|
-
# return:: [Jabber::Protocol::XMLElement] The parent XMLElement
|
943
|
-
#
|
944
|
-
def to_parent
|
945
|
-
@parent
|
946
|
-
end
|
947
|
-
|
948
|
-
##
|
949
|
-
# Adds a child to this element of the supplied tag
|
950
|
-
#
|
951
|
-
# tag:: [String] The element tag
|
952
|
-
# attributes:: [Hash = {}] The attributes hash[attribute]=value
|
953
|
-
# return:: [Jabber::Protocol::XMLElement] newly created child element
|
954
|
-
#
|
955
|
-
def add_child(tag, attributes={})
|
956
|
-
child = XMLElement.new(tag, attributes)
|
957
|
-
child.parent = self
|
958
|
-
@elements << child
|
959
|
-
return child
|
960
|
-
end
|
961
|
-
|
962
|
-
##
|
963
|
-
# Adds arbitrary XML data to this object
|
964
|
-
#
|
965
|
-
# xml:: [String] the xml to add
|
966
|
-
#
|
967
|
-
def add_xml(xml)
|
968
|
-
@xml = xml
|
969
|
-
end
|
970
|
-
|
971
|
-
##
|
972
|
-
# Recursively builds the XML string by traversing this element's
|
973
|
-
# children.
|
974
|
-
#
|
975
|
-
# format:: [Boolean] True to pretty-print (format) the output string
|
976
|
-
# indent:: [Integer = 0] The indent level (recursively more)
|
977
|
-
#
|
978
|
-
def to_xml(format, indent=0)
|
979
|
-
result = ""
|
980
|
-
result += " "*indent if format
|
981
|
-
result += "<#{@tag}"
|
982
|
-
@attributes.each {|attrib, value| result += (' '+attrib.to_s+'="'+value.to_s+'"') }
|
983
|
-
if @data=="" and @elements.size==0
|
984
|
-
result +="/>"
|
985
|
-
result +="\n" if format
|
986
|
-
return result
|
987
|
-
end
|
988
|
-
result += ">"
|
989
|
-
result += "\n" if format and @data==""
|
990
|
-
result += @data if @data!=""
|
991
|
-
@elements.each {|element| result+=element.to_xml(format, indent+4)}
|
992
|
-
result += @xml if not @xml.nil?
|
993
|
-
result += " "*indent if format and @data==""
|
994
|
-
result+="</#{@tag}>"
|
995
|
-
result+="\n" if format
|
996
|
-
return result
|
997
|
-
end
|
998
|
-
|
999
|
-
##
|
1000
|
-
# Climbs to the top of this elements parent tree and then returns
|
1001
|
-
# the to_xml XML string.
|
1002
|
-
#
|
1003
|
-
# return:: [String] The XML string of this element (from the topmost parent).
|
1004
|
-
#
|
1005
|
-
def to_s
|
1006
|
-
return @parent.to_s if @parent
|
1007
|
-
return to_xml(true)
|
1008
|
-
end
|
1009
|
-
end
|
1010
|
-
|
1011
|
-
##
|
1012
|
-
# This class is constructed from XML data elements that are received from
|
1013
|
-
# the Jabber service.
|
1014
|
-
#
|
1015
|
-
class ParsedXMLElement
|
1016
|
-
|
1017
|
-
##
|
1018
|
-
# This class is used to return nil element values to prevent errors (and
|
1019
|
-
# reduce the number of checks.
|
1020
|
-
#
|
1021
|
-
class NilParsedXMLElement
|
1022
|
-
|
1023
|
-
##
|
1024
|
-
# Override to return nil
|
1025
|
-
#
|
1026
|
-
# return:: [nil]
|
1027
|
-
#
|
1028
|
-
def method_missing(methId, *args)
|
1029
|
-
return nil
|
1030
|
-
end
|
1031
|
-
|
1032
|
-
##
|
1033
|
-
# Evaluate as nil
|
1034
|
-
#
|
1035
|
-
# return:: [Boolean] true
|
1036
|
-
#
|
1037
|
-
def nil?
|
1038
|
-
return true
|
1039
|
-
end
|
1040
|
-
|
1041
|
-
##
|
1042
|
-
# Return a zero count
|
1043
|
-
#
|
1044
|
-
# return:: [Integer] 0
|
1045
|
-
#
|
1046
|
-
def count
|
1047
|
-
0
|
1048
|
-
end
|
1049
|
-
|
1050
|
-
include Singleton
|
1051
|
-
end
|
1052
|
-
|
1053
|
-
# The <tag> as String
|
1054
|
-
attr_reader :element_tag
|
1055
|
-
|
1056
|
-
# The parent ParsedXMLElement
|
1057
|
-
attr_reader :element_parent
|
1058
|
-
|
1059
|
-
# A hash of ParsedXMLElement children
|
1060
|
-
attr_reader :element_children
|
1061
|
-
|
1062
|
-
# The data <tag>data</tag> for a tag
|
1063
|
-
attr_reader :element_data
|
1064
|
-
|
1065
|
-
##
|
1066
|
-
# Construct an instance for the given tag
|
1067
|
-
#
|
1068
|
-
# tag:: [String] The tag
|
1069
|
-
# parent:: [Jabber::Protocol::ParsedXMLElement = nil] The parent element
|
1070
|
-
#
|
1071
|
-
def initialize(tag, parent=nil)
|
1072
|
-
@element_tag = tag
|
1073
|
-
@element_parent = parent
|
1074
|
-
@element_children = {}
|
1075
|
-
@attributes = {}
|
1076
|
-
@element_consumed = false
|
1077
|
-
end
|
1078
|
-
|
1079
|
-
##
|
1080
|
-
# Add the attribute to the element
|
1081
|
-
# <tag name="value">data</tag>
|
1082
|
-
#
|
1083
|
-
# name:: [String] The attribute name
|
1084
|
-
# value:: [String] The attribute value
|
1085
|
-
# return:: [Jabber::Protocol::ParsedXMLElement] self for chaining
|
1086
|
-
#
|
1087
|
-
def add_attribute(name, value)
|
1088
|
-
@attributes[name]=value
|
1089
|
-
self
|
1090
|
-
end
|
1091
|
-
|
1092
|
-
##
|
1093
|
-
# Factory to build a child element from this element with the given tag
|
1094
|
-
#
|
1095
|
-
# tag:: [String] The tag name
|
1096
|
-
# return:: [Jabber::Protocol::ParsedXMLElement] The newly created child element
|
1097
|
-
#
|
1098
|
-
def add_child(tag)
|
1099
|
-
child = ParsedXMLElement.new(tag, self)
|
1100
|
-
@element_children[tag] = Array.new if not @element_children.has_key? tag
|
1101
|
-
@element_children[tag] << child
|
1102
|
-
return child
|
1103
|
-
end
|
1104
|
-
|
1105
|
-
##
|
1106
|
-
# When an xml is received from the Jabber service and a ParsedXMLElement is created,
|
1107
|
-
# it is propogated to all filters and listeners. Any one of those can consume the element
|
1108
|
-
# to prevent its propogation to other filters or listeners. This method marks the element
|
1109
|
-
# as consumed.
|
1110
|
-
#
|
1111
|
-
def consume_element
|
1112
|
-
@element_consumed = true
|
1113
|
-
end
|
1114
|
-
|
1115
|
-
##
|
1116
|
-
# Checks if the element is consumed
|
1117
|
-
#
|
1118
|
-
# return:: [Boolean] True if the element is consumed
|
1119
|
-
#
|
1120
|
-
def element_consumed?
|
1121
|
-
@element_consumed
|
1122
|
-
end
|
1123
|
-
|
1124
|
-
##
|
1125
|
-
# Appends data to the element
|
1126
|
-
#
|
1127
|
-
# data:: [String] The data to append
|
1128
|
-
# return:: [Jabber::Protocol::ParsedXMLElement] self for chaining
|
1129
|
-
#
|
1130
|
-
def append_data(data)
|
1131
|
-
@element_data = "" unless @element_data
|
1132
|
-
@element_data += data
|
1133
|
-
self
|
1134
|
-
end
|
1135
|
-
|
1136
|
-
##
|
1137
|
-
# Calls the parent's element_children (hash) index off of this elements
|
1138
|
-
# tag and gets the supplied index. In this sense it gets its sibling based
|
1139
|
-
# on offset.
|
1140
|
-
#
|
1141
|
-
# number:: [Integer] The number of the sibling to get
|
1142
|
-
# return:: [Jabber::Protocol::ParsedXMLElement] The sibling element
|
1143
|
-
#
|
1144
|
-
def [](number)
|
1145
|
-
return @element_parent.element_children[@element_tag][number] if @element_parent
|
1146
|
-
end
|
1147
|
-
|
1148
|
-
##
|
1149
|
-
# Returns the count of siblings with this element's tag
|
1150
|
-
#
|
1151
|
-
# return:: [Integer] The number of sibling elements
|
1152
|
-
#
|
1153
|
-
def count
|
1154
|
-
return @element_parent.element_children[@element_tag].size if @element_parent
|
1155
|
-
return 0
|
1156
|
-
end
|
1157
|
-
|
1158
|
-
##
|
1159
|
-
# see _count
|
1160
|
-
#
|
1161
|
-
def size
|
1162
|
-
count
|
1163
|
-
end
|
1164
|
-
|
1165
|
-
##
|
1166
|
-
# Overrides to allow for directly accessing child elements
|
1167
|
-
# and attributes. If prefaced by attr_ it looks for an attribute
|
1168
|
-
# that matches or checks for a child with a tag that matches
|
1169
|
-
# the method name. If no match occurs, it returns a
|
1170
|
-
# NilParsedXMLElement (singleton) instance.
|
1171
|
-
#
|
1172
|
-
# Example:: <alpha number="1"><beta number="2">Beta Data</beta></alpha>
|
1173
|
-
#
|
1174
|
-
# element.element_tag #=> alpha
|
1175
|
-
# element.attr_number #=> 1
|
1176
|
-
# element.beta.element_data #=> Beta Data
|
1177
|
-
#
|
1178
|
-
def method_missing(methId, *args)
|
1179
|
-
tag = methId.id2name
|
1180
|
-
if tag[0..4]=="attr_"
|
1181
|
-
return @attributes[tag[5..-1]]
|
1182
|
-
end
|
1183
|
-
list = @element_children[tag]
|
1184
|
-
return list[0] if list
|
1185
|
-
return NilParsedXMLElement.instance
|
1186
|
-
end
|
1187
|
-
|
1188
|
-
##
|
1189
|
-
# Returns the valid XML as a string
|
1190
|
-
#
|
1191
|
-
# return:: [String] XML string
|
1192
|
-
def to_s
|
1193
|
-
begin
|
1194
|
-
result = "\n<#{@element_tag}"
|
1195
|
-
@attributes.each {|key, value| result += (' '+key+'="'+value+'"') }
|
1196
|
-
if @element_children.size>0 or @element_data
|
1197
|
-
result += ">"
|
1198
|
-
else
|
1199
|
-
result += "/>"
|
1200
|
-
end
|
1201
|
-
result += @element_data if @element_data
|
1202
|
-
@element_children.each_value {|array| array.each {|je| result += je.to_s} }
|
1203
|
-
result += "\n" if @element_children.size>0
|
1204
|
-
result += "</#{@element_tag}>" if @element_children.size>0 or @element_data
|
1205
|
-
result
|
1206
|
-
rescue => exception
|
1207
|
-
puts exception.to_s
|
1208
|
-
end
|
1209
|
-
end
|
1210
|
-
end
|
1211
|
-
|
1212
|
-
if USE_PARSER == :xmlparser
|
1213
|
-
require 'xmlparser'
|
1214
|
-
##
|
1215
|
-
# The ExpatJabberParser uses XMLParser (expat) to parse the incoming XML stream
|
1216
|
-
# of the Jabber protocol and fires ParsedXMLElements at the Connection
|
1217
|
-
# instance.
|
1218
|
-
#
|
1219
|
-
class ExpatJabberParser
|
1220
|
-
|
1221
|
-
# status if the parser is started
|
1222
|
-
attr_reader :started
|
1223
|
-
|
1224
|
-
##
|
1225
|
-
# Constructs a parser for the supplied stream (socket input)
|
1226
|
-
#
|
1227
|
-
# stream:: [IO] Socket input stream
|
1228
|
-
# listener:: [#receive(ParsedXMLElement)] The listener (usually a Jabber::Protocol::Connection instance
|
1229
|
-
#
|
1230
|
-
def initialize(stream, listener)
|
1231
|
-
@stream = stream
|
1232
|
-
def @stream.gets
|
1233
|
-
super(">")
|
1234
|
-
end
|
1235
|
-
@listener = listener
|
1236
|
-
end
|
1237
|
-
|
1238
|
-
##
|
1239
|
-
# Begins parsing the XML stream and does not return until
|
1240
|
-
# the stream closes.
|
1241
|
-
#
|
1242
|
-
def parse
|
1243
|
-
@started = false
|
1244
|
-
|
1245
|
-
parser = XMLParser.new("UTF-8")
|
1246
|
-
def parser.unknownEncoding(e)
|
1247
|
-
raise "Unknown encoding #{e.to_s}"
|
1248
|
-
end
|
1249
|
-
def parser.default
|
1250
|
-
end
|
1251
|
-
|
1252
|
-
begin
|
1253
|
-
parser.parse(@stream) do |type, name, data|
|
1254
|
-
begin
|
1255
|
-
case type
|
1256
|
-
when XMLParser::START_ELEM
|
1257
|
-
case name
|
1258
|
-
when "stream:stream"
|
1259
|
-
openstream = ParsedXMLElement.new(name)
|
1260
|
-
data.each {|key, value| openstream.add_attribute(key, value)}
|
1261
|
-
@listener.receive(openstream)
|
1262
|
-
@started = true
|
1263
|
-
else
|
1264
|
-
if @current.nil?
|
1265
|
-
@current = ParsedXMLElement.new(name.clone)
|
1266
|
-
else
|
1267
|
-
@current = @current.add_child(name.clone)
|
1268
|
-
end
|
1269
|
-
data.each {|key, value| @current.add_attribute(key.clone, value.clone)}
|
1270
|
-
end
|
1271
|
-
when XMLParser::CDATA
|
1272
|
-
@current.append_data(data.clone) if @current
|
1273
|
-
when XMLParser::END_ELEM
|
1274
|
-
case name
|
1275
|
-
when "stream:stream"
|
1276
|
-
@started = false
|
1277
|
-
else
|
1278
|
-
@listener.receive(@current) unless @current.element_parent
|
1279
|
-
@current = @current.element_parent
|
1280
|
-
end
|
1281
|
-
end
|
1282
|
-
rescue
|
1283
|
-
puts "Error #{$!}"
|
1284
|
-
end
|
1285
|
-
end
|
1286
|
-
rescue XMLParserError
|
1287
|
-
line = parser.line
|
1288
|
-
print "XML Parsing error(#{line}): #{$!}\n"
|
1289
|
-
end
|
1290
|
-
end
|
1291
|
-
end
|
1292
|
-
else # USE REXML
|
1293
|
-
require 'rexml/document'
|
1294
|
-
require 'rexml/parsers/sax2parser'
|
1295
|
-
require 'rexml/source'
|
1296
|
-
|
1297
|
-
##
|
1298
|
-
# The REXMLJabberParser uses REXML to parse the incoming XML stream
|
1299
|
-
# of the Jabber protocol and fires ParsedXMLElements at the Connection
|
1300
|
-
# instance.
|
1301
|
-
#
|
1302
|
-
class REXMLJabberParser
|
1303
|
-
# status if the parser is started
|
1304
|
-
attr_reader :started
|
1305
|
-
|
1306
|
-
##
|
1307
|
-
# Constructs a parser for the supplied stream (socket input)
|
1308
|
-
#
|
1309
|
-
# stream:: [IO] Socket input stream
|
1310
|
-
# listener:: [Object.receive(ParsedXMLElement)] The listener (usually a Jabber::Protocol::Connection instance
|
1311
|
-
#
|
1312
|
-
def initialize(stream, listener)
|
1313
|
-
@stream = stream
|
1314
|
-
|
1315
|
-
# this hack fixes REXML version "2.7.3" and "2.7.4"
|
1316
|
-
if REXML::Version=="2.7.3" || REXML::Version=="2.7.4"
|
1317
|
-
def @stream.read(len=nil)
|
1318
|
-
len = 100 unless len
|
1319
|
-
super(len)
|
1320
|
-
end
|
1321
|
-
def @stream.gets(char=nil)
|
1322
|
-
super(">")
|
1323
|
-
end
|
1324
|
-
def @stream.readline(char=nil)
|
1325
|
-
super(">")
|
1326
|
-
end
|
1327
|
-
def @stream.readlines(char=nil)
|
1328
|
-
super(">")
|
1329
|
-
end
|
1330
|
-
end
|
1331
|
-
|
1332
|
-
@listener = listener
|
1333
|
-
@current = nil
|
1334
|
-
end
|
1335
|
-
|
1336
|
-
##
|
1337
|
-
# Begins parsing the XML stream and does not return until
|
1338
|
-
# the stream closes.
|
1339
|
-
#
|
1340
|
-
def parse
|
1341
|
-
@started = false
|
1342
|
-
begin
|
1343
|
-
parser = REXML::Parsers::SAX2Parser.new @stream
|
1344
|
-
parser.listen( :start_element ) do |uri, localname, qname, attributes|
|
1345
|
-
case qname
|
1346
|
-
when "stream:stream"
|
1347
|
-
openstream = ParsedXMLElement.new(qname)
|
1348
|
-
attributes.each { |attr, value| openstream.add_attribute(attr, value) }
|
1349
|
-
@listener.receive(openstream)
|
1350
|
-
@started = true
|
1351
|
-
else
|
1352
|
-
if @current.nil?
|
1353
|
-
@current = ParsedXMLElement.new(qname)
|
1354
|
-
else
|
1355
|
-
@current = @current.add_child(qname)
|
1356
|
-
end
|
1357
|
-
attributes.each { |attr, value| @current.add_attribute(attr, value) }
|
1358
|
-
end
|
1359
|
-
end
|
1360
|
-
parser.listen( :end_element ) do |uri, localname, qname|
|
1361
|
-
case qname
|
1362
|
-
when "stream:stream"
|
1363
|
-
@started = false
|
1364
|
-
else
|
1365
|
-
@listener.receive(@current) unless @current.element_parent
|
1366
|
-
@current = @current.element_parent
|
1367
|
-
end
|
1368
|
-
end
|
1369
|
-
parser.listen( :characters ) do | text |
|
1370
|
-
@current.append_data(text) if @current
|
1371
|
-
end
|
1372
|
-
parser.listen( :cdata ) do | text |
|
1373
|
-
@current.append_data(text) if @current
|
1374
|
-
end
|
1375
|
-
parser.parse
|
1376
|
-
rescue REXML::ParseException
|
1377
|
-
@listener.parse_failure
|
1378
|
-
end
|
1379
|
-
end
|
1380
|
-
end
|
1381
|
-
end # USE_PARSER
|
1382
|
-
end
|
1383
|
-
end
|
1384
|
-
|