typo 5.1.3 → 5.1.98
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +1 -0
- data/MAINTAINERS +5 -1
- data/README +3 -10
- data/app/apis/meta_weblog_service.rb +1 -1
- data/app/controllers/accounts_controller.rb +20 -9
- data/app/controllers/admin/base_controller.rb +21 -1
- data/app/controllers/admin/blacklist_controller.rb +6 -15
- data/app/controllers/admin/cache_controller.rb +2 -6
- data/app/controllers/admin/categories_controller.rb +32 -26
- data/app/controllers/admin/content_controller.rb +40 -54
- data/app/controllers/admin/dashboard_controller.rb +58 -5
- data/app/controllers/admin/feedback_controller.rb +88 -17
- data/app/controllers/admin/pages_controller.rb +9 -30
- data/app/controllers/admin/profiles_controller.rb +7 -10
- data/app/controllers/admin/resources_controller.rb +13 -12
- data/app/controllers/admin/settings_controller.rb +9 -42
- data/app/controllers/admin/sidebar_controller.rb +21 -8
- data/app/controllers/admin/tags_controller.rb +7 -13
- data/app/controllers/admin/textfilters_controller.rb +1 -99
- data/app/controllers/admin/themes_controller.rb +8 -5
- data/app/controllers/admin/users_controller.rb +13 -11
- data/app/controllers/application.rb +1 -0
- data/app/controllers/articles_controller.rb +64 -16
- data/app/controllers/backend_controller.rb +8 -2
- data/app/controllers/grouping_controller.rb +16 -10
- data/app/controllers/redirect_controller.rb +2 -2
- data/app/controllers/users_controller.rb +4 -0
- data/app/controllers/xml_controller.rb +3 -1
- data/app/helpers/admin/base_helper.rb +60 -113
- data/app/helpers/admin/content_helper.rb +19 -1
- data/app/helpers/admin/feedback_helper.rb +0 -31
- data/app/helpers/admin/pages_helper.rb +0 -20
- data/app/helpers/admin/settings_helper.rb +5 -0
- data/app/helpers/application_helper.rb +43 -27
- data/app/helpers/authors_helper.rb +1 -3
- data/app/helpers/content_helper.rb +1 -18
- data/app/helpers/sidebar_helper.rb +12 -0
- data/app/helpers/theme_helper.rb +0 -20
- data/app/helpers/xml_helper.rb +1 -9
- data/app/models/article.rb +73 -9
- data/app/models/blog.rb +24 -3
- data/app/models/blog_sweeper.rb +4 -13
- data/app/models/category.rb +1 -0
- data/app/models/content.rb +45 -4
- data/app/models/feedback/states.rb +21 -2
- data/app/models/feedback.rb +2 -0
- data/app/models/page.rb +7 -0
- data/app/models/page_cache.rb +1 -1
- data/app/models/profile.rb +2 -0
- data/app/models/tag.rb +3 -1
- data/app/models/theme.rb +1 -1
- data/app/models/user.rb +35 -6
- data/app/views/accounts/login.html.erb +7 -9
- data/app/views/accounts/signup.html.erb +1 -1
- data/app/views/admin/base/_recent_comments.html.erb +3 -3
- data/app/views/admin/base/_recent_trackbacks.html.erb +3 -3
- data/app/views/admin/blacklist/_blacklist_patterns.html.erb +2 -5
- data/app/views/admin/blacklist/_quick_post.html.erb +1 -1
- data/app/views/admin/blacklist/edit.html.erb +2 -3
- data/app/views/admin/blacklist/index.html.erb +2 -2
- data/app/views/admin/categories/_categories.html.erb +8 -10
- data/app/views/admin/categories/_form.html.erb +12 -3
- data/app/views/admin/categories/index.html.erb +1 -5
- data/app/views/admin/categories/new.html.erb +9 -0
- data/app/views/admin/content/_article_list.html.erb +16 -0
- data/app/views/admin/content/_drafts.html.erb +3 -3
- data/app/views/admin/content/_form.html.erb +29 -53
- data/app/views/admin/content/index.html.erb +49 -9
- data/app/views/admin/content/new.html.erb +1 -1
- data/app/views/admin/dashboard/_comments.html.erb +1 -3
- data/app/views/admin/dashboard/_inbound.html.erb +19 -0
- data/app/views/admin/dashboard/_overview.html.erb +7 -2
- data/app/views/admin/dashboard/_sysinfo.html.erb +5 -5
- data/app/views/admin/dashboard/_typo_dev.html.erb +21 -0
- data/app/views/admin/dashboard/_welcome.html.erb +1 -1
- data/app/views/admin/dashboard/index.html.erb +14 -17
- data/app/views/admin/feedback/_button.html.erb +5 -4
- data/app/views/admin/{comments → feedback}/_form.html.erb +1 -0
- data/app/views/admin/feedback/_item.html.erb +3 -5
- data/app/views/admin/feedback/article.html.erb +33 -0
- data/app/views/admin/feedback/edit.html.erb +10 -0
- data/app/views/admin/feedback/index.html.erb +21 -24
- data/app/views/admin/pages/_form.html.erb +20 -28
- data/app/views/admin/pages/_pages.html.erb +14 -25
- data/app/views/admin/resources/_metadata_edit.html.erb +1 -1
- data/app/views/admin/resources/_resources.html.erb +8 -5
- data/app/views/admin/resources/index.html.erb +1 -3
- data/app/views/admin/settings/_submit.html.erb +2 -2
- data/app/views/admin/settings/feedback.html.erb +86 -49
- data/app/views/admin/settings/index.html.erb +54 -58
- data/app/views/admin/settings/read.html.erb +2 -1
- data/app/views/admin/settings/seo.html.erb +46 -0
- data/app/views/admin/settings/update_database.html.erb +27 -29
- data/app/views/admin/settings/write.html.erb +41 -11
- data/app/views/admin/shared/_edit.html.erb +2 -1
- data/app/views/admin/sidebar/index.html.erb +4 -4
- data/app/views/admin/sidebar/set_active.rjs +1 -1
- data/app/views/admin/tags/_tags.html.erb +7 -8
- data/app/views/admin/tags/edit.html.erb +2 -2
- data/app/views/admin/tags/index.html.erb +1 -3
- data/app/views/admin/users/_form.html.erb +14 -3
- data/app/views/admin/users/edit.html.erb +1 -1
- data/app/views/admin/users/index.html.erb +16 -16
- data/app/views/admin/users/new.html.erb +1 -1
- data/app/views/articles/_comment_failed.html.erb +1 -0
- data/app/views/articles/_rss20_feed.rss.builder +1 -1
- data/app/views/articles/groupings.html.erb +4 -3
- data/app/views/articles/index.html.erb +1 -3
- data/app/views/articles/search.html.erb +8 -0
- data/app/views/layouts/accounts.html.erb +2 -3
- data/app/views/layouts/administration.html.erb +44 -40
- data/app/views/shared/_loginform.html.erb +9 -3
- data/app/views/shared/_search.html.erb +3 -8
- data/config/boot.rb +96 -32
- data/config/environment.rb +14 -7
- data/config/environments/development.rb +2 -0
- data/config/initializers/access_rules.rb +41 -48
- data/config/initializers/inflector.rb +1 -0
- data/config/routes.rb +11 -21
- data/db/migrate/001_initial_schema.rb +0 -1
- data/db/migrate/003_add_article_user_id.rb +11 -0
- data/db/migrate/020_superclass_articles.rb +4 -3
- data/db/migrate/021_superclass_comments.rb +2 -2
- data/db/migrate/022_superclass_trackbacks.rb +2 -1
- data/db/migrate/028_rename_redirect_to.rb +5 -1
- data/db/migrate/057_add_categorization_model.rb +12 -6
- data/db/migrate/072_add_remember_token.rb +9 -0
- data/db/migrate/073_add_meta_and_subcategories.rb +13 -0
- data/db/migrate/074_add_remember_token_expires_at.rb +9 -0
- data/db/migrate/075_move_editor_to_user.rb +20 -0
- data/db/migrate/076_fix_users_empty_email.rb +15 -0
- data/db/migrate/077_fix_userless_articles.rb +20 -0
- data/db/schema.rb +38 -38
- data/doc/typo-5.2-release-notes.txt +52 -0
- data/lang/fr_FR.rb +35 -15
- data/lang/he_IL.rb +715 -0
- data/lib/tasks/release.rake +7 -7
- data/lib/tasks/rspec.rake +142 -0
- data/lib/text_filter_plugin.rb +5 -0
- data/lib/typo_version.rb +1 -1
- data/public/images/admin/typologo.gif +0 -0
- data/public/javascripts/administration.js +12 -0
- data/public/javascripts/controls.js +1 -3
- data/public/javascripts/dragdrop.js +1 -3
- data/public/javascripts/effects.js +5 -7
- data/public/javascripts/fckcustom.js +9 -8
- data/public/javascripts/fckeditor/fckconfig.js +2 -2
- data/public/javascripts/fckeditor/fckeditor.js +1 -1
- data/public/javascripts/prototype.js +317 -167
- data/public/javascripts/quicktags.js +511 -0
- data/public/robots.txt +16 -1
- data/public/sources/javascripts/administration.js +12 -0
- data/public/sources/javascripts/application.js +2 -0
- data/public/sources/javascripts/codecollapse.js +8 -0
- data/public/sources/javascripts/controls.js +963 -0
- data/public/sources/javascripts/cookies.js +60 -0
- data/public/sources/javascripts/dragdrop.js +972 -0
- data/public/sources/javascripts/effects.js +1120 -0
- data/public/sources/javascripts/fckcustom.js +28 -0
- data/public/sources/javascripts/lang/default.js +21 -0
- data/public/sources/javascripts/lang/en_US.js +21 -0
- data/public/sources/javascripts/lang/fr_FR.js +21 -0
- data/public/sources/javascripts/lightbox.js +202 -0
- data/public/sources/javascripts/prototype.js +4320 -0
- data/public/sources/javascripts/quicktags.js +511 -0
- data/public/sources/javascripts/scriptaculous.js +58 -0
- data/public/sources/javascripts/slider.js +258 -0
- data/public/sources/javascripts/typo.js +136 -0
- data/public/sources/stylesheets/administration.css +955 -0
- data/public/sources/stylesheets/administration_rtl.css +1026 -0
- data/public/sources/stylesheets/codecollapse.css +3 -0
- data/public/sources/stylesheets/coderay.css +126 -0
- data/public/sources/stylesheets/lightbox.css +62 -0
- data/public/sources/stylesheets/rss.css +54 -0
- data/public/sources/stylesheets/textmate/dawn.css +209 -0
- data/public/sources/stylesheets/textmate/iplastic.css +142 -0
- data/public/sources/stylesheets/textmate/space_cadet.css +99 -0
- data/public/sources/stylesheets/textmate/textmate.css +48 -0
- data/public/sources/stylesheets/textmate/twilight.css +227 -0
- data/public/sources/stylesheets/user-styles.css +22 -0
- data/public/stylesheets/administration.css +146 -214
- data/public/stylesheets/administration_rtl.css +1026 -0
- data/public/stylesheets/coderay.css +128 -0
- data/script/autospec +5 -0
- data/script/dbconsole +3 -0
- data/script/performance/request +3 -0
- data/script/spec_server +18 -4
- data/spec/controllers/accounts_controller_spec.rb +24 -11
- data/spec/controllers/admin/blacklist_controller_spec.rb +4 -4
- data/spec/controllers/admin/cache_controller_spec.rb +32 -0
- data/spec/controllers/admin/categories_controller_spec.rb +8 -16
- data/spec/controllers/admin/content_controller_spec.rb +327 -171
- data/spec/controllers/admin/feedback_controller_spec.rb +278 -26
- data/spec/controllers/admin/pages_controller_spec.rb +0 -6
- data/spec/controllers/admin/resources_controller_spec.rb +3 -6
- data/spec/controllers/admin/settings_controller_spec.rb +21 -1
- data/spec/controllers/admin/tags_controller_spec.rb +35 -0
- data/spec/controllers/admin/textfilters_controller_spec.rb +10 -9
- data/spec/controllers/admin/users_controller_spec.rb +17 -18
- data/spec/controllers/articles_controller_spec.rb +4 -1
- data/spec/controllers/authors_controller_spec.rb +3 -6
- data/spec/controllers/backend_controller_spec.rb +26 -3
- data/spec/controllers/categories_controller_spec.rb +3 -6
- data/spec/controllers/comments_controller_spec.rb +4 -3
- data/spec/controllers/redirect_controller_spec.rb +5 -5
- data/spec/controllers/routes/articles_routing_spec.rb +31 -0
- data/spec/controllers/tags_controller_spec.rb +3 -6
- data/spec/controllers/textfilter_controller_spec.rb +37 -21
- data/spec/controllers/xml_controller_spec.rb +4 -1
- data/spec/helpers/application_helper_spec.rb +25 -0
- data/spec/helpers/content_helper_spec.rb +2 -0
- data/spec/lib/text_filter_plugin_spec.rb +15 -0
- data/spec/models/article_closing_spec.rb +4 -0
- data/spec/models/article_spec.rb +72 -3
- data/spec/models/blog_spec.rb +12 -0
- data/spec/models/comment_spec.rb +155 -127
- data/spec/models/metafragment_spec.rb +12 -0
- data/spec/models/resource_spec.rb +1 -0
- data/spec/models/tag_spec.rb +2 -2
- data/spec/models/theme_spec.rb +2 -2
- data/spec/models/user_spec.rb +14 -0
- data/spec/spec_helper.rb +1 -0
- data/spec/views/articles/index_spec.rb +57 -0
- data/test/fixtures/contents.yml +18 -0
- data/test/fixtures/feedback.yml +27 -0
- data/test/fixtures/profiles.yml +4 -0
- data/test/mocks/themes/typographic/views/articles/_article.html.erb +1 -1
- data/test/mocks/themes/typographic/views/articles/index.html.erb +1 -1
- data/themes/dirtylicious/layouts/default.html.erb +1 -1
- data/themes/dirtylicious/views/articles/index.html.erb +1 -3
- data/themes/scribbish/views/articles/index.html.erb +1 -3
- data/themes/standard_issue/views/articles/_article.html.erb +1 -1
- data/themes/standard_issue/views/articles/index.html.erb +1 -3
- data/themes/typographic/views/articles/_article.html.erb +1 -1
- data/themes/typographic/views/articles/index.html.erb +1 -3
- data/vendor/actionwebservice/CHANGELOG +63 -8
- data/vendor/actionwebservice/README +17 -0
- data/vendor/actionwebservice/Rakefile +12 -11
- data/vendor/actionwebservice/actionwebservice.gemspec +26 -0
- data/vendor/actionwebservice/generators/web_service/USAGE +28 -0
- data/vendor/actionwebservice/generators/web_service/templates/api_definition.rb +5 -0
- data/vendor/actionwebservice/generators/web_service/templates/controller.rb +8 -0
- data/vendor/actionwebservice/generators/web_service/templates/functional_test.rb +19 -0
- data/vendor/actionwebservice/generators/web_service/web_service_generator.rb +29 -0
- data/vendor/actionwebservice/install.rb +1 -1
- data/vendor/actionwebservice/lib/action_web_service/api.rb +1 -1
- data/vendor/actionwebservice/lib/action_web_service/casting.rb +7 -1
- data/vendor/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +2 -2
- data/vendor/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb +7 -0
- data/vendor/actionwebservice/lib/action_web_service/scaffolding.rb +8 -8
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{layout.erb → layout.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{methods.erb → methods.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{parameters.erb → parameters.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{result.erb → result.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/version.rb +3 -3
- data/vendor/actionwebservice/lib/action_web_service.rb +3 -3
- data/vendor/actionwebservice/test/abstract_client.rb +1 -1
- data/vendor/actionwebservice/test/abstract_dispatcher.rb +0 -4
- data/vendor/actionwebservice/test/abstract_unit.rb +6 -18
- data/vendor/actionwebservice/test/client_xmlrpc_test.rb +0 -1
- data/vendor/actionwebservice/test/gencov +0 -0
- data/vendor/actionwebservice/test/run +0 -0
- data/vendor/actionwebservice/test/scaffolded_controller_test.rb +5 -5
- data/vendor/gems/coderay-0.8.260/.specification +114 -0
- data/vendor/gems/coderay-0.8.260/FOLDERS +53 -0
- data/vendor/gems/coderay-0.8.260/LICENSE +504 -0
- data/vendor/gems/coderay-0.8.260/README +128 -0
- data/vendor/gems/coderay-0.8.260/bin/coderay +82 -0
- data/vendor/gems/coderay-0.8.260/bin/coderay_stylesheet +4 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/duo.rb +87 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoder.rb +182 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/_map.rb +9 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/count.rb +21 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/debug.rb +49 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/div.rb +20 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html/css.rb +70 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html/numerization.rb +124 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html/output.rb +197 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html.rb +287 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/null.rb +26 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/page.rb +21 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/span.rb +20 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/statistic.rb +77 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/text.rb +32 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/tokens.rb +44 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/xml.rb +70 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/yaml.rb +22 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/for_redcloth.rb +72 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/file_type.rb +211 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/gzip_simple.rb +123 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/plugin.rb +333 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/word_list.rb +123 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanner.rb +255 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/_map.rb +15 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/c.rb +165 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/css.rb +181 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/debug.rb +61 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/delphi.rb +150 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/diff.rb +104 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/html.rb +177 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/java/builtin_types.rb +419 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/java.rb +179 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/java_script.rb +187 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/json.rb +106 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/nitro_xhtml.rb +134 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/plaintext.rb +18 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/rhtml.rb +73 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/ruby/patterns.rb +226 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/ruby.rb +381 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/scheme.rb +142 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/sql.Keith.rb +143 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/sql.rb +154 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/xml.rb +19 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/style.rb +20 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/styles/_map.rb +7 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/styles/cycnus.rb +146 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/styles/murphy.rb +132 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/token_classes.rb +82 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/tokens.rb +387 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay.rb +321 -0
- data/vendor/gems/coderay-0.8.260/lib/term/ansicolor.rb +220 -0
- data/vendor/plugins/acts_as_tree/README +26 -0
- data/vendor/plugins/{classic_pagination → acts_as_tree}/Rakefile +3 -3
- data/vendor/plugins/acts_as_tree/init.rb +1 -0
- data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +96 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml → plugins/acts_as_tree/test/abstract_unit.rb} +0 -0
- data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +219 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml → plugins/acts_as_tree/test/database.yml} +0 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml → plugins/acts_as_tree/test/fixtures/mixin.rb} +0 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml → plugins/acts_as_tree/test/fixtures/mixins.yml} +0 -0
- data/vendor/plugins/{rspec_on_rails/generators/rspec/templates/previous_failures.txt → acts_as_tree/test/schema.rb} +0 -0
- data/vendor/plugins/expiring_action_cache/lib/metafragment.rb +1 -1
- data/vendor/plugins/fckeditor/lib/fckeditor.rb +1 -1
- data/vendor/plugins/livesearch_sidebar/init.rb +4 -0
- data/vendor/plugins/livesearch_sidebar/lib/livesearch_sidebar.rb +5 -0
- data/vendor/plugins/livesearch_sidebar/views/content.rhtml +15 -0
- data/vendor/plugins/localization/bin/make_language.rb +78 -0
- data/vendor/plugins/localization/lib/localization.rb +14 -0
- data/vendor/plugins/rspec/.autotest +1 -0
- data/vendor/plugins/rspec/{CHANGES → History.txt} +215 -62
- data/vendor/plugins/rspec/{MIT-LICENSE → License.txt} +3 -1
- data/vendor/plugins/rspec/Manifest.txt +403 -0
- data/vendor/plugins/rspec/README.txt +39 -0
- data/vendor/plugins/rspec/Rakefile +39 -229
- data/vendor/plugins/rspec/TODO.txt +10 -0
- data/vendor/plugins/rspec/bin/autospec +4 -0
- data/vendor/plugins/rspec/bin/spec +1 -1
- data/vendor/plugins/rspec/examples/pure/autogenerated_docstrings_example.rb +4 -4
- data/vendor/plugins/rspec/examples/pure/partial_mock_example.rb +1 -0
- data/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb +2 -2
- data/vendor/plugins/rspec/examples/pure/yielding_example.rb +33 -0
- data/vendor/plugins/rspec/examples/stories/calculator.rb +1 -1
- data/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb +1 -1
- data/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story +17 -17
- data/vendor/plugins/rspec/lib/autotest/discover.rb +1 -1
- data/vendor/plugins/rspec/lib/autotest/rspec.rb +10 -38
- data/vendor/plugins/rspec/lib/spec/adapters/ruby_engine/mri.rb +8 -0
- data/vendor/plugins/rspec/lib/spec/adapters/ruby_engine/rubinius.rb +8 -0
- data/vendor/plugins/rspec/lib/spec/adapters/ruby_engine.rb +26 -0
- data/vendor/plugins/rspec/lib/spec/adapters.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/example/before_and_after_hooks.rb +93 -0
- data/vendor/plugins/rspec/lib/spec/example/configuration.rb +40 -17
- data/vendor/plugins/rspec/lib/spec/example/errors.rb +23 -2
- data/vendor/plugins/rspec/lib/spec/example/example_group.rb +12 -3
- data/vendor/plugins/rspec/lib/spec/example/example_group_factory.rb +41 -22
- data/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb +88 -144
- data/vendor/plugins/rspec/lib/spec/example/example_matcher.rb +2 -0
- data/vendor/plugins/rspec/lib/spec/example/example_methods.rb +19 -20
- data/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb +6 -12
- data/vendor/plugins/rspec/lib/spec/example.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb +4 -12
- data/vendor/plugins/rspec/lib/spec/expectations/handler.rb +10 -10
- data/vendor/plugins/rspec/lib/spec/extensions/main.rb +3 -18
- data/vendor/plugins/rspec/lib/spec/extensions/metaclass.rb +7 -0
- data/vendor/plugins/rspec/lib/spec/extensions/object.rb +0 -4
- data/vendor/plugins/rspec/lib/spec/extensions.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/interop/test/unit/testcase.rb +12 -2
- data/vendor/plugins/rspec/lib/spec/matchers/be.rb +18 -21
- data/vendor/plugins/rspec/lib/spec/matchers/be_close.rb +5 -5
- data/vendor/plugins/rspec/lib/spec/matchers/change.rb +45 -41
- data/vendor/plugins/rspec/lib/spec/matchers/eql.rb +6 -6
- data/vendor/plugins/rspec/lib/spec/matchers/equal.rb +6 -6
- data/vendor/plugins/rspec/lib/spec/matchers/exist.rb +10 -5
- data/vendor/plugins/rspec/lib/spec/matchers/has.rb +2 -12
- data/vendor/plugins/rspec/lib/spec/matchers/have.rb +25 -20
- data/vendor/plugins/rspec/lib/spec/matchers/include.rb +12 -5
- data/vendor/plugins/rspec/lib/spec/matchers/match.rb +9 -9
- data/vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb +25 -19
- data/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb +60 -37
- data/vendor/plugins/rspec/lib/spec/matchers/respond_to.rb +5 -4
- data/vendor/plugins/rspec/lib/spec/matchers/satisfy.rb +5 -5
- data/vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb +115 -12
- data/vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb +3 -3
- data/vendor/plugins/rspec/lib/spec/matchers.rb +8 -2
- data/vendor/plugins/rspec/lib/spec/mocks/argument_constraints.rb +165 -0
- data/vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb +24 -158
- data/vendor/plugins/rspec/lib/spec/mocks/error_generator.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/mocks/extensions.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/mocks/framework.rb +15 -0
- data/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb +74 -10
- data/vendor/plugins/rspec/lib/spec/mocks/methods.rb +15 -3
- data/vendor/plugins/rspec/lib/spec/mocks/mock.rb +13 -7
- data/vendor/plugins/rspec/lib/spec/mocks/proxy.rb +71 -17
- data/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb +9 -1
- data/vendor/plugins/rspec/lib/spec/mocks.rb +1 -12
- data/vendor/plugins/rspec/lib/spec/rake/spectask.rb +19 -27
- data/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb +3 -3
- data/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb +7 -8
- data/vendor/plugins/rspec/lib/spec/runner/command_line.rb +6 -17
- data/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb +4 -3
- data/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb +5 -9
- data/vendor/plugins/rspec/lib/spec/runner/formatter/failing_example_groups_formatter.rb +4 -8
- data/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb +18 -14
- data/vendor/plugins/rspec/lib/spec/runner/formatter/nested_text_formatter.rb +65 -0
- data/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb +4 -0
- data/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb +6 -2
- data/vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb +62 -16
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb +81 -18
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/progress_bar_formatter.rb +42 -0
- data/vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/runner/option_parser.rb +49 -45
- data/vendor/plugins/rspec/lib/spec/runner/options.rb +54 -20
- data/vendor/plugins/rspec/lib/spec/runner/reporter.rb +36 -12
- data/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/runner.rb +17 -6
- data/vendor/plugins/rspec/lib/spec/story/extensions/regexp.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/story/extensions/string.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb +8 -0
- data/vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb +15 -1
- data/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb +20 -0
- data/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb +3 -1
- data/vendor/plugins/rspec/lib/spec/story/runner.rb +8 -5
- data/vendor/plugins/rspec/lib/spec/story/step.rb +43 -31
- data/vendor/plugins/rspec/lib/spec/story/step_mother.rb +2 -1
- data/vendor/plugins/rspec/lib/spec/story/story.rb +8 -11
- data/vendor/plugins/rspec/lib/spec/story/world.rb +6 -3
- data/vendor/plugins/rspec/lib/spec/version.rb +13 -22
- data/vendor/plugins/rspec/lib/spec.rb +15 -13
- data/vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb +2 -0
- data/vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake +1 -1
- data/vendor/plugins/rspec/rake_tasks/verify_rcov.rake +2 -2
- data/vendor/plugins/rspec/rspec.gemspec +22 -0
- data/vendor/plugins/rspec/spec/{autotest_helper.rb → autotest/autotest_helper.rb} +2 -2
- data/vendor/plugins/rspec/spec/{autotest_matchers.rb → autotest/autotest_matchers.rb} +0 -0
- data/vendor/plugins/rspec/spec/autotest/discover_spec.rb +1 -1
- data/vendor/plugins/rspec/spec/autotest/rspec_spec.rb +94 -139
- data/vendor/plugins/rspec/spec/rspec_suite.rb +0 -1
- data/vendor/plugins/rspec/spec/spec/adapters/ruby_engine_spec.rb +16 -0
- data/vendor/plugins/rspec/spec/spec/example/configuration_spec.rb +229 -215
- data/vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb +9 -9
- data/vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb +137 -101
- data/vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb +456 -361
- data/vendor/plugins/rspec/spec/spec/example/example_group_spec.rb +460 -488
- data/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb +117 -52
- data/vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb +12 -0
- data/vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb +114 -0
- data/vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb +219 -203
- data/vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb +27 -9
- data/vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb +0 -12
- data/vendor/plugins/rspec/spec/spec/extensions/main_spec.rb +23 -28
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_options_hash.rb +13 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb +15 -8
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb +4 -0
- data/vendor/plugins/rspec/spec/spec/matchers/be_spec.rb +24 -0
- data/vendor/plugins/rspec/spec/spec/matchers/change_spec.rb +16 -6
- data/vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb +58 -37
- data/vendor/plugins/rspec/spec/spec/matchers/has_spec.rb +26 -0
- data/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb +105 -2
- data/vendor/plugins/rspec/spec/spec/matchers/include_spec.rb +19 -0
- data/vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb +35 -2
- data/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb +124 -0
- data/vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb +6 -6
- data/vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb +64 -2
- data/vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb +7 -0
- data/vendor/plugins/rspec/spec/spec/mocks/{bug_report_10263.rb → bug_report_10263_spec.rb} +0 -0
- data/vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb +2 -0
- data/vendor/plugins/rspec/spec/spec/mocks/bug_report_496.rb +17 -0
- data/vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb +10 -30
- data/vendor/plugins/rspec/spec/spec/mocks/hash_including_matcher_spec.rb +53 -0
- data/vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb +123 -43
- data/vendor/plugins/rspec/spec/spec/mocks/nil_expectation_warning_spec.rb +53 -0
- data/vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb +14 -0
- data/vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb +18 -28
- data/vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb +50 -7
- data/vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb +26 -50
- data/vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb +7 -0
- data/vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb +8 -0
- data/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb +102 -108
- data/vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb +11 -6
- data/vendor/plugins/rspec/spec/spec/runner/formatter/base_formatter_spec.rb +112 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb +3 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html +30 -25
- data/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb +1 -6
- data/vendor/plugins/rspec/spec/spec/runner/formatter/nested_text_formatter_spec.rb +318 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb +30 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb +4 -4
- data/vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb +133 -100
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb +76 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb +266 -1
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb +82 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html +33 -28
- data/vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb +8 -8
- data/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb +104 -61
- data/vendor/plugins/rspec/spec/spec/runner/options_spec.rb +103 -17
- data/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb +1 -1
- data/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb +6 -0
- data/vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb +59 -10
- data/vendor/plugins/rspec/spec/spec/runner/spec_drb.opts +1 -0
- data/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb +10 -4
- data/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb +15 -17
- data/vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb +124 -52
- data/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb +12 -2
- data/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb +23 -6
- data/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb +43 -5
- data/vendor/plugins/rspec/spec/spec/story/runner_spec.rb +59 -72
- data/vendor/plugins/rspec/spec/spec/story/scenario_spec.rb +1 -3
- data/vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb +12 -0
- data/vendor/plugins/rspec/spec/spec/story/step_spec.rb +76 -4
- data/vendor/plugins/rspec/spec/spec/story/story_spec.rb +3 -5
- data/vendor/plugins/rspec/spec/spec/story/world_spec.rb +8 -8
- data/vendor/plugins/rspec/spec/spec_helper.rb +40 -66
- data/vendor/plugins/rspec/stories/all.rb +1 -1
- data/vendor/plugins/rspec/stories/configuration/before_blocks.story +21 -0
- data/vendor/plugins/rspec/stories/configuration/stories.rb +7 -0
- data/vendor/plugins/rspec/stories/mock_framework_integration/stories.rb +7 -0
- data/vendor/plugins/rspec/stories/mock_framework_integration/use_flexmock.story +9 -0
- data/vendor/plugins/rspec/stories/resources/spec/before_blocks_example.rb +32 -0
- data/vendor/plugins/rspec/stories/resources/spec/spec_with_flexmock.rb +18 -0
- data/vendor/plugins/rspec/stories/stories/multiline_steps.story +23 -0
- data/vendor/plugins/rspec/stories/stories/steps/multiline_steps.rb +13 -0
- data/vendor/plugins/rspec/stories/stories/stories.rb +6 -0
- data/vendor/plugins/rspec-rails/History.txt +93 -0
- data/vendor/plugins/{rspec_on_rails/MIT-LICENSE → rspec-rails/License.txt} +7 -5
- data/vendor/plugins/rspec-rails/Manifest.txt +161 -0
- data/vendor/plugins/rspec-rails/README.txt +46 -0
- data/vendor/plugins/rspec-rails/Rakefile +39 -0
- data/vendor/plugins/rspec-rails/UPGRADE +7 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/CHANGES +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/rspec_generator.rb +9 -4
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/all_stories.rb +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/controller_spec/_partial.rhtml → rspec-rails/generators/rspec/templates/previous_failures.txt} +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/rcov.opts +0 -0
- data/vendor/plugins/{rspec_on_rails/tasks → rspec-rails/generators/rspec/templates}/rspec.rake +6 -11
- data/vendor/plugins/rspec-rails/generators/rspec/templates/script/autospec +5 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/script/spec +1 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/script/spec_server +18 -4
- data/vendor/plugins/rspec-rails/generators/rspec/templates/spec.opts +4 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/spec_helper.rb +8 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/stories_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/USAGE +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/rspec_controller_generator.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/templates/controller_spec.rb +1 -1
- data/vendor/plugins/rspec-rails/generators/rspec_controller/templates/helper_spec.rb +11 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/templates/view_spec.rb +2 -2
- data/vendor/plugins/rspec-rails/generators/rspec_default_values.rb +19 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_model/USAGE +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_model/rspec_model_generator.rb +7 -2
- data/vendor/plugins/rspec-rails/generators/rspec_model/templates/model_spec.rb +15 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/rspec_scaffold_generator.rb +2 -15
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/controller_spec.rb +173 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/edit_erb_spec.rb +8 -7
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/helper_spec.rb +11 -0
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/index_erb_spec.rb +27 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/new_erb_spec.rb +7 -7
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/routing_spec.rb +15 -17
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/show_erb_spec.rb +23 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/init.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/autotest/discover.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/autotest/rails_rspec.rb +1 -6
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb +40 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/controller_example_group.rb +56 -55
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/cookies_proxy.rb +25 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/functional_example_group.rb +31 -10
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/helper_example_group.rb +170 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/model_example_group.rb +0 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb +33 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/render_observer.rb +93 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/view_example_group.rb +18 -6
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example.rb +1 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_controller/base.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_controller/rescue.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_controller/test_response.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_view/base.rb +8 -4
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/active_record/base.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/object.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/spec/example/configuration.rb +6 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/spec/matchers/have.rb +2 -2
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions.rb +0 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/interop/testcase.rb +14 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/assert_select.rb +1 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/matchers/change.rb +11 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/have_text.rb +4 -2
- data/vendor/plugins/rspec-rails/lib/spec/rails/matchers/include_text.rb +54 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/redirect_to.rb +1 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/render_template.rb +26 -6
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers.rb +2 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/mocks.rb +132 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/story_adapter.rb +11 -3
- data/vendor/plugins/rspec-rails/lib/spec/rails/version.rb +15 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails.rb +15 -0
- data/vendor/plugins/rspec-rails/rspec-rails.gemspec +28 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/autotest/mappings_spec.rb +1 -1
- data/vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb +96 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/configuration_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/controller_isolation_spec.rb +20 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/controller_spec_spec.rb +119 -27
- data/vendor/plugins/rspec-rails/spec/rails/example/cookies_proxy_spec.rb +74 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/example_group_factory_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/helper_spec_spec.rb +60 -4
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/model_spec_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/shared_behaviour_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/test_unit_assertion_accessibility_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/view_spec_spec.rb +75 -51
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/action_controller_rescue_action_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/action_view_base_spec.rb +10 -10
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/active_record_spec.rb +0 -0
- data/vendor/plugins/rspec-rails/spec/rails/interop/testcase_spec.rb +66 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/assert_select_spec.rb +34 -3
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/description_generation_spec.rb +0 -0
- data/vendor/plugins/rspec-rails/spec/rails/matchers/errors_on_spec.rb +25 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/have_text_spec.rb +0 -0
- data/vendor/plugins/rspec-rails/spec/rails/matchers/include_text_spec.rb +64 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/redirect_to_spec.rb +7 -1
- data/vendor/plugins/{rspec_on_rails/spec/rails/matchers/render_spec.rb → rspec-rails/spec/rails/matchers/render_template_spec.rb} +21 -14
- data/vendor/plugins/rspec-rails/spec/rails/matchers/should_change_spec.rb +15 -0
- data/vendor/plugins/rspec-rails/spec/rails/mocks/ar_classes.rb +10 -0
- data/vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb +106 -0
- data/vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb +80 -0
- data/vendor/plugins/rspec-rails/spec/rails/sample_modified_fixture.rb +8 -0
- data/vendor/plugins/rspec-rails/spec/rails/sample_spec.rb +8 -0
- data/vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb +96 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/spec_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails_suite.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/spec_helper.rb +13 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/action_view_base_spec_controller.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/controller_spec_controller.rb +46 -3
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/redirect_spec_controller.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/render_spec_controller.rb +4 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/rjs_spec_controller.rb +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/helpers/addition_helper.rb +5 -0
- data/vendor/plugins/rspec-rails/spec_resources/helpers/explicit_helper.rb +38 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/helpers/more_explicit_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/helpers/plugin_application_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/helpers/view_spec_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml → rspec-rails/spec_resources/views/controller_spec/_partial.rhtml} +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/render_spec/_a_partial.rhtml → rspec-rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml} +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_with_template.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/render_spec/some_action.rhtml → rspec-rails/spec_resources/views/layouts/application.rhtml} +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/view_spec/_partial_used_twice.rhtml → rspec-rails/spec_resources/views/layouts/simple.rhtml} +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/objects/_object.html.erb +1 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/render_spec/_a_partial.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/render_spec/action_with_alternate_layout.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/render_spec/some_action.js.rjs +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/render_spec/some_action.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/_replacement_partial.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/hide_div.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/hide_page_element.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/insert_html.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/replace.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/replace_html.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/replace_html_with_partial.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/visual_effect.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/visual_toggle_effect.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/tag_spec/no_tags.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_partial.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/_partial_used_twice.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_partial_with_local_variable.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_spacer.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/accessor.rhtml +5 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/block_helper.rhtml +3 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/entry_form.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/explicit_helper.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/foo/show.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/implicit_helper.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/multiple_helpers.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/should_not_receive.rhtml +3 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/template_with_partial.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/template_with_partial_with_array.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/all.rb +0 -0
- data/vendor/plugins/rspec-rails/stories/configuration/stories.rb +5 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/helper.rb +1 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/steps/people.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/transactions_should_rollback +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/transactions_should_rollback.rb +0 -0
- data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb +25 -20
- data/vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb +1 -1
- data/vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb +1 -1
- data/vendor/plugins/will_paginate/.manifest +49 -0
- data/vendor/plugins/will_paginate/CHANGELOG.rdoc +110 -0
- data/vendor/plugins/will_paginate/LICENSE +18 -0
- data/vendor/plugins/will_paginate/README.rdoc +107 -0
- data/vendor/plugins/will_paginate/Rakefile +62 -0
- data/vendor/plugins/will_paginate/examples/apple-circle.gif +0 -0
- data/vendor/plugins/will_paginate/examples/index.haml +69 -0
- data/vendor/plugins/will_paginate/examples/index.html +92 -0
- data/vendor/plugins/will_paginate/examples/pagination.css +90 -0
- data/vendor/plugins/will_paginate/examples/pagination.sass +91 -0
- data/vendor/plugins/will_paginate/init.rb +1 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/array.rb +16 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/collection.rb +146 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb +32 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/finder.rb +260 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb +170 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb +37 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/version.rb +9 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb +383 -0
- data/vendor/plugins/will_paginate/lib/will_paginate.rb +82 -0
- data/vendor/plugins/will_paginate/test/boot.rb +21 -0
- data/vendor/plugins/will_paginate/test/collection_test.rb +143 -0
- data/vendor/plugins/will_paginate/test/console +8 -0
- data/vendor/plugins/will_paginate/test/database.yml +22 -0
- data/vendor/plugins/will_paginate/test/finder_test.rb +476 -0
- data/vendor/plugins/will_paginate/test/fixtures/admin.rb +3 -0
- data/vendor/plugins/will_paginate/test/fixtures/developer.rb +14 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/developers_projects.yml +0 -0
- data/vendor/plugins/will_paginate/test/fixtures/project.rb +15 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/projects.yml +3 -4
- data/vendor/plugins/will_paginate/test/fixtures/replies.yml +29 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/reply.rb +2 -0
- data/vendor/plugins/will_paginate/test/fixtures/schema.rb +38 -0
- data/vendor/plugins/will_paginate/test/fixtures/topic.rb +10 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/topics.yml +9 -1
- data/vendor/plugins/will_paginate/test/fixtures/user.rb +2 -0
- data/vendor/plugins/{classic_pagination/test/fixtures/developers.yml → will_paginate/test/fixtures/users.yml} +15 -1
- data/vendor/plugins/will_paginate/test/helper.rb +37 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb +36 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb +73 -0
- data/vendor/plugins/will_paginate/test/lib/load_fixtures.rb +11 -0
- data/vendor/plugins/will_paginate/test/lib/view_test_process.rb +165 -0
- data/vendor/plugins/will_paginate/test/tasks.rake +59 -0
- data/vendor/plugins/will_paginate/test/view_test.rb +363 -0
- data/vendor/plugins/will_paginate/will_paginate.gemspec +22 -0
- data/vendor/plugins/xml_sidebar/views/content.rhtml +3 -3
- metadata +614 -542
- data/CHANGES-5.1.3 +0 -21
- data/app/controllers/admin/comments_controller.rb +0 -57
- data/app/controllers/admin/trackbacks_controller.rb +0 -45
- data/app/views/accounts/logout.html.erb +0 -12
- data/app/views/accounts/welcome.html.erb +0 -13
- data/app/views/admin/categories/_quick_post.html.erb +0 -11
- data/app/views/admin/categories/edit.html.erb +0 -11
- data/app/views/admin/comments/destroy.html.erb +0 -11
- data/app/views/admin/comments/edit.html.erb +0 -14
- data/app/views/admin/comments/index.html.erb +0 -30
- data/app/views/admin/comments/show.html.erb +0 -28
- data/app/views/admin/content/_articles.html.erb +0 -47
- data/app/views/admin/content/_pages.html.erb +0 -3
- data/app/views/admin/content/edit.html.erb +0 -3
- data/app/views/admin/pages/_quick_post.html.erb +0 -21
- data/app/views/admin/settings/podcast.html.erb +0 -44
- data/app/views/admin/settings/spam.html.erb +0 -42
- data/app/views/admin/textfilters/_form.html.erb +0 -60
- data/app/views/admin/textfilters/_macros.html.erb +0 -16
- data/app/views/admin/textfilters/_textfilters.html.erb +0 -20
- data/app/views/admin/textfilters/destroy.html.erb +0 -10
- data/app/views/admin/textfilters/edit.html.erb +0 -14
- data/app/views/admin/textfilters/index.html.erb +0 -12
- data/app/views/admin/textfilters/macro_help.html.erb +0 -3
- data/app/views/admin/textfilters/new.html.erb +0 -12
- data/app/views/admin/textfilters/preview.html.erb +0 -3
- data/app/views/admin/textfilters/show.html.erb +0 -29
- data/app/views/admin/textfilters/show_help.html.erb +0 -4
- data/app/views/admin/trackbacks/_form.html.erb +0 -19
- data/app/views/admin/trackbacks/destroy.html.erb +0 -6
- data/app/views/admin/trackbacks/edit.html.erb +0 -11
- data/app/views/admin/trackbacks/index.html.erb +0 -22
- data/app/views/admin/trackbacks/show.html.erb +0 -14
- data/app/views/admin/users/_user.html.erb +0 -20
- data/doc/typo-4.0-release-notes.txt +0 -135
- data/public/images/admin/arrow_comment_group.gif +0 -0
- data/public/images/admin/bc-bg.gif +0 -0
- data/public/images/admin/bgdivider.png +0 -0
- data/public/images/admin/bgoff.png +0 -0
- data/public/images/admin/bgover.png +0 -0
- data/public/images/admin/bgselected.png +0 -0
- data/public/images/admin/cancel.png +0 -0
- data/public/images/admin/checked.png +0 -0
- data/public/images/admin/delete.png +0 -0
- data/public/images/admin/edit.png +0 -0
- data/public/images/admin/help.png +0 -0
- data/public/images/admin/loginformbg.png +0 -0
- data/public/images/admin/show.png +0 -0
- data/public/images/admin/table-header-first.png +0 -0
- data/public/stylesheets/typo_code.css +0 -62
- data/spec/controllers/admin/comments_controller_spec.rb +0 -74
- data/spec/controllers/admin/trackbacks_controller_spec.rb +0 -57
- data/spec/helpers/admin_base_helper_spec.rb +0 -13
- data/themes/dirtylicious/views/shared/_search.html.erb +0 -16
- data/themes/scribbish/views/shared/_search.html.erb +0 -16
- data/themes/standard_issue/views/shared/_search.html.erb +0 -17
- data/themes/typographic/views/shared/_search.html.erb +0 -17
- data/vendor/plugins/classic_pagination/CHANGELOG +0 -152
- data/vendor/plugins/classic_pagination/README +0 -18
- data/vendor/plugins/classic_pagination/init.rb +0 -33
- data/vendor/plugins/classic_pagination/install.rb +0 -1
- data/vendor/plugins/classic_pagination/lib/pagination.rb +0 -405
- data/vendor/plugins/classic_pagination/lib/pagination_helper.rb +0 -135
- data/vendor/plugins/classic_pagination/test/fixtures/companies.yml +0 -24
- data/vendor/plugins/classic_pagination/test/fixtures/company.rb +0 -9
- data/vendor/plugins/classic_pagination/test/fixtures/developer.rb +0 -7
- data/vendor/plugins/classic_pagination/test/fixtures/project.rb +0 -3
- data/vendor/plugins/classic_pagination/test/fixtures/replies.yml +0 -13
- data/vendor/plugins/classic_pagination/test/fixtures/schema.sql +0 -42
- data/vendor/plugins/classic_pagination/test/fixtures/topic.rb +0 -3
- data/vendor/plugins/classic_pagination/test/helper.rb +0 -117
- data/vendor/plugins/classic_pagination/test/pagination_helper_test.rb +0 -38
- data/vendor/plugins/classic_pagination/test/pagination_test.rb +0 -177
- data/vendor/plugins/rspec/README +0 -71
- data/vendor/plugins/rspec/TODO +0 -2
- data/vendor/plugins/rspec/UPGRADE +0 -31
- data/vendor/plugins/rspec/autotest/discover.rb +0 -6
- data/vendor/plugins/rspec/autotest/rspec.rb +0 -1
- data/vendor/plugins/rspec/bin/spec_translator +0 -8
- data/vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb +0 -27
- data/vendor/plugins/rspec/lib/spec/translator.rb +0 -114
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/core.rb +0 -50
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb +0 -54
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec.rb +0 -111
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb +0 -313
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit.rb +0 -4
- data/vendor/plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb +0 -15
- data/vendor/plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb +0 -36
- data/vendor/plugins/rspec/pre_commit/spec/spec_helper.rb +0 -3
- data/vendor/plugins/rspec/pre_commit/spec/spec_suite.rb +0 -11
- data/vendor/plugins/rspec/report.html +0 -4358
- data/vendor/plugins/rspec/spec/spec/example/example_spec.rb +0 -53
- data/vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb +0 -31
- data/vendor/plugins/rspec/spec/spec/translator_spec.rb +0 -265
- data/vendor/plugins/rspec_on_rails/README +0 -3
- data/vendor/plugins/rspec_on_rails/Rakefile +0 -9
- data/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts +0 -6
- data/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb +0 -11
- data/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb +0 -11
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb +0 -313
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb +0 -11
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb +0 -22
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb +0 -22
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb +0 -42
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb +0 -82
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb +0 -62
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb +0 -68
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/render_observer.rb +0 -90
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb +0 -23
- data/vendor/plugins/rspec_on_rails/lib/spec/rails.rb +0 -51
- data/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb +0 -8
- data/vendor/plugins/rspec_on_rails/spec/rails/example/assigns_hash_proxy_spec.rb +0 -55
- data/vendor/plugins/rspec_on_rails/spec/rails/example/ivar_proxy_spec.rb +0 -64
- data/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb +0 -13
- data/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb +0 -65
- data/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb +0 -7
- data/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb +0 -89
- data/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb +0 -10
- data/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml +0 -3
- data/vendor/syntax/LICENSE +0 -27
- data/vendor/syntax/NEWS +0 -16
- data/vendor/syntax/README +0 -38
- data/vendor/syntax/Rakefile +0 -194
- data/vendor/syntax/api/classes/Syntax/Convertors/Abstract.html +0 -159
- data/vendor/syntax/api/classes/Syntax/Convertors/HTML.html +0 -149
- data/vendor/syntax/api/classes/Syntax/Convertors.html +0 -91
- data/vendor/syntax/api/classes/Syntax/Default.html +0 -123
- data/vendor/syntax/api/classes/Syntax/Ruby.html +0 -319
- data/vendor/syntax/api/classes/Syntax/Token.html +0 -151
- data/vendor/syntax/api/classes/Syntax/Tokenizer.html +0 -324
- data/vendor/syntax/api/classes/Syntax/Version.html +0 -109
- data/vendor/syntax/api/classes/Syntax/XML.html +0 -205
- data/vendor/syntax/api/classes/Syntax/YAML.html +0 -189
- data/vendor/syntax/api/classes/Syntax.html +0 -173
- data/vendor/syntax/api/created.rid +0 -1
- data/vendor/syntax/api/files/README.html +0 -155
- data/vendor/syntax/api/files/lib/syntax/common_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/convertors/abstract_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/convertors/html_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/lang/ruby_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/lang/xml_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/lang/yaml_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/version_rb.html +0 -92
- data/vendor/syntax/api/files/lib/syntax_rb.html +0 -96
- data/vendor/syntax/api/fr_class_index.html +0 -56
- data/vendor/syntax/api/fr_file_index.html +0 -54
- data/vendor/syntax/api/fr_method_index.html +0 -65
- data/vendor/syntax/api/index.html +0 -26
- data/vendor/syntax/api/rdoc-style.css +0 -175
- data/vendor/syntax/doc/manual/chapter.erb +0 -38
- data/vendor/syntax/doc/manual/example.erb +0 -18
- data/vendor/syntax/doc/manual/index.erb +0 -29
- data/vendor/syntax/doc/manual/manual.rb +0 -311
- data/vendor/syntax/doc/manual/manual.yml +0 -43
- data/vendor/syntax/doc/manual/page.erb +0 -87
- data/vendor/syntax/doc/manual/parts/0000.txt +0 -5
- data/vendor/syntax/doc/manual/parts/0001.txt +0 -16
- data/vendor/syntax/doc/manual/parts/0002.txt +0 -24
- data/vendor/syntax/doc/manual/parts/0003.txt +0 -6
- data/vendor/syntax/doc/manual/parts/0004.txt +0 -32
- data/vendor/syntax/doc/manual/parts/0005.txt +0 -18
- data/vendor/syntax/doc/manual/parts/0006.txt +0 -62
- data/vendor/syntax/doc/manual/parts/0007.txt +0 -3
- data/vendor/syntax/doc/manual/parts/0008.txt +0 -5
- data/vendor/syntax/doc/manual/parts/0009.txt +0 -29
- data/vendor/syntax/doc/manual/parts/0010.txt +0 -21
- data/vendor/syntax/doc/manual/stylesheets/manual.css +0 -270
- data/vendor/syntax/doc/manual/stylesheets/ruby.css +0 -17
- data/vendor/syntax/doc/manual/tutorial.erb +0 -30
- data/vendor/syntax/doc/manual-html/chapter-1.html +0 -198
- data/vendor/syntax/doc/manual-html/chapter-2.html +0 -262
- data/vendor/syntax/doc/manual-html/chapter-3.html +0 -266
- data/vendor/syntax/doc/manual-html/chapter-4.html +0 -267
- data/vendor/syntax/doc/manual-html/index.html +0 -152
- data/vendor/syntax/doc/manual-html/stylesheets/manual.css +0 -270
- data/vendor/syntax/doc/manual-html/stylesheets/ruby.css +0 -17
- data/vendor/syntax/lib/syntax/common.rb +0 -163
- data/vendor/syntax/lib/syntax/convertors/abstract.rb +0 -27
- data/vendor/syntax/lib/syntax/convertors/html.rb +0 -51
- data/vendor/syntax/lib/syntax/lang/ruby.rb +0 -317
- data/vendor/syntax/lib/syntax/lang/xml.rb +0 -108
- data/vendor/syntax/lib/syntax/lang/yaml.rb +0 -105
- data/vendor/syntax/lib/syntax/version.rb +0 -9
- data/vendor/syntax/lib/syntax.rb +0 -38
- data/vendor/syntax/setup.rb +0 -1331
- data/vendor/syntax/syntax.gemspec +0 -24
- data/vendor/syntax/test/ALL-TESTS.rb +0 -5
- data/vendor/syntax/test/syntax/tc_ruby.rb +0 -871
- data/vendor/syntax/test/syntax/tc_xml.rb +0 -202
- data/vendor/syntax/test/syntax/tc_yaml.rb +0 -228
- data/vendor/syntax/test/syntax/tokenizer_testcase.rb +0 -40
- data/vendor/syntax/test/tc_syntax.rb +0 -22
@@ -1,17 +0,0 @@
|
|
1
|
-
.ruby .normal {}
|
2
|
-
.ruby .comment { color: #005; font-style: italic; }
|
3
|
-
.ruby .keyword { color: #A00; font-weight: bold; }
|
4
|
-
.ruby .method { color: #077; }
|
5
|
-
.ruby .class { color: #074; }
|
6
|
-
.ruby .module { color: #050; }
|
7
|
-
.ruby .punct { color: #447; font-weight: bold; }
|
8
|
-
.ruby .symbol { color: #099; }
|
9
|
-
.ruby .string { color: #944; }
|
10
|
-
.ruby .char { color: #F07; }
|
11
|
-
.ruby .ident { color: #004; }
|
12
|
-
.ruby .constant { color: #07F; }
|
13
|
-
.ruby .regex { color: #B66; }
|
14
|
-
.ruby .number { color: #D55; }
|
15
|
-
.ruby .attribute { color: #377; }
|
16
|
-
.ruby .global { color: #3B7; }
|
17
|
-
.ruby .expr { color: #227; }
|
@@ -1,163 +0,0 @@
|
|
1
|
-
require 'strscan'
|
2
|
-
|
3
|
-
module Syntax
|
4
|
-
|
5
|
-
# A single token extracted by a tokenizer. It is simply the lexeme
|
6
|
-
# itself, decorated with a 'group' attribute to identify the type of the
|
7
|
-
# lexeme.
|
8
|
-
class Token < String
|
9
|
-
|
10
|
-
# the type of the lexeme that was extracted.
|
11
|
-
attr_reader :group
|
12
|
-
|
13
|
-
# the instruction associated with this token (:none, :region_open, or
|
14
|
-
# :region_close)
|
15
|
-
attr_reader :instruction
|
16
|
-
|
17
|
-
# Create a new Token representing the given text, and belonging to the
|
18
|
-
# given group.
|
19
|
-
def initialize( text, group, instruction = :none )
|
20
|
-
super text
|
21
|
-
@group = group
|
22
|
-
@instruction = instruction
|
23
|
-
end
|
24
|
-
|
25
|
-
end
|
26
|
-
|
27
|
-
# The base class of all tokenizers. It sets up the scanner and manages the
|
28
|
-
# looping until all tokens have been extracted. It also provides convenience
|
29
|
-
# methods to make sure adjacent tokens of identical groups are returned as
|
30
|
-
# a single token.
|
31
|
-
class Tokenizer
|
32
|
-
|
33
|
-
# The current group being processed by the tokenizer
|
34
|
-
attr_reader :group
|
35
|
-
|
36
|
-
# The current chunk of text being accumulated
|
37
|
-
attr_reader :chunk
|
38
|
-
|
39
|
-
# Start tokenizing. This sets up the state in preparation for tokenization,
|
40
|
-
# such as creating a new scanner for the text and saving the callback block.
|
41
|
-
# The block will be invoked for each token extracted.
|
42
|
-
def start( text, &block )
|
43
|
-
@chunk = ""
|
44
|
-
@group = :normal
|
45
|
-
@callback = block
|
46
|
-
@text = StringScanner.new( text )
|
47
|
-
setup
|
48
|
-
end
|
49
|
-
|
50
|
-
# Subclasses may override this method to provide implementation-specific
|
51
|
-
# setup logic.
|
52
|
-
def setup
|
53
|
-
end
|
54
|
-
|
55
|
-
# Finish tokenizing. This flushes the buffer, yielding any remaining text
|
56
|
-
# to the client.
|
57
|
-
def finish
|
58
|
-
start_group nil
|
59
|
-
teardown
|
60
|
-
end
|
61
|
-
|
62
|
-
# Subclasses may override this method to provide implementation-specific
|
63
|
-
# teardown logic.
|
64
|
-
def teardown
|
65
|
-
end
|
66
|
-
|
67
|
-
# Subclasses must implement this method, which is called for each iteration
|
68
|
-
# of the tokenization process. This method may extract multiple tokens.
|
69
|
-
def step
|
70
|
-
raise NotImplementedError, "subclasses must implement #step"
|
71
|
-
end
|
72
|
-
|
73
|
-
# Begins tokenizing the given text, calling #step until the text has been
|
74
|
-
# exhausted.
|
75
|
-
def tokenize( text, &block )
|
76
|
-
start text, &block
|
77
|
-
step until @text.eos?
|
78
|
-
finish
|
79
|
-
end
|
80
|
-
|
81
|
-
# Specify a set of tokenizer-specific options. Each tokenizer may (or may
|
82
|
-
# not) publish any options, but if a tokenizer does those options may be
|
83
|
-
# used to specify optional behavior.
|
84
|
-
def set( opts={} )
|
85
|
-
( @options ||= Hash.new ).update opts
|
86
|
-
end
|
87
|
-
|
88
|
-
# Get the value of the specified option.
|
89
|
-
def option(opt)
|
90
|
-
@options ? @options[opt] : nil
|
91
|
-
end
|
92
|
-
|
93
|
-
private
|
94
|
-
|
95
|
-
EOL = /(?=\r\n?|\n|$)/
|
96
|
-
|
97
|
-
# A convenience for delegating method calls to the scanner.
|
98
|
-
def self.delegate( sym )
|
99
|
-
define_method( sym ) { |*a| @text.__send__( sym, *a ) }
|
100
|
-
end
|
101
|
-
|
102
|
-
delegate :bol?
|
103
|
-
delegate :eos?
|
104
|
-
delegate :scan
|
105
|
-
delegate :scan_until
|
106
|
-
delegate :check
|
107
|
-
delegate :check_until
|
108
|
-
delegate :getch
|
109
|
-
delegate :matched
|
110
|
-
delegate :pre_match
|
111
|
-
delegate :peek
|
112
|
-
delegate :pos
|
113
|
-
|
114
|
-
# Access the n-th subgroup from the most recent match.
|
115
|
-
def subgroup(n)
|
116
|
-
@text[n]
|
117
|
-
end
|
118
|
-
|
119
|
-
# Append the given data to the currently active chunk.
|
120
|
-
def append( data )
|
121
|
-
@chunk << data
|
122
|
-
end
|
123
|
-
|
124
|
-
# Request that a new group be started. If the current group is the same
|
125
|
-
# as the group being requested, a new group will not be created. If a new
|
126
|
-
# group is created and the current chunk is not empty, the chunk's
|
127
|
-
# contents will be yielded to the client as a token, and then cleared.
|
128
|
-
#
|
129
|
-
# After the new group is started, if +data+ is non-nil it will be appended
|
130
|
-
# to the chunk.
|
131
|
-
def start_group( gr, data=nil )
|
132
|
-
flush_chunk if gr != @group
|
133
|
-
@group = gr
|
134
|
-
@chunk << data if data
|
135
|
-
end
|
136
|
-
|
137
|
-
def start_region( gr, data=nil )
|
138
|
-
flush_chunk
|
139
|
-
@group = gr
|
140
|
-
@callback.call( Token.new( data||"", @group, :region_open ) )
|
141
|
-
end
|
142
|
-
|
143
|
-
def end_region( gr, data=nil )
|
144
|
-
flush_chunk
|
145
|
-
@group = gr
|
146
|
-
@callback.call( Token.new( data||"", @group, :region_close ) )
|
147
|
-
end
|
148
|
-
|
149
|
-
def flush_chunk
|
150
|
-
@callback.call( Token.new( @chunk, @group ) ) unless @chunk.empty?
|
151
|
-
@chunk = ""
|
152
|
-
end
|
153
|
-
|
154
|
-
def subtokenize( syntax, text )
|
155
|
-
tokenizer = Syntax.load( syntax )
|
156
|
-
tokenizer.set @options if @options
|
157
|
-
flush_chunk
|
158
|
-
tokenizer.tokenize( text, &@callback )
|
159
|
-
end
|
160
|
-
|
161
|
-
end
|
162
|
-
|
163
|
-
end
|
@@ -1,27 +0,0 @@
|
|
1
|
-
require 'syntax'
|
2
|
-
|
3
|
-
module Syntax
|
4
|
-
module Convertors
|
5
|
-
|
6
|
-
# The abstract ancestor class for all convertors. It implements a few
|
7
|
-
# convenience methods to provide a common interface for all convertors.
|
8
|
-
class Abstract
|
9
|
-
|
10
|
-
# A reference to the tokenizer used by this convertor.
|
11
|
-
attr_reader :tokenizer
|
12
|
-
|
13
|
-
# A convenience method for instantiating a new convertor for a
|
14
|
-
# specific syntax.
|
15
|
-
def self.for_syntax( syntax )
|
16
|
-
new( Syntax.load( syntax ) )
|
17
|
-
end
|
18
|
-
|
19
|
-
# Creates a new convertor that uses the given tokenizer.
|
20
|
-
def initialize( tokenizer )
|
21
|
-
@tokenizer = tokenizer
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|
25
|
-
|
26
|
-
end
|
27
|
-
end
|
@@ -1,51 +0,0 @@
|
|
1
|
-
require 'syntax/convertors/abstract'
|
2
|
-
|
3
|
-
module Syntax
|
4
|
-
module Convertors
|
5
|
-
|
6
|
-
# A simple class for converting a text into HTML.
|
7
|
-
class HTML < Abstract
|
8
|
-
|
9
|
-
# Converts the given text to HTML, using spans to represent token groups
|
10
|
-
# of any type but <tt>:normal</tt> (which is always unhighlighted). If
|
11
|
-
# +pre+ is +true+, the html is automatically wrapped in pre tags.
|
12
|
-
def convert( text, pre=true )
|
13
|
-
html = ""
|
14
|
-
html << "<pre>" if pre
|
15
|
-
regions = []
|
16
|
-
@tokenizer.tokenize( text ) do |tok|
|
17
|
-
value = html_escape(tok)
|
18
|
-
case tok.instruction
|
19
|
-
when :region_close then
|
20
|
-
regions.pop
|
21
|
-
html << "</span>"
|
22
|
-
when :region_open then
|
23
|
-
regions.push tok.group
|
24
|
-
html << "<span class=\"#{tok.group}\">#{value}"
|
25
|
-
else
|
26
|
-
if tok.group == ( regions.last || :normal )
|
27
|
-
html << value
|
28
|
-
else
|
29
|
-
html << "<span class=\"#{tok.group}\">#{value}</span>"
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
html << "</span>" while regions.pop
|
34
|
-
html << "</pre>" if pre
|
35
|
-
html
|
36
|
-
end
|
37
|
-
|
38
|
-
private
|
39
|
-
|
40
|
-
# Replaces some characters with their corresponding HTML entities.
|
41
|
-
def html_escape( string )
|
42
|
-
string.gsub( /&/, "&" ).
|
43
|
-
gsub( /</, "<" ).
|
44
|
-
gsub( />/, ">" ).
|
45
|
-
gsub( /"/, """ )
|
46
|
-
end
|
47
|
-
|
48
|
-
end
|
49
|
-
|
50
|
-
end
|
51
|
-
end
|
@@ -1,317 +0,0 @@
|
|
1
|
-
require 'syntax'
|
2
|
-
|
3
|
-
module Syntax
|
4
|
-
|
5
|
-
# A tokenizer for the Ruby language. It recognizes all common syntax
|
6
|
-
# (and some less common syntax) but because it is not a true lexer, it
|
7
|
-
# will make mistakes on some ambiguous cases.
|
8
|
-
class Ruby < Tokenizer
|
9
|
-
|
10
|
-
# The list of all identifiers recognized as keywords.
|
11
|
-
KEYWORDS =
|
12
|
-
%w{if then elsif else end begin do rescue ensure while for
|
13
|
-
class module def yield raise until unless and or not when
|
14
|
-
case super undef break next redo retry in return alias
|
15
|
-
defined?}
|
16
|
-
|
17
|
-
# Perform ruby-specific setup
|
18
|
-
def setup
|
19
|
-
@selector = false
|
20
|
-
@allow_operator = false
|
21
|
-
@heredocs = []
|
22
|
-
end
|
23
|
-
|
24
|
-
# Step through a single iteration of the tokenization process.
|
25
|
-
def step
|
26
|
-
case
|
27
|
-
when bol? && check( /=begin/ )
|
28
|
-
start_group( :comment, scan_until( /^=end#{EOL}/ ) )
|
29
|
-
when bol? && check( /__END__#{EOL}/ )
|
30
|
-
start_group( :comment, scan_until( /\Z/ ) )
|
31
|
-
else
|
32
|
-
case
|
33
|
-
when check( /def\s+/ )
|
34
|
-
start_group :keyword, scan( /def\s+/ )
|
35
|
-
start_group :method, scan_until( /(?=[;(\s]|#{EOL})/ )
|
36
|
-
when check( /class\s+/ )
|
37
|
-
start_group :keyword, scan( /class\s+/ )
|
38
|
-
start_group :class, scan_until( /(?=[;\s<]|#{EOL})/ )
|
39
|
-
when check( /module\s+/ )
|
40
|
-
start_group :keyword, scan( /module\s+/ )
|
41
|
-
start_group :module, scan_until( /(?=[;\s]|#{EOL})/ )
|
42
|
-
when check( /::/ )
|
43
|
-
start_group :punct, scan(/::/)
|
44
|
-
when check( /:"/ )
|
45
|
-
start_group :symbol, scan(/:/)
|
46
|
-
scan_delimited_region :symbol, :symbol, "", true
|
47
|
-
@allow_operator = true
|
48
|
-
when check( /:'/ )
|
49
|
-
start_group :symbol, scan(/:/)
|
50
|
-
scan_delimited_region :symbol, :symbol, "", false
|
51
|
-
@allow_operator = true
|
52
|
-
when scan( /:[_a-zA-Z@$][$@\w]*[=!?]?/ )
|
53
|
-
start_group :symbol, matched
|
54
|
-
@allow_operator = true
|
55
|
-
when scan( /\?(\\[^\n\r]|[^\\\n\r\s])/ )
|
56
|
-
start_group :char, matched
|
57
|
-
@allow_operator = true
|
58
|
-
when check( /(__FILE__|__LINE__|true|false|nil|self)[?!]?/ )
|
59
|
-
if @selector || matched[-1] == ?? || matched[-1] == ?!
|
60
|
-
start_group :ident,
|
61
|
-
scan(/(__FILE__|__LINE__|true|false|nil|self)[?!]?/)
|
62
|
-
else
|
63
|
-
start_group :constant,
|
64
|
-
scan(/(__FILE__|__LINE__|true|false|nil|self)/)
|
65
|
-
end
|
66
|
-
@selector = false
|
67
|
-
@allow_operator = true
|
68
|
-
when scan(/0([bB][01]+|[oO][0-7]+|[dD][0-9]+|[xX][0-9a-fA-F]+)/)
|
69
|
-
start_group :number, matched
|
70
|
-
@allow_operator = true
|
71
|
-
else
|
72
|
-
case peek(2)
|
73
|
-
when "%r"
|
74
|
-
scan_delimited_region :punct, :regex, scan( /../ ), true
|
75
|
-
@allow_operator = true
|
76
|
-
when "%w", "%q"
|
77
|
-
scan_delimited_region :punct, :string, scan( /../ ), false
|
78
|
-
@allow_operator = true
|
79
|
-
when "%s"
|
80
|
-
scan_delimited_region :punct, :symbol, scan( /../ ), false
|
81
|
-
@allow_operator = true
|
82
|
-
when "%W", "%Q", "%x"
|
83
|
-
scan_delimited_region :punct, :string, scan( /../ ), true
|
84
|
-
@allow_operator = true
|
85
|
-
when /%[^\sa-zA-Z0-9]/
|
86
|
-
scan_delimited_region :punct, :string, scan( /./ ), true
|
87
|
-
@allow_operator = true
|
88
|
-
when "<<"
|
89
|
-
saw_word = ( chunk[-1,1] =~ /[\w!?]/ )
|
90
|
-
start_group :punct, scan( /<</ )
|
91
|
-
if saw_word
|
92
|
-
@allow_operator = false
|
93
|
-
return
|
94
|
-
end
|
95
|
-
|
96
|
-
float_right = scan( /-/ )
|
97
|
-
append "-" if float_right
|
98
|
-
if ( type = scan( /['"]/ ) )
|
99
|
-
append type
|
100
|
-
delim = scan_until( /(?=#{type})/ )
|
101
|
-
if delim.nil?
|
102
|
-
append scan_until( /\Z/ )
|
103
|
-
return
|
104
|
-
end
|
105
|
-
else
|
106
|
-
delim = scan( /\w+/ ) or return
|
107
|
-
end
|
108
|
-
start_group :constant, delim
|
109
|
-
start_group :punct, scan( /#{type}/ ) if type
|
110
|
-
@heredocs << [ float_right, type, delim ]
|
111
|
-
@allow_operator = true
|
112
|
-
else
|
113
|
-
case peek(1)
|
114
|
-
when /[\n\r]/
|
115
|
-
unless @heredocs.empty?
|
116
|
-
scan_heredoc(*@heredocs.shift)
|
117
|
-
else
|
118
|
-
start_group :normal, scan( /\s+/ )
|
119
|
-
end
|
120
|
-
@allow_operator = false
|
121
|
-
when /\s/
|
122
|
-
start_group :normal, scan( /\s+/ )
|
123
|
-
when "#"
|
124
|
-
start_group :comment, scan( /#[^\n\r]*/ )
|
125
|
-
when /[A-Z]/
|
126
|
-
start_group @selector ? :ident : :constant, scan( /\w+/ )
|
127
|
-
@allow_operator = true
|
128
|
-
when /[a-z_]/
|
129
|
-
word = scan( /\w+[?!]?/ )
|
130
|
-
if !@selector && KEYWORDS.include?( word )
|
131
|
-
start_group :keyword, word
|
132
|
-
@allow_operator = false
|
133
|
-
elsif
|
134
|
-
start_group :ident, word
|
135
|
-
@allow_operator = true
|
136
|
-
end
|
137
|
-
@selector = false
|
138
|
-
when /\d/
|
139
|
-
start_group :number,
|
140
|
-
scan( /[\d_]+(\.[\d_]+)?([eE][\d_]+)?/ )
|
141
|
-
@allow_operator = true
|
142
|
-
when '"'
|
143
|
-
scan_delimited_region :punct, :string, "", true
|
144
|
-
@allow_operator = true
|
145
|
-
when '/'
|
146
|
-
if @allow_operator
|
147
|
-
start_group :punct, scan(%r{/})
|
148
|
-
@allow_operator = false
|
149
|
-
else
|
150
|
-
scan_delimited_region :punct, :regex, "", true
|
151
|
-
@allow_operator = true
|
152
|
-
end
|
153
|
-
when "'"
|
154
|
-
scan_delimited_region :punct, :string, "", false
|
155
|
-
@allow_operator = true
|
156
|
-
when "."
|
157
|
-
dots = scan( /\.{1,3}/ )
|
158
|
-
start_group :punct, dots
|
159
|
-
@selector = ( dots.length == 1 )
|
160
|
-
when /[@]/
|
161
|
-
start_group :attribute, scan( /@{1,2}\w*/ )
|
162
|
-
@allow_operator = true
|
163
|
-
when /[$]/
|
164
|
-
start_group :global, scan(/\$/)
|
165
|
-
start_group :global, scan( /\w+|./ ) if check(/./)
|
166
|
-
@allow_operator = true
|
167
|
-
when /[-!?*\/+=<>(\[\{}:;,&|%]/
|
168
|
-
start_group :punct, scan(/./)
|
169
|
-
@allow_operator = false
|
170
|
-
when /[)\]]/
|
171
|
-
start_group :punct, scan(/./)
|
172
|
-
@allow_operator = true
|
173
|
-
else
|
174
|
-
# all else just falls through this, to prevent
|
175
|
-
# infinite loops...
|
176
|
-
append getch
|
177
|
-
end
|
178
|
-
end
|
179
|
-
end
|
180
|
-
end
|
181
|
-
end
|
182
|
-
|
183
|
-
private
|
184
|
-
|
185
|
-
# Scan a delimited region of text. This handles the simple cases (strings
|
186
|
-
# delimited with quotes) as well as the more complex cases of %-strings
|
187
|
-
# and here-documents.
|
188
|
-
#
|
189
|
-
# * +delim_group+ is the group to use to classify the delimiters of the
|
190
|
-
# region
|
191
|
-
# * +inner_group+ is the group to use to classify the contents of the
|
192
|
-
# region
|
193
|
-
# * +starter+ is the text to use as the starting delimiter
|
194
|
-
# * +exprs+ is a boolean flag indicating whether the region is an
|
195
|
-
# interpolated string or not
|
196
|
-
# * +delim+ is the text to use as the delimiter of the region. If +nil+,
|
197
|
-
# the next character will be treated as the delimiter.
|
198
|
-
# * +heredoc+ is either +false+, meaning the region is not a heredoc, or
|
199
|
-
# <tt>:flush</tt> (meaning the delimiter must be flushed left), or
|
200
|
-
# <tt>:float</tt> (meaning the delimiter doens't have to be flush left).
|
201
|
-
def scan_delimited_region( delim_group, inner_group, starter, exprs,
|
202
|
-
delim=nil, heredoc=false )
|
203
|
-
# begin
|
204
|
-
if !delim
|
205
|
-
start_group delim_group, starter
|
206
|
-
delim = scan( /./ )
|
207
|
-
append delim
|
208
|
-
|
209
|
-
delim = case delim
|
210
|
-
when '{' then '}'
|
211
|
-
when '(' then ')'
|
212
|
-
when '[' then ']'
|
213
|
-
when '<' then '>'
|
214
|
-
else delim
|
215
|
-
end
|
216
|
-
end
|
217
|
-
|
218
|
-
start_region inner_group
|
219
|
-
|
220
|
-
items = "\\\\|"
|
221
|
-
if heredoc
|
222
|
-
items << "(^"
|
223
|
-
items << '\s*' if heredoc == :float
|
224
|
-
items << "#{Regexp.escape(delim)}\s*?)#{EOL}"
|
225
|
-
else
|
226
|
-
items << "#{Regexp.escape(delim)}"
|
227
|
-
end
|
228
|
-
items << "|#(\\$|@@?|\\{)" if exprs
|
229
|
-
items = Regexp.new( items )
|
230
|
-
|
231
|
-
loop do
|
232
|
-
p = pos
|
233
|
-
match = scan_until( items )
|
234
|
-
if match.nil?
|
235
|
-
start_group inner_group, scan_until( /\Z/ )
|
236
|
-
break
|
237
|
-
else
|
238
|
-
text = pre_match[p..-1]
|
239
|
-
start_group inner_group, text if text.length > 0
|
240
|
-
case matched.strip
|
241
|
-
when "\\"
|
242
|
-
unless exprs
|
243
|
-
case peek(1)
|
244
|
-
when "'"
|
245
|
-
scan(/./)
|
246
|
-
start_group :escape, "\\'"
|
247
|
-
when "\\"
|
248
|
-
scan(/./)
|
249
|
-
start_group :escape, "\\\\"
|
250
|
-
else
|
251
|
-
start_group inner_group, "\\"
|
252
|
-
end
|
253
|
-
else
|
254
|
-
start_group :escape, "\\"
|
255
|
-
c = getch
|
256
|
-
append c
|
257
|
-
case c
|
258
|
-
when 'x'
|
259
|
-
append scan( /[a-fA-F0-9]{1,2}/ )
|
260
|
-
when /[0-7]/
|
261
|
-
append scan( /[0-7]{0,2}/ )
|
262
|
-
end
|
263
|
-
end
|
264
|
-
when delim
|
265
|
-
end_region inner_group
|
266
|
-
start_group delim_group, matched
|
267
|
-
break
|
268
|
-
when /^#/
|
269
|
-
do_highlight = (option(:expressions) == :highlight)
|
270
|
-
start_region :expr if do_highlight
|
271
|
-
start_group :expr, matched
|
272
|
-
case matched[1]
|
273
|
-
when ?{
|
274
|
-
depth = 1
|
275
|
-
content = ""
|
276
|
-
while depth > 0
|
277
|
-
p = pos
|
278
|
-
c = scan_until( /[\{}]/ )
|
279
|
-
if c.nil?
|
280
|
-
content << scan_until( /\Z/ )
|
281
|
-
break
|
282
|
-
else
|
283
|
-
depth += ( matched == "{" ? 1 : -1 )
|
284
|
-
content << pre_match[p..-1]
|
285
|
-
content << matched if depth > 0
|
286
|
-
end
|
287
|
-
end
|
288
|
-
if do_highlight
|
289
|
-
subtokenize "ruby", content
|
290
|
-
start_group :expr, "}"
|
291
|
-
else
|
292
|
-
append content + "}"
|
293
|
-
end
|
294
|
-
when ?$, ?@
|
295
|
-
append scan( /\w+/ )
|
296
|
-
end
|
297
|
-
end_region :expr if do_highlight
|
298
|
-
else raise "unexpected match on #{matched}"
|
299
|
-
end
|
300
|
-
end
|
301
|
-
end
|
302
|
-
end
|
303
|
-
|
304
|
-
# Scan a heredoc beginning at the current position.
|
305
|
-
#
|
306
|
-
# * +float+ indicates whether the delimiter may be floated to the right
|
307
|
-
# * +type+ is +nil+, a single quote, or a double quote
|
308
|
-
# * +delim+ is the delimiter to look for
|
309
|
-
def scan_heredoc(float, type, delim)
|
310
|
-
scan_delimited_region( :constant, :string, "", type != "'",
|
311
|
-
delim, float ? :float : :flush )
|
312
|
-
end
|
313
|
-
end
|
314
|
-
|
315
|
-
SYNTAX["ruby"] = Ruby
|
316
|
-
|
317
|
-
end
|
@@ -1,108 +0,0 @@
|
|
1
|
-
require 'syntax'
|
2
|
-
|
3
|
-
module Syntax
|
4
|
-
|
5
|
-
# A simple implementation of an XML lexer. It handles most cases. It is
|
6
|
-
# not a validating lexer, meaning it will happily process invalid XML without
|
7
|
-
# complaining.
|
8
|
-
class XML < Tokenizer
|
9
|
-
|
10
|
-
# Initialize the lexer.
|
11
|
-
def setup
|
12
|
-
@in_tag = false
|
13
|
-
end
|
14
|
-
|
15
|
-
# Step through a single iteration of the tokenization process. This will
|
16
|
-
# yield (potentially) many tokens, and possibly zero tokens.
|
17
|
-
def step
|
18
|
-
start_group :normal, matched if scan( /\s+/ )
|
19
|
-
if @in_tag
|
20
|
-
case
|
21
|
-
when scan( /([-\w]+):([-\w]+)/ )
|
22
|
-
start_group :namespace, subgroup(1)
|
23
|
-
start_group :punct, ":"
|
24
|
-
start_group :attribute, subgroup(2)
|
25
|
-
when scan( /\d+/ )
|
26
|
-
start_group :number, matched
|
27
|
-
when scan( /[-\w]+/ )
|
28
|
-
start_group :attribute, matched
|
29
|
-
when scan( %r{[/?]?>} )
|
30
|
-
@in_tag = false
|
31
|
-
start_group :punct, matched
|
32
|
-
when scan( /=/ )
|
33
|
-
start_group :punct, matched
|
34
|
-
when scan( /["']/ )
|
35
|
-
scan_string matched
|
36
|
-
else
|
37
|
-
append getch
|
38
|
-
end
|
39
|
-
elsif ( text = scan_until( /(?=[<&])/ ) )
|
40
|
-
start_group :normal, text unless text.empty?
|
41
|
-
if scan(/<!--.*?(-->|\Z)/m)
|
42
|
-
start_group :comment, matched
|
43
|
-
else
|
44
|
-
case peek(1)
|
45
|
-
when "<"
|
46
|
-
start_group :punct, getch
|
47
|
-
case peek(1)
|
48
|
-
when "?"
|
49
|
-
append getch
|
50
|
-
when "/"
|
51
|
-
append getch
|
52
|
-
when "!"
|
53
|
-
append getch
|
54
|
-
end
|
55
|
-
start_group :normal, matched if scan( /\s+/ )
|
56
|
-
if scan( /([-\w]+):([-\w]+)/ )
|
57
|
-
start_group :namespace, subgroup(1)
|
58
|
-
start_group :punct, ":"
|
59
|
-
start_group :tag, subgroup(2)
|
60
|
-
elsif scan( /[-\w]+/ )
|
61
|
-
start_group :tag, matched
|
62
|
-
end
|
63
|
-
@in_tag = true
|
64
|
-
when "&"
|
65
|
-
if scan( /&\S{1,10};/ )
|
66
|
-
start_group :entity, matched
|
67
|
-
else
|
68
|
-
start_group :normal, scan( /&/ )
|
69
|
-
end
|
70
|
-
end
|
71
|
-
end
|
72
|
-
else
|
73
|
-
append scan_until( /\Z/ )
|
74
|
-
end
|
75
|
-
end
|
76
|
-
|
77
|
-
private
|
78
|
-
|
79
|
-
# Scan the string starting at the current position, with the given
|
80
|
-
# delimiter character.
|
81
|
-
def scan_string( delim )
|
82
|
-
start_group :punct, delim
|
83
|
-
match = /(?=[&\\]|#{delim})/
|
84
|
-
loop do
|
85
|
-
break unless ( text = scan_until( match ) )
|
86
|
-
start_group :string, text unless text.empty?
|
87
|
-
case peek(1)
|
88
|
-
when "&"
|
89
|
-
if scan( /&\S{1,10};/ )
|
90
|
-
start_group :entity, matched
|
91
|
-
else
|
92
|
-
start_group :string, getch
|
93
|
-
end
|
94
|
-
when "\\"
|
95
|
-
start_group :string, getch
|
96
|
-
append getch || ""
|
97
|
-
when delim
|
98
|
-
start_group :punct, getch
|
99
|
-
break
|
100
|
-
end
|
101
|
-
end
|
102
|
-
end
|
103
|
-
|
104
|
-
end
|
105
|
-
|
106
|
-
SYNTAX["xml"] = XML
|
107
|
-
|
108
|
-
end
|