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
@@ -0,0 +1,132 @@
|
|
1
|
+
module CodeRay
|
2
|
+
module Styles
|
3
|
+
|
4
|
+
class Murphy < Style
|
5
|
+
|
6
|
+
register_for :murphy
|
7
|
+
|
8
|
+
code_background = '#001129'
|
9
|
+
numbers_background = code_background
|
10
|
+
border_color = 'silver'
|
11
|
+
normal_color = '#C0C0C0'
|
12
|
+
|
13
|
+
CSS_MAIN_STYLES = <<-MAIN
|
14
|
+
.CodeRay {
|
15
|
+
background-color: #{code_background};
|
16
|
+
border: 1px solid #{border_color};
|
17
|
+
font-family: 'Courier New', 'Terminal', monospace;
|
18
|
+
color: #{normal_color};
|
19
|
+
}
|
20
|
+
.CodeRay pre { margin: 0px; }
|
21
|
+
|
22
|
+
div.CodeRay { }
|
23
|
+
|
24
|
+
span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
|
25
|
+
|
26
|
+
table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
|
27
|
+
table.CodeRay td { padding: 2px 4px; vertical-align: top; }
|
28
|
+
|
29
|
+
.CodeRay .line_numbers, .CodeRay .no {
|
30
|
+
background-color: #{numbers_background};
|
31
|
+
color: gray;
|
32
|
+
text-align: right;
|
33
|
+
}
|
34
|
+
.CodeRay .line_numbers tt { font-weight: bold; }
|
35
|
+
.CodeRay .no { padding: 0px 4px; }
|
36
|
+
.CodeRay .code { width: 100%; }
|
37
|
+
|
38
|
+
ol.CodeRay { font-size: 10pt; }
|
39
|
+
ol.CodeRay li { white-space: pre; }
|
40
|
+
|
41
|
+
.CodeRay .code pre { overflow: auto; }
|
42
|
+
MAIN
|
43
|
+
|
44
|
+
TOKEN_COLORS = <<-'TOKENS'
|
45
|
+
.af { color:#00C; }
|
46
|
+
.an { color:#007; }
|
47
|
+
.av { color:#700; }
|
48
|
+
.aw { color:#C00; }
|
49
|
+
.bi { color:#509; font-weight:bold; }
|
50
|
+
.c { color:#555; background-color: black; }
|
51
|
+
|
52
|
+
.ch { color:#88F; }
|
53
|
+
.ch .k { color:#04D; }
|
54
|
+
.ch .dl { color:#039; }
|
55
|
+
|
56
|
+
.cl { color:#e9e; font-weight:bold; }
|
57
|
+
.co { color:#5ED; font-weight:bold; }
|
58
|
+
.cr { color:#0A0; }
|
59
|
+
.cv { color:#ccf; }
|
60
|
+
.df { color:#099; font-weight:bold; }
|
61
|
+
.di { color:#088; font-weight:bold; }
|
62
|
+
.dl { color:black; }
|
63
|
+
.do { color:#970; }
|
64
|
+
.ds { color:#D42; font-weight:bold; }
|
65
|
+
.e { color:#666; font-weight:bold; }
|
66
|
+
.er { color:#F00; background-color:#FAA; }
|
67
|
+
.ex { color:#F00; font-weight:bold; }
|
68
|
+
.fl { color:#60E; font-weight:bold; }
|
69
|
+
.fu { color:#5ed; font-weight:bold; }
|
70
|
+
.gv { color:#f84; }
|
71
|
+
.hx { color:#058; font-weight:bold; }
|
72
|
+
.i { color:#66f; font-weight:bold; }
|
73
|
+
.ic { color:#B44; font-weight:bold; }
|
74
|
+
.il { }
|
75
|
+
.in { color:#B2B; font-weight:bold; }
|
76
|
+
.iv { color:#aaf; }
|
77
|
+
.la { color:#970; font-weight:bold; }
|
78
|
+
.lv { color:#963; }
|
79
|
+
.oc { color:#40E; font-weight:bold; }
|
80
|
+
.of { color:#000; font-weight:bold; }
|
81
|
+
.op { }
|
82
|
+
.pc { color:#08f; font-weight:bold; }
|
83
|
+
.pd { color:#369; font-weight:bold; }
|
84
|
+
.pp { color:#579; }
|
85
|
+
.pt { color:#66f; font-weight:bold; }
|
86
|
+
.r { color:#5de; font-weight:bold; }
|
87
|
+
.r, .kw { color:#5de; font-weight:bold }
|
88
|
+
|
89
|
+
.ke { color: #808; }
|
90
|
+
|
91
|
+
.rx { background-color:#221133; }
|
92
|
+
.rx .k { color:#f8f; }
|
93
|
+
.rx .dl { color:#f0f; }
|
94
|
+
.rx .mod { color:#f0b; }
|
95
|
+
.rx .fu { color:#404; font-weight: bold; }
|
96
|
+
|
97
|
+
.s { background-color:#331122; }
|
98
|
+
.s .s { background-color:#ffe0e0; }
|
99
|
+
.s .s .s { background-color:#ffd0d0; }
|
100
|
+
.s .k { color:#F88; }
|
101
|
+
.s .dl { color:#f55; }
|
102
|
+
|
103
|
+
.sh { background-color:#f0fff0; }
|
104
|
+
.sh .k { color:#2B2; }
|
105
|
+
.sh .dl { color:#161; }
|
106
|
+
|
107
|
+
.sy { color:#Fc8; }
|
108
|
+
.sy .k { color:#Fc8; }
|
109
|
+
.sy .dl { color:#F84; }
|
110
|
+
|
111
|
+
.ta { color:#070; }
|
112
|
+
.tf { color:#070; font-weight:bold; }
|
113
|
+
.ts { color:#D70; font-weight:bold; }
|
114
|
+
.ty { color:#339; font-weight:bold; }
|
115
|
+
.v { color:#036; }
|
116
|
+
.xt { color:#444; }
|
117
|
+
|
118
|
+
.ins { background: #afa; }
|
119
|
+
.del { background: #faa; }
|
120
|
+
.chg { color: #aaf; background: #007; }
|
121
|
+
.head { color: #f8f; background: #505 }
|
122
|
+
|
123
|
+
.ins .ins { color: #080; font-weight:bold }
|
124
|
+
.del .del { color: #800; font-weight:bold }
|
125
|
+
.chg .chg { color: #66f; }
|
126
|
+
.head .head { color: #f4f; }
|
127
|
+
TOKENS
|
128
|
+
|
129
|
+
end
|
130
|
+
|
131
|
+
end
|
132
|
+
end
|
@@ -0,0 +1,82 @@
|
|
1
|
+
module CodeRay
|
2
|
+
class Tokens
|
3
|
+
ClassOfKind = Hash.new do |h, k|
|
4
|
+
h[k] = k.to_s
|
5
|
+
end
|
6
|
+
ClassOfKind.update with = {
|
7
|
+
:annotation => 'at',
|
8
|
+
:attribute_name => 'an',
|
9
|
+
:attribute_name_fat => 'af',
|
10
|
+
:attribute_value => 'av',
|
11
|
+
:attribute_value_fat => 'aw',
|
12
|
+
:bin => 'bi',
|
13
|
+
:char => 'ch',
|
14
|
+
:class => 'cl',
|
15
|
+
:class_variable => 'cv',
|
16
|
+
:color => 'cr',
|
17
|
+
:comment => 'c',
|
18
|
+
:constant => 'co',
|
19
|
+
:content => 'k',
|
20
|
+
:definition => 'df',
|
21
|
+
:delimiter => 'dl',
|
22
|
+
:directive => 'di',
|
23
|
+
:doc => 'do',
|
24
|
+
:doc_string => 'ds',
|
25
|
+
:entity => 'en',
|
26
|
+
:error => 'er',
|
27
|
+
:escape => 'e',
|
28
|
+
:exception => 'ex',
|
29
|
+
:float => 'fl',
|
30
|
+
:function => 'fu',
|
31
|
+
:global_variable => 'gv',
|
32
|
+
:hex => 'hx',
|
33
|
+
:important => 'im',
|
34
|
+
:include => 'ic',
|
35
|
+
:inline => 'il',
|
36
|
+
:inline_delimiter => 'idl',
|
37
|
+
:instance_variable => 'iv',
|
38
|
+
:integer => 'i',
|
39
|
+
:interpreted => 'in',
|
40
|
+
:keyword => 'kw',
|
41
|
+
:key => 'ke',
|
42
|
+
:label => 'la',
|
43
|
+
:local_variable => 'lv',
|
44
|
+
:modifier => 'mod',
|
45
|
+
:oct => 'oc',
|
46
|
+
:operator_fat => 'of',
|
47
|
+
:pre_constant => 'pc',
|
48
|
+
:pre_type => 'pt',
|
49
|
+
:predefined => 'pd',
|
50
|
+
:preprocessor => 'pp',
|
51
|
+
:pseudo_class => 'ps',
|
52
|
+
:regexp => 'rx',
|
53
|
+
:reserved => 'r',
|
54
|
+
:shell => 'sh',
|
55
|
+
:string => 's',
|
56
|
+
:symbol => 'sy',
|
57
|
+
:tag => 'ta',
|
58
|
+
:tag_fat => 'tf',
|
59
|
+
:tag_special => 'ts',
|
60
|
+
:type => 'ty',
|
61
|
+
:variable => 'v',
|
62
|
+
:value => 'vl',
|
63
|
+
:xml_text => 'xt',
|
64
|
+
|
65
|
+
:insert => 'ins',
|
66
|
+
:delete => 'del',
|
67
|
+
:change => 'chg',
|
68
|
+
:head => 'head',
|
69
|
+
|
70
|
+
:ident => :NO_HIGHLIGHT, # 'id'
|
71
|
+
#:operator => 'op',
|
72
|
+
:operator => :NO_HIGHLIGHT, # 'op'
|
73
|
+
:space => :NO_HIGHLIGHT, # 'sp'
|
74
|
+
:plain => :NO_HIGHLIGHT,
|
75
|
+
}
|
76
|
+
ClassOfKind[:procedure] = ClassOfKind[:method] = ClassOfKind[:function]
|
77
|
+
ClassOfKind[:open] = ClassOfKind[:close] = ClassOfKind[:delimiter]
|
78
|
+
ClassOfKind[:nesting_delimiter] = ClassOfKind[:delimiter]
|
79
|
+
ClassOfKind[:escape] = ClassOfKind[:delimiter]
|
80
|
+
#ClassOfKind.default = ClassOfKind[:error] or raise 'no class found for :error!'
|
81
|
+
end
|
82
|
+
end
|
@@ -0,0 +1,387 @@
|
|
1
|
+
module CodeRay
|
2
|
+
|
3
|
+
# = Tokens
|
4
|
+
#
|
5
|
+
# The Tokens class represents a list of tokens returnd from
|
6
|
+
# a Scanner.
|
7
|
+
#
|
8
|
+
# A token is not a special object, just a two-element Array
|
9
|
+
# consisting of
|
10
|
+
# * the _token_ _kind_ (a Symbol representing the type of the token)
|
11
|
+
# * the _token_ _text_ (the original source of the token in a String)
|
12
|
+
#
|
13
|
+
# A token looks like this:
|
14
|
+
#
|
15
|
+
# [:comment, '# It looks like this']
|
16
|
+
# [:float, '3.1415926']
|
17
|
+
# [:error, '���']
|
18
|
+
#
|
19
|
+
# Some scanners also yield some kind of sub-tokens, represented by special
|
20
|
+
# token texts, namely :open and :close .
|
21
|
+
#
|
22
|
+
# The Ruby scanner, for example, splits "a string" into:
|
23
|
+
#
|
24
|
+
# [
|
25
|
+
# [:open, :string],
|
26
|
+
# [:delimiter, '"'],
|
27
|
+
# [:content, 'a string'],
|
28
|
+
# [:delimiter, '"'],
|
29
|
+
# [:close, :string]
|
30
|
+
# ]
|
31
|
+
#
|
32
|
+
# Tokens is also the interface between Scanners and Encoders:
|
33
|
+
# The input is split and saved into a Tokens object. The Encoder
|
34
|
+
# then builds the output from this object.
|
35
|
+
#
|
36
|
+
# Thus, the syntax below becomes clear:
|
37
|
+
#
|
38
|
+
# CodeRay.scan('price = 2.59', :ruby).html
|
39
|
+
# # the Tokens object is here -------^
|
40
|
+
#
|
41
|
+
# See how small it is? ;)
|
42
|
+
#
|
43
|
+
# Tokens gives you the power to handle pre-scanned code very easily:
|
44
|
+
# You can convert it to a webpage, a YAML file, or dump it into a gzip'ed string
|
45
|
+
# that you put in your DB.
|
46
|
+
#
|
47
|
+
# Tokens' subclass TokenStream allows streaming to save memory.
|
48
|
+
class Tokens < Array
|
49
|
+
|
50
|
+
class << self
|
51
|
+
|
52
|
+
# Convert the token to a string.
|
53
|
+
#
|
54
|
+
# This format is used by Encoders.Tokens.
|
55
|
+
# It can be reverted using read_token.
|
56
|
+
def write_token text, type
|
57
|
+
if text.is_a? String
|
58
|
+
"#{type}\t#{escape(text)}\n"
|
59
|
+
else
|
60
|
+
":#{text}\t#{type}\t\n"
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
# Read a token from the string.
|
65
|
+
#
|
66
|
+
# Inversion of write_token.
|
67
|
+
#
|
68
|
+
# TODO Test this!
|
69
|
+
def read_token token
|
70
|
+
type, text = token.split("\t", 2)
|
71
|
+
if type[0] == ?:
|
72
|
+
[text.to_sym, type[1..-1].to_sym]
|
73
|
+
else
|
74
|
+
[type.to_sym, unescape(text)]
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
# Escapes a string for use in write_token.
|
79
|
+
def escape text
|
80
|
+
text.gsub(/[\n\\]/, '\\\\\&')
|
81
|
+
end
|
82
|
+
|
83
|
+
# Unescapes a string created by escape.
|
84
|
+
def unescape text
|
85
|
+
text.gsub(/\\[\n\\]/) { |m| m[1,1] }
|
86
|
+
end
|
87
|
+
|
88
|
+
end
|
89
|
+
|
90
|
+
# Whether the object is a TokenStream.
|
91
|
+
#
|
92
|
+
# Returns false.
|
93
|
+
def stream?
|
94
|
+
false
|
95
|
+
end
|
96
|
+
|
97
|
+
# Iterates over all tokens.
|
98
|
+
#
|
99
|
+
# If a filter is given, only tokens of that kind are yielded.
|
100
|
+
def each kind_filter = nil, &block
|
101
|
+
unless kind_filter
|
102
|
+
super(&block)
|
103
|
+
else
|
104
|
+
super() do |text, kind|
|
105
|
+
next unless kind == kind_filter
|
106
|
+
yield text, kind
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
111
|
+
# Iterates over all text tokens.
|
112
|
+
# Range tokens like [:open, :string] are left out.
|
113
|
+
#
|
114
|
+
# Example:
|
115
|
+
# tokens.each_text_token { |text, kind| text.replace html_escape(text) }
|
116
|
+
def each_text_token
|
117
|
+
each do |text, kind|
|
118
|
+
next unless text.is_a? ::String
|
119
|
+
yield text, kind
|
120
|
+
end
|
121
|
+
end
|
122
|
+
|
123
|
+
# Encode the tokens using encoder.
|
124
|
+
#
|
125
|
+
# encoder can be
|
126
|
+
# * a symbol like :html oder :statistic
|
127
|
+
# * an Encoder class
|
128
|
+
# * an Encoder object
|
129
|
+
#
|
130
|
+
# options are passed to the encoder.
|
131
|
+
def encode encoder, options = {}
|
132
|
+
unless encoder.is_a? Encoders::Encoder
|
133
|
+
unless encoder.is_a? Class
|
134
|
+
encoder_class = Encoders[encoder]
|
135
|
+
end
|
136
|
+
encoder = encoder_class.new options
|
137
|
+
end
|
138
|
+
encoder.encode_tokens self, options
|
139
|
+
end
|
140
|
+
|
141
|
+
|
142
|
+
# Turn into a string using Encoders::Text.
|
143
|
+
#
|
144
|
+
# +options+ are passed to the encoder if given.
|
145
|
+
def to_s options = {}
|
146
|
+
encode :text, options
|
147
|
+
end
|
148
|
+
|
149
|
+
|
150
|
+
# Redirects unknown methods to encoder calls.
|
151
|
+
#
|
152
|
+
# For example, if you call +tokens.html+, the HTML encoder
|
153
|
+
# is used to highlight the tokens.
|
154
|
+
def method_missing meth, options = {}
|
155
|
+
Encoders[meth].new(options).encode_tokens self
|
156
|
+
end
|
157
|
+
|
158
|
+
# Returns the tokens compressed by joining consecutive
|
159
|
+
# tokens of the same kind.
|
160
|
+
#
|
161
|
+
# This can not be undone, but should yield the same output
|
162
|
+
# in most Encoders. It basically makes the output smaller.
|
163
|
+
#
|
164
|
+
# Combined with dump, it saves space for the cost of time.
|
165
|
+
#
|
166
|
+
# If the scanner is written carefully, this is not required -
|
167
|
+
# for example, consecutive //-comment lines could already be
|
168
|
+
# joined in one comment token by the Scanner.
|
169
|
+
def optimize
|
170
|
+
print ' Tokens#optimize: before: %d - ' % size if $DEBUG
|
171
|
+
last_kind = last_text = nil
|
172
|
+
new = self.class.new
|
173
|
+
for text, kind in self
|
174
|
+
if text.is_a? String
|
175
|
+
if kind == last_kind
|
176
|
+
last_text << text
|
177
|
+
else
|
178
|
+
new << [last_text, last_kind] if last_kind
|
179
|
+
last_text = text
|
180
|
+
last_kind = kind
|
181
|
+
end
|
182
|
+
else
|
183
|
+
new << [last_text, last_kind] if last_kind
|
184
|
+
last_kind = last_text = nil
|
185
|
+
new << [text, kind]
|
186
|
+
end
|
187
|
+
end
|
188
|
+
new << [last_text, last_kind] if last_kind
|
189
|
+
print 'after: %d (%d saved = %2.0f%%)' %
|
190
|
+
[new.size, size - new.size, 1.0 - (new.size.to_f / size)] if $DEBUG
|
191
|
+
new
|
192
|
+
end
|
193
|
+
|
194
|
+
# Compact the object itself; see optimize.
|
195
|
+
def optimize!
|
196
|
+
replace optimize
|
197
|
+
end
|
198
|
+
|
199
|
+
# Ensure that all :open tokens have a correspondent :close one.
|
200
|
+
#
|
201
|
+
# TODO: Test this!
|
202
|
+
def fix
|
203
|
+
tokens = self.class.new
|
204
|
+
# Check token nesting using a stack of kinds.
|
205
|
+
opened = []
|
206
|
+
for type, kind in self
|
207
|
+
case type
|
208
|
+
when :open
|
209
|
+
opened.push [:close, kind]
|
210
|
+
when :begin_line
|
211
|
+
opened.push [:end_line, kind]
|
212
|
+
when :close, :end_line
|
213
|
+
expected = opened.pop
|
214
|
+
if [type, kind] != expected
|
215
|
+
# Unexpected :close; decide what to do based on the kind:
|
216
|
+
# - token was never opened: delete the :close (just skip it)
|
217
|
+
next unless opened.rindex expected
|
218
|
+
# - token was opened earlier: also close tokens in between
|
219
|
+
tokens << token until (token = opened.pop) == expected
|
220
|
+
end
|
221
|
+
end
|
222
|
+
tokens << [type, kind]
|
223
|
+
end
|
224
|
+
# Close remaining opened tokens
|
225
|
+
tokens << token while token = opened.pop
|
226
|
+
tokens
|
227
|
+
end
|
228
|
+
|
229
|
+
def fix!
|
230
|
+
replace fix
|
231
|
+
end
|
232
|
+
|
233
|
+
# Makes sure that:
|
234
|
+
# - newlines are single tokens
|
235
|
+
# (which means all other token are single-line)
|
236
|
+
# - there are no open tokens at the end the line
|
237
|
+
#
|
238
|
+
# This makes it simple for encoders that work line-oriented,
|
239
|
+
# like HTML with list-style numeration.
|
240
|
+
def split_into_lines
|
241
|
+
raise NotImplementedError
|
242
|
+
end
|
243
|
+
|
244
|
+
def split_into_lines!
|
245
|
+
replace split_into_lines
|
246
|
+
end
|
247
|
+
|
248
|
+
# Dumps the object into a String that can be saved
|
249
|
+
# in files or databases.
|
250
|
+
#
|
251
|
+
# The dump is created with Marshal.dump;
|
252
|
+
# In addition, it is gzipped using GZip.gzip.
|
253
|
+
#
|
254
|
+
# The returned String object includes Undumping
|
255
|
+
# so it has an #undump method. See Tokens.load.
|
256
|
+
#
|
257
|
+
# You can configure the level of compression,
|
258
|
+
# but the default value 7 should be what you want
|
259
|
+
# in most cases as it is a good compromise between
|
260
|
+
# speed and compression rate.
|
261
|
+
#
|
262
|
+
# See GZip module.
|
263
|
+
def dump gzip_level = 7
|
264
|
+
require 'coderay/helpers/gzip_simple'
|
265
|
+
dump = Marshal.dump self
|
266
|
+
dump = dump.gzip gzip_level
|
267
|
+
dump.extend Undumping
|
268
|
+
end
|
269
|
+
|
270
|
+
# The total size of the tokens.
|
271
|
+
# Should be equal to the input size before
|
272
|
+
# scanning.
|
273
|
+
def text_size
|
274
|
+
size = 0
|
275
|
+
each_text_token do |t, k|
|
276
|
+
size + t.size
|
277
|
+
end
|
278
|
+
size
|
279
|
+
end
|
280
|
+
|
281
|
+
# The total size of the tokens.
|
282
|
+
# Should be equal to the input size before
|
283
|
+
# scanning.
|
284
|
+
def text
|
285
|
+
map { |t, k| t if t.is_a? ::String }.join
|
286
|
+
end
|
287
|
+
|
288
|
+
# Include this module to give an object an #undump
|
289
|
+
# method.
|
290
|
+
#
|
291
|
+
# The string returned by Tokens.dump includes Undumping.
|
292
|
+
module Undumping
|
293
|
+
# Calls Tokens.load with itself.
|
294
|
+
def undump
|
295
|
+
Tokens.load self
|
296
|
+
end
|
297
|
+
end
|
298
|
+
|
299
|
+
# Undump the object using Marshal.load, then
|
300
|
+
# unzip it using GZip.gunzip.
|
301
|
+
#
|
302
|
+
# The result is commonly a Tokens object, but
|
303
|
+
# this is not guaranteed.
|
304
|
+
def Tokens.load dump
|
305
|
+
require 'coderay/helpers/gzip_simple'
|
306
|
+
dump = dump.gunzip
|
307
|
+
@dump = Marshal.load dump
|
308
|
+
end
|
309
|
+
|
310
|
+
end
|
311
|
+
|
312
|
+
|
313
|
+
# = TokenStream
|
314
|
+
#
|
315
|
+
# The TokenStream class is a fake Array without elements.
|
316
|
+
#
|
317
|
+
# It redirects the method << to a block given at creation.
|
318
|
+
#
|
319
|
+
# This allows scanners and Encoders to use streaming (no
|
320
|
+
# tokens are saved, the input is highlighted the same time it
|
321
|
+
# is scanned) with the same code.
|
322
|
+
#
|
323
|
+
# See CodeRay.encode_stream and CodeRay.scan_stream
|
324
|
+
class TokenStream < Tokens
|
325
|
+
|
326
|
+
# Whether the object is a TokenStream.
|
327
|
+
#
|
328
|
+
# Returns true.
|
329
|
+
def stream?
|
330
|
+
true
|
331
|
+
end
|
332
|
+
|
333
|
+
# The Array is empty, but size counts the tokens given by <<.
|
334
|
+
attr_reader :size
|
335
|
+
|
336
|
+
# Creates a new TokenStream that calls +block+ whenever
|
337
|
+
# its << method is called.
|
338
|
+
#
|
339
|
+
# Example:
|
340
|
+
#
|
341
|
+
# require 'coderay'
|
342
|
+
#
|
343
|
+
# token_stream = CodeRay::TokenStream.new do |kind, text|
|
344
|
+
# puts 'kind: %s, text size: %d.' % [kind, text.size]
|
345
|
+
# end
|
346
|
+
#
|
347
|
+
# token_stream << [:regexp, '/\d+/']
|
348
|
+
# #-> kind: rexpexp, text size: 5.
|
349
|
+
#
|
350
|
+
def initialize &block
|
351
|
+
raise ArgumentError, 'Block expected for streaming.' unless block
|
352
|
+
@callback = block
|
353
|
+
@size = 0
|
354
|
+
end
|
355
|
+
|
356
|
+
# Calls +block+ with +token+ and increments size.
|
357
|
+
#
|
358
|
+
# Returns self.
|
359
|
+
def << token
|
360
|
+
@callback.call(*token)
|
361
|
+
@size += 1
|
362
|
+
self
|
363
|
+
end
|
364
|
+
|
365
|
+
# This method is not implemented due to speed reasons. Use Tokens.
|
366
|
+
def text_size
|
367
|
+
raise NotImplementedError,
|
368
|
+
'This method is not implemented due to speed reasons.'
|
369
|
+
end
|
370
|
+
|
371
|
+
# A TokenStream cannot be dumped. Use Tokens.
|
372
|
+
def dump
|
373
|
+
raise NotImplementedError, 'A TokenStream cannot be dumped.'
|
374
|
+
end
|
375
|
+
|
376
|
+
# A TokenStream cannot be optimized. Use Tokens.
|
377
|
+
def optimize
|
378
|
+
raise NotImplementedError, 'A TokenStream cannot be optimized.'
|
379
|
+
end
|
380
|
+
|
381
|
+
end
|
382
|
+
|
383
|
+
|
384
|
+
# Token name abbreviations
|
385
|
+
require 'coderay/token_classes'
|
386
|
+
|
387
|
+
end
|