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,476 @@
|
|
1
|
+
require 'helper'
|
2
|
+
require 'lib/activerecord_test_case'
|
3
|
+
|
4
|
+
require 'will_paginate'
|
5
|
+
WillPaginate.enable_activerecord
|
6
|
+
WillPaginate.enable_named_scope
|
7
|
+
|
8
|
+
class FinderTest < ActiveRecordTestCase
|
9
|
+
fixtures :topics, :replies, :users, :projects, :developers_projects
|
10
|
+
|
11
|
+
def test_new_methods_presence
|
12
|
+
assert_respond_to_all Topic, %w(per_page paginate paginate_by_sql)
|
13
|
+
end
|
14
|
+
|
15
|
+
def test_simple_paginate
|
16
|
+
assert_queries(1) do
|
17
|
+
entries = Topic.paginate :page => nil
|
18
|
+
assert_equal 1, entries.current_page
|
19
|
+
assert_equal 1, entries.total_pages
|
20
|
+
assert_equal 4, entries.size
|
21
|
+
end
|
22
|
+
|
23
|
+
assert_queries(2) do
|
24
|
+
entries = Topic.paginate :page => 2
|
25
|
+
assert_equal 1, entries.total_pages
|
26
|
+
assert entries.empty?
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
def test_parameter_api
|
31
|
+
# :page parameter in options is required!
|
32
|
+
assert_raise(ArgumentError){ Topic.paginate }
|
33
|
+
assert_raise(ArgumentError){ Topic.paginate({}) }
|
34
|
+
|
35
|
+
# explicit :all should not break anything
|
36
|
+
assert_equal Topic.paginate(:page => nil), Topic.paginate(:all, :page => 1)
|
37
|
+
|
38
|
+
# :count could be nil and we should still not cry
|
39
|
+
assert_nothing_raised { Topic.paginate :page => 1, :count => nil }
|
40
|
+
end
|
41
|
+
|
42
|
+
def test_paginate_with_per_page
|
43
|
+
entries = Topic.paginate :page => 1, :per_page => 1
|
44
|
+
assert_equal 1, entries.size
|
45
|
+
assert_equal 4, entries.total_pages
|
46
|
+
|
47
|
+
# Developer class has explicit per_page at 10
|
48
|
+
entries = Developer.paginate :page => 1
|
49
|
+
assert_equal 10, entries.size
|
50
|
+
assert_equal 2, entries.total_pages
|
51
|
+
|
52
|
+
entries = Developer.paginate :page => 1, :per_page => 5
|
53
|
+
assert_equal 11, entries.total_entries
|
54
|
+
assert_equal 5, entries.size
|
55
|
+
assert_equal 3, entries.total_pages
|
56
|
+
end
|
57
|
+
|
58
|
+
def test_paginate_with_order
|
59
|
+
entries = Topic.paginate :page => 1, :order => 'created_at desc'
|
60
|
+
expected = [topics(:futurama), topics(:harvey_birdman), topics(:rails), topics(:ar)].reverse
|
61
|
+
assert_equal expected, entries.to_a
|
62
|
+
assert_equal 1, entries.total_pages
|
63
|
+
end
|
64
|
+
|
65
|
+
def test_paginate_with_conditions
|
66
|
+
entries = Topic.paginate :page => 1, :conditions => ["created_at > ?", 30.minutes.ago]
|
67
|
+
expected = [topics(:rails), topics(:ar)]
|
68
|
+
assert_equal expected, entries.to_a
|
69
|
+
assert_equal 1, entries.total_pages
|
70
|
+
end
|
71
|
+
|
72
|
+
def test_paginate_with_include_and_conditions
|
73
|
+
entries = Topic.paginate \
|
74
|
+
:page => 1,
|
75
|
+
:include => :replies,
|
76
|
+
:conditions => "replies.content LIKE 'Bird%' ",
|
77
|
+
:per_page => 10
|
78
|
+
|
79
|
+
expected = Topic.find :all,
|
80
|
+
:include => 'replies',
|
81
|
+
:conditions => "replies.content LIKE 'Bird%' ",
|
82
|
+
:limit => 10
|
83
|
+
|
84
|
+
assert_equal expected, entries.to_a
|
85
|
+
assert_equal 1, entries.total_entries
|
86
|
+
end
|
87
|
+
|
88
|
+
def test_paginate_with_include_and_order
|
89
|
+
entries = nil
|
90
|
+
assert_queries(2) do
|
91
|
+
entries = Topic.paginate \
|
92
|
+
:page => 1,
|
93
|
+
:include => :replies,
|
94
|
+
:order => 'replies.created_at asc, topics.created_at asc',
|
95
|
+
:per_page => 10
|
96
|
+
end
|
97
|
+
|
98
|
+
expected = Topic.find :all,
|
99
|
+
:include => 'replies',
|
100
|
+
:order => 'replies.created_at asc, topics.created_at asc',
|
101
|
+
:limit => 10
|
102
|
+
|
103
|
+
assert_equal expected, entries.to_a
|
104
|
+
assert_equal 4, entries.total_entries
|
105
|
+
end
|
106
|
+
|
107
|
+
def test_paginate_associations_with_include
|
108
|
+
entries, project = nil, projects(:active_record)
|
109
|
+
|
110
|
+
assert_nothing_raised "THIS IS A BUG in Rails 1.2.3 that was fixed in [7326]. " +
|
111
|
+
"Please upgrade to a newer version of Rails." do
|
112
|
+
entries = project.topics.paginate \
|
113
|
+
:page => 1,
|
114
|
+
:include => :replies,
|
115
|
+
:conditions => "replies.content LIKE 'Nice%' ",
|
116
|
+
:per_page => 10
|
117
|
+
end
|
118
|
+
|
119
|
+
expected = Topic.find :all,
|
120
|
+
:include => 'replies',
|
121
|
+
:conditions => "project_id = #{project.id} AND replies.content LIKE 'Nice%' ",
|
122
|
+
:limit => 10
|
123
|
+
|
124
|
+
assert_equal expected, entries.to_a
|
125
|
+
end
|
126
|
+
|
127
|
+
def test_paginate_associations
|
128
|
+
dhh = users :david
|
129
|
+
expected_name_ordered = [projects(:action_controller), projects(:active_record)]
|
130
|
+
expected_id_ordered = [projects(:active_record), projects(:action_controller)]
|
131
|
+
|
132
|
+
assert_queries(2) do
|
133
|
+
# with association-specified order
|
134
|
+
entries = dhh.projects.paginate(:page => 1)
|
135
|
+
assert_equal expected_name_ordered, entries
|
136
|
+
assert_equal 2, entries.total_entries
|
137
|
+
end
|
138
|
+
|
139
|
+
# with explicit order
|
140
|
+
entries = dhh.projects.paginate(:page => 1, :order => 'projects.id')
|
141
|
+
assert_equal expected_id_ordered, entries
|
142
|
+
assert_equal 2, entries.total_entries
|
143
|
+
|
144
|
+
assert_nothing_raised { dhh.projects.find(:all, :order => 'projects.id', :limit => 4) }
|
145
|
+
entries = dhh.projects.paginate(:page => 1, :order => 'projects.id', :per_page => 4)
|
146
|
+
assert_equal expected_id_ordered, entries
|
147
|
+
|
148
|
+
# has_many with implicit order
|
149
|
+
topic = Topic.find(1)
|
150
|
+
expected = [replies(:spam), replies(:witty_retort)]
|
151
|
+
assert_equal expected.map(&:id).sort, topic.replies.paginate(:page => 1).map(&:id).sort
|
152
|
+
assert_equal expected.reverse, topic.replies.paginate(:page => 1, :order => 'replies.id ASC')
|
153
|
+
end
|
154
|
+
|
155
|
+
def test_paginate_association_extension
|
156
|
+
project = Project.find(:first)
|
157
|
+
|
158
|
+
assert_queries(2) do
|
159
|
+
entries = project.replies.paginate_recent :page => 1
|
160
|
+
assert_equal [replies(:brave)], entries
|
161
|
+
end
|
162
|
+
end
|
163
|
+
|
164
|
+
def test_paginate_with_joins
|
165
|
+
entries = nil
|
166
|
+
|
167
|
+
assert_queries(1) do
|
168
|
+
entries = Developer.paginate :page => 1,
|
169
|
+
:joins => 'LEFT JOIN developers_projects ON users.id = developers_projects.developer_id',
|
170
|
+
:conditions => 'project_id = 1'
|
171
|
+
assert_equal 2, entries.size
|
172
|
+
developer_names = entries.map &:name
|
173
|
+
assert developer_names.include?('David')
|
174
|
+
assert developer_names.include?('Jamis')
|
175
|
+
end
|
176
|
+
|
177
|
+
assert_queries(1) do
|
178
|
+
expected = entries.to_a
|
179
|
+
entries = Developer.paginate :page => 1,
|
180
|
+
:joins => 'LEFT JOIN developers_projects ON users.id = developers_projects.developer_id',
|
181
|
+
:conditions => 'project_id = 1', :count => { :select => "users.id" }
|
182
|
+
assert_equal expected, entries.to_a
|
183
|
+
assert_equal 2, entries.total_entries
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
187
|
+
def test_paginate_with_group
|
188
|
+
entries = nil
|
189
|
+
assert_queries(1) do
|
190
|
+
entries = Developer.paginate :page => 1, :per_page => 10,
|
191
|
+
:group => 'salary', :select => 'salary', :order => 'salary'
|
192
|
+
end
|
193
|
+
|
194
|
+
expected = [ users(:david), users(:jamis), users(:dev_10), users(:poor_jamis) ].map(&:salary).sort
|
195
|
+
assert_equal expected, entries.map(&:salary)
|
196
|
+
end
|
197
|
+
|
198
|
+
def test_paginate_with_dynamic_finder
|
199
|
+
expected = [replies(:witty_retort), replies(:spam)]
|
200
|
+
assert_equal expected, Reply.paginate_by_topic_id(1, :page => 1)
|
201
|
+
|
202
|
+
entries = Developer.paginate :conditions => { :salary => 100000 }, :page => 1, :per_page => 5
|
203
|
+
assert_equal 8, entries.total_entries
|
204
|
+
assert_equal entries, Developer.paginate_by_salary(100000, :page => 1, :per_page => 5)
|
205
|
+
|
206
|
+
# dynamic finder + conditions
|
207
|
+
entries = Developer.paginate_by_salary(100000, :page => 1,
|
208
|
+
:conditions => ['id > ?', 6])
|
209
|
+
assert_equal 4, entries.total_entries
|
210
|
+
assert_equal (7..10).to_a, entries.map(&:id)
|
211
|
+
|
212
|
+
assert_raises NoMethodError do
|
213
|
+
Developer.paginate_by_inexistent_attribute 100000, :page => 1
|
214
|
+
end
|
215
|
+
end
|
216
|
+
|
217
|
+
def test_scoped_paginate
|
218
|
+
entries = Developer.with_poor_ones { Developer.paginate :page => 1 }
|
219
|
+
|
220
|
+
assert_equal 2, entries.size
|
221
|
+
assert_equal 2, entries.total_entries
|
222
|
+
end
|
223
|
+
|
224
|
+
## named_scope ##
|
225
|
+
|
226
|
+
def test_paginate_in_named_scope
|
227
|
+
entries = Developer.poor.paginate :page => 1, :per_page => 1
|
228
|
+
|
229
|
+
assert_equal 1, entries.size
|
230
|
+
assert_equal 2, entries.total_entries
|
231
|
+
end
|
232
|
+
|
233
|
+
def test_paginate_in_named_scope_on_habtm_association
|
234
|
+
project = projects(:active_record)
|
235
|
+
assert_queries(2) do
|
236
|
+
entries = project.developers.poor.paginate :page => 1, :per_page => 1
|
237
|
+
|
238
|
+
assert_equal 1, entries.size, 'one developer should be found'
|
239
|
+
assert_equal 1, entries.total_entries, 'only one developer should be found'
|
240
|
+
end
|
241
|
+
end
|
242
|
+
|
243
|
+
def test_paginate_in_named_scope_on_hmt_association
|
244
|
+
project = projects(:active_record)
|
245
|
+
expected = [replies(:brave)]
|
246
|
+
|
247
|
+
assert_queries(2) do
|
248
|
+
entries = project.replies.recent.paginate :page => 1, :per_page => 1
|
249
|
+
assert_equal expected, entries
|
250
|
+
assert_equal 1, entries.total_entries, 'only one reply should be found'
|
251
|
+
end
|
252
|
+
end
|
253
|
+
|
254
|
+
def test_paginate_in_named_scope_on_has_many_association
|
255
|
+
project = projects(:active_record)
|
256
|
+
expected = [topics(:ar)]
|
257
|
+
|
258
|
+
assert_queries(2) do
|
259
|
+
entries = project.topics.mentions_activerecord.paginate :page => 1, :per_page => 1
|
260
|
+
assert_equal expected, entries
|
261
|
+
assert_equal 1, entries.total_entries, 'only one topic should be found'
|
262
|
+
end
|
263
|
+
end
|
264
|
+
|
265
|
+
def test_named_scope_with_include
|
266
|
+
project = projects(:active_record)
|
267
|
+
entries = project.topics.with_replies_starting_with('AR ').paginate(:page => 1, :per_page => 1)
|
268
|
+
assert_equal 1, entries.size
|
269
|
+
end
|
270
|
+
|
271
|
+
## misc ##
|
272
|
+
|
273
|
+
def test_count_and_total_entries_options_are_mutually_exclusive
|
274
|
+
e = assert_raise ArgumentError do
|
275
|
+
Developer.paginate :page => 1, :count => {}, :total_entries => 1
|
276
|
+
end
|
277
|
+
assert_match /exclusive/, e.to_s
|
278
|
+
end
|
279
|
+
|
280
|
+
def test_readonly
|
281
|
+
assert_nothing_raised { Developer.paginate :readonly => true, :page => 1 }
|
282
|
+
end
|
283
|
+
|
284
|
+
# this functionality is temporarily removed
|
285
|
+
def xtest_pagination_defines_method
|
286
|
+
pager = "paginate_by_created_at"
|
287
|
+
assert !User.methods.include?(pager), "User methods should not include `#{pager}` method"
|
288
|
+
# paginate!
|
289
|
+
assert 0, User.send(pager, nil, :page => 1).total_entries
|
290
|
+
# the paging finder should now be defined
|
291
|
+
assert User.methods.include?(pager), "`#{pager}` method should be defined on User"
|
292
|
+
end
|
293
|
+
|
294
|
+
# Is this Rails 2.0? Find out by testing find_all which was removed in [6998]
|
295
|
+
unless ActiveRecord::Base.respond_to? :find_all
|
296
|
+
def test_paginate_array_of_ids
|
297
|
+
# AR finders also accept arrays of IDs
|
298
|
+
# (this was broken in Rails before [6912])
|
299
|
+
assert_queries(1) do
|
300
|
+
entries = Developer.paginate((1..8).to_a, :per_page => 3, :page => 2, :order => 'id')
|
301
|
+
assert_equal (4..6).to_a, entries.map(&:id)
|
302
|
+
assert_equal 8, entries.total_entries
|
303
|
+
end
|
304
|
+
end
|
305
|
+
end
|
306
|
+
|
307
|
+
uses_mocha 'internals' do
|
308
|
+
def test_implicit_all_with_dynamic_finders
|
309
|
+
Topic.expects(:find_all_by_foo).returns([])
|
310
|
+
Topic.expects(:count).returns(0)
|
311
|
+
Topic.paginate_by_foo :page => 2
|
312
|
+
end
|
313
|
+
|
314
|
+
def test_guessing_the_total_count
|
315
|
+
Topic.expects(:find).returns(Array.new(2))
|
316
|
+
Topic.expects(:count).never
|
317
|
+
|
318
|
+
entries = Topic.paginate :page => 2, :per_page => 4
|
319
|
+
assert_equal 6, entries.total_entries
|
320
|
+
end
|
321
|
+
|
322
|
+
def test_guessing_that_there_are_no_records
|
323
|
+
Topic.expects(:find).returns([])
|
324
|
+
Topic.expects(:count).never
|
325
|
+
|
326
|
+
entries = Topic.paginate :page => 1, :per_page => 4
|
327
|
+
assert_equal 0, entries.total_entries
|
328
|
+
end
|
329
|
+
|
330
|
+
def test_extra_parameters_stay_untouched
|
331
|
+
Topic.expects(:find).with(:all, {:foo => 'bar', :limit => 4, :offset => 0 }).returns(Array.new(5))
|
332
|
+
Topic.expects(:count).with({:foo => 'bar'}).returns(1)
|
333
|
+
|
334
|
+
Topic.paginate :foo => 'bar', :page => 1, :per_page => 4
|
335
|
+
end
|
336
|
+
|
337
|
+
def test_count_skips_select
|
338
|
+
Developer.stubs(:find).returns([])
|
339
|
+
Developer.expects(:count).with({}).returns(0)
|
340
|
+
Developer.paginate :select => 'salary', :page => 2
|
341
|
+
end
|
342
|
+
|
343
|
+
def test_count_select_when_distinct
|
344
|
+
Developer.stubs(:find).returns([])
|
345
|
+
Developer.expects(:count).with(:select => 'DISTINCT salary').returns(0)
|
346
|
+
Developer.paginate :select => 'DISTINCT salary', :page => 2
|
347
|
+
end
|
348
|
+
|
349
|
+
def test_count_with_scoped_select_when_distinct
|
350
|
+
Developer.stubs(:find).returns([])
|
351
|
+
Developer.expects(:count).with(:select => 'DISTINCT users.id').returns(0)
|
352
|
+
Developer.distinct.paginate :page => 2
|
353
|
+
end
|
354
|
+
|
355
|
+
def test_should_use_scoped_finders_if_present
|
356
|
+
# scope-out compatibility
|
357
|
+
Topic.expects(:find_best).returns(Array.new(5))
|
358
|
+
Topic.expects(:with_best).returns(1)
|
359
|
+
|
360
|
+
Topic.paginate_best :page => 1, :per_page => 4
|
361
|
+
end
|
362
|
+
|
363
|
+
def test_paginate_by_sql
|
364
|
+
assert_respond_to Developer, :paginate_by_sql
|
365
|
+
Developer.expects(:find_by_sql).with(regexp_matches(/sql LIMIT 3(,| OFFSET) 3/)).returns([])
|
366
|
+
Developer.expects(:count_by_sql).with('SELECT COUNT(*) FROM (sql) AS count_table').returns(0)
|
367
|
+
|
368
|
+
entries = Developer.paginate_by_sql 'sql', :page => 2, :per_page => 3
|
369
|
+
end
|
370
|
+
|
371
|
+
def test_paginate_by_sql_respects_total_entries_setting
|
372
|
+
Developer.expects(:find_by_sql).returns([])
|
373
|
+
Developer.expects(:count_by_sql).never
|
374
|
+
|
375
|
+
entries = Developer.paginate_by_sql 'sql', :page => 1, :total_entries => 999
|
376
|
+
assert_equal 999, entries.total_entries
|
377
|
+
end
|
378
|
+
|
379
|
+
def test_paginate_by_sql_strips_order_by_when_counting
|
380
|
+
Developer.expects(:find_by_sql).returns([])
|
381
|
+
Developer.expects(:count_by_sql).with("SELECT COUNT(*) FROM (sql\n ) AS count_table").returns(0)
|
382
|
+
|
383
|
+
Developer.paginate_by_sql "sql\n ORDER\nby foo, bar, `baz` ASC", :page => 2
|
384
|
+
end
|
385
|
+
|
386
|
+
# TODO: counts are still wrong
|
387
|
+
def test_ability_to_use_with_custom_finders
|
388
|
+
# acts_as_taggable defines find_tagged_with(tag, options)
|
389
|
+
Topic.expects(:find_tagged_with).with('will_paginate', :offset => 5, :limit => 5).returns([])
|
390
|
+
Topic.expects(:count).with({}).returns(0)
|
391
|
+
|
392
|
+
Topic.paginate_tagged_with 'will_paginate', :page => 2, :per_page => 5
|
393
|
+
end
|
394
|
+
|
395
|
+
def test_array_argument_doesnt_eliminate_count
|
396
|
+
ids = (1..8).to_a
|
397
|
+
Developer.expects(:find_all_by_id).returns([])
|
398
|
+
Developer.expects(:count).returns(0)
|
399
|
+
|
400
|
+
Developer.paginate_by_id(ids, :per_page => 3, :page => 2, :order => 'id')
|
401
|
+
end
|
402
|
+
|
403
|
+
def test_paginating_finder_doesnt_mangle_options
|
404
|
+
Developer.expects(:find).returns([])
|
405
|
+
options = { :page => 1, :per_page => 2, :foo => 'bar' }
|
406
|
+
options_before = options.dup
|
407
|
+
|
408
|
+
Developer.paginate(options)
|
409
|
+
assert_equal options_before, options
|
410
|
+
end
|
411
|
+
|
412
|
+
def test_paginate_by_sql_doesnt_change_original_query
|
413
|
+
query = 'SQL QUERY'
|
414
|
+
original_query = query.dup
|
415
|
+
Developer.expects(:find_by_sql).returns([])
|
416
|
+
|
417
|
+
Developer.paginate_by_sql query, :page => 1
|
418
|
+
assert_equal original_query, query
|
419
|
+
end
|
420
|
+
|
421
|
+
def test_paginated_each
|
422
|
+
collection = stub('collection', :size => 5, :empty? => false, :per_page => 5)
|
423
|
+
collection.expects(:each).times(2).returns(collection)
|
424
|
+
last_collection = stub('collection', :size => 4, :empty? => false, :per_page => 5)
|
425
|
+
last_collection.expects(:each).returns(last_collection)
|
426
|
+
|
427
|
+
params = { :order => 'id', :total_entries => 0 }
|
428
|
+
|
429
|
+
Developer.expects(:paginate).with(params.merge(:page => 2)).returns(collection)
|
430
|
+
Developer.expects(:paginate).with(params.merge(:page => 3)).returns(collection)
|
431
|
+
Developer.expects(:paginate).with(params.merge(:page => 4)).returns(last_collection)
|
432
|
+
|
433
|
+
assert_equal 14, Developer.paginated_each(:page => '2') { }
|
434
|
+
end
|
435
|
+
|
436
|
+
def test_paginated_each_with_named_scope
|
437
|
+
assert_equal 2, Developer.poor.paginated_each(:per_page => 1) {
|
438
|
+
assert_equal 11, Developer.count
|
439
|
+
}
|
440
|
+
end
|
441
|
+
|
442
|
+
# detect ActiveRecord 2.1
|
443
|
+
if ActiveRecord::Base.private_methods.include?('references_eager_loaded_tables?')
|
444
|
+
def test_removes_irrelevant_includes_in_count
|
445
|
+
Developer.expects(:find).returns([1])
|
446
|
+
Developer.expects(:count).with({}).returns(0)
|
447
|
+
|
448
|
+
Developer.paginate :page => 1, :per_page => 1, :include => :projects
|
449
|
+
end
|
450
|
+
|
451
|
+
def test_doesnt_remove_referenced_includes_in_count
|
452
|
+
Developer.expects(:find).returns([1])
|
453
|
+
Developer.expects(:count).with({ :include => :projects, :conditions => 'projects.id > 2' }).returns(0)
|
454
|
+
|
455
|
+
Developer.paginate :page => 1, :per_page => 1,
|
456
|
+
:include => :projects, :conditions => 'projects.id > 2'
|
457
|
+
end
|
458
|
+
end
|
459
|
+
|
460
|
+
def test_paginate_from
|
461
|
+
result = Developer.paginate(:from => 'users', :page => 1, :per_page => 1)
|
462
|
+
assert_equal 1, result.size
|
463
|
+
end
|
464
|
+
|
465
|
+
def test_hmt_with_include
|
466
|
+
# ticket #220
|
467
|
+
reply = projects(:active_record).replies.find(:first, :order => 'replies.id')
|
468
|
+
assert_equal replies(:decisive), reply
|
469
|
+
|
470
|
+
# ticket #223
|
471
|
+
Project.find(1, :include => :replies)
|
472
|
+
|
473
|
+
# I cannot reproduce any of the failures from those reports :(
|
474
|
+
end
|
475
|
+
end
|
476
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
class Developer < User
|
2
|
+
has_and_belongs_to_many :projects, :include => :topics, :order => 'projects.name'
|
3
|
+
|
4
|
+
def self.with_poor_ones(&block)
|
5
|
+
with_scope :find => { :conditions => ['salary <= ?', 80000], :order => 'salary' } do
|
6
|
+
yield
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
named_scope :distinct, :select => 'DISTINCT `users`.*'
|
11
|
+
named_scope :poor, :conditions => ['salary <= ?', 80000], :order => 'salary'
|
12
|
+
|
13
|
+
def self.per_page() 10 end
|
14
|
+
end
|
data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/developers_projects.yml
RENAMED
File without changes
|
@@ -0,0 +1,15 @@
|
|
1
|
+
class Project < ActiveRecord::Base
|
2
|
+
has_and_belongs_to_many :developers, :uniq => true
|
3
|
+
|
4
|
+
has_many :topics
|
5
|
+
# :finder_sql => 'SELECT * FROM topics WHERE (topics.project_id = #{id})',
|
6
|
+
# :counter_sql => 'SELECT COUNT(*) FROM topics WHERE (topics.project_id = #{id})'
|
7
|
+
|
8
|
+
has_many :replies, :through => :topics do
|
9
|
+
def find_recent(params = {})
|
10
|
+
with_scope :find => { :conditions => ['replies.created_at > ?', 15.minutes.ago] } do
|
11
|
+
find :all, params
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
witty_retort:
|
2
|
+
id: 1
|
3
|
+
topic_id: 1
|
4
|
+
content: Birdman is better!
|
5
|
+
created_at: <%= 6.hours.ago.to_s(:db) %>
|
6
|
+
|
7
|
+
another:
|
8
|
+
id: 2
|
9
|
+
topic_id: 2
|
10
|
+
content: Nuh uh!
|
11
|
+
created_at: <%= 1.hour.ago.to_s(:db) %>
|
12
|
+
|
13
|
+
spam:
|
14
|
+
id: 3
|
15
|
+
topic_id: 1
|
16
|
+
content: Nice site!
|
17
|
+
created_at: <%= 1.hour.ago.to_s(:db) %>
|
18
|
+
|
19
|
+
decisive:
|
20
|
+
id: 4
|
21
|
+
topic_id: 4
|
22
|
+
content: "I'm getting to the bottom of this"
|
23
|
+
created_at: <%= 30.minutes.ago.to_s(:db) %>
|
24
|
+
|
25
|
+
brave:
|
26
|
+
id: 5
|
27
|
+
topic_id: 4
|
28
|
+
content: "AR doesn't scare me a bit"
|
29
|
+
created_at: <%= 10.minutes.ago.to_s(:db) %>
|
@@ -0,0 +1,38 @@
|
|
1
|
+
ActiveRecord::Schema.define do
|
2
|
+
|
3
|
+
create_table "users", :force => true do |t|
|
4
|
+
t.column "name", :text
|
5
|
+
t.column "salary", :integer, :default => 70000
|
6
|
+
t.column "created_at", :datetime
|
7
|
+
t.column "updated_at", :datetime
|
8
|
+
t.column "type", :text
|
9
|
+
end
|
10
|
+
|
11
|
+
create_table "projects", :force => true do |t|
|
12
|
+
t.column "name", :text
|
13
|
+
end
|
14
|
+
|
15
|
+
create_table "developers_projects", :id => false, :force => true do |t|
|
16
|
+
t.column "developer_id", :integer, :null => false
|
17
|
+
t.column "project_id", :integer, :null => false
|
18
|
+
t.column "joined_on", :date
|
19
|
+
t.column "access_level", :integer, :default => 1
|
20
|
+
end
|
21
|
+
|
22
|
+
create_table "topics", :force => true do |t|
|
23
|
+
t.column "project_id", :integer
|
24
|
+
t.column "title", :string
|
25
|
+
t.column "subtitle", :string
|
26
|
+
t.column "content", :text
|
27
|
+
t.column "created_at", :datetime
|
28
|
+
t.column "updated_at", :datetime
|
29
|
+
end
|
30
|
+
|
31
|
+
create_table "replies", :force => true do |t|
|
32
|
+
t.column "content", :text
|
33
|
+
t.column "created_at", :datetime
|
34
|
+
t.column "updated_at", :datetime
|
35
|
+
t.column "topic_id", :integer
|
36
|
+
end
|
37
|
+
|
38
|
+
end
|
@@ -0,0 +1,10 @@
|
|
1
|
+
class Topic < ActiveRecord::Base
|
2
|
+
has_many :replies, :dependent => :destroy, :order => 'replies.created_at DESC'
|
3
|
+
belongs_to :project
|
4
|
+
|
5
|
+
named_scope :mentions_activerecord, :conditions => ['topics.title LIKE ?', '%ActiveRecord%']
|
6
|
+
|
7
|
+
named_scope :with_replies_starting_with, lambda { |text|
|
8
|
+
{ :conditions => "replies.content LIKE '#{text}%' ", :include => :replies }
|
9
|
+
}
|
10
|
+
end
|
@@ -10,13 +10,21 @@ harvey_birdman:
|
|
10
10
|
id: 2
|
11
11
|
title: Harvey Birdman is the king of all men
|
12
12
|
subtitle: yup
|
13
|
-
content:
|
13
|
+
content: He really is
|
14
14
|
created_at: <%= 2.hours.ago.to_s(:db) %>
|
15
15
|
updated_at:
|
16
16
|
|
17
17
|
rails:
|
18
18
|
id: 3
|
19
|
+
project_id: 1
|
19
20
|
title: Rails is nice
|
20
21
|
subtitle: It makes me happy
|
21
22
|
content: except when I have to hack internals to fix pagination. even then really.
|
22
23
|
created_at: <%= 20.minutes.ago.to_s(:db) %>
|
24
|
+
|
25
|
+
ar:
|
26
|
+
id: 4
|
27
|
+
project_id: 1
|
28
|
+
title: ActiveRecord sometimes freaks me out
|
29
|
+
content: "I mean, what's the deal with eager loading?"
|
30
|
+
created_at: <%= 15.minutes.ago.to_s(:db) %>
|
@@ -2,20 +2,34 @@ david:
|
|
2
2
|
id: 1
|
3
3
|
name: David
|
4
4
|
salary: 80000
|
5
|
+
type: Developer
|
5
6
|
|
6
7
|
jamis:
|
7
8
|
id: 2
|
8
9
|
name: Jamis
|
9
10
|
salary: 150000
|
11
|
+
type: Developer
|
10
12
|
|
11
13
|
<% for digit in 3..10 %>
|
12
14
|
dev_<%= digit %>:
|
13
15
|
id: <%= digit %>
|
14
16
|
name: fixture_<%= digit %>
|
15
17
|
salary: 100000
|
18
|
+
type: Developer
|
16
19
|
<% end %>
|
17
20
|
|
18
21
|
poor_jamis:
|
19
22
|
id: 11
|
20
23
|
name: Jamis
|
21
|
-
salary: 9000
|
24
|
+
salary: 9000
|
25
|
+
type: Developer
|
26
|
+
|
27
|
+
admin:
|
28
|
+
id: 12
|
29
|
+
name: admin
|
30
|
+
type: Admin
|
31
|
+
|
32
|
+
goofy:
|
33
|
+
id: 13
|
34
|
+
name: Goofy
|
35
|
+
type: Admin
|