refinerycms 0.9.6.19 → 0.9.6.21
Sign up to get free protection for your applications and to get access to all the features.
- data/.gems +0 -8
- data/.gitignore +3 -1
- data/Rakefile +1 -5
- data/VERSION +1 -1
- data/bin/refinery-update-core +11 -2
- data/config/application.rb +6 -1
- data/config/environments/development.rb +10 -6
- data/config/settings.rb +3 -0
- data/db/migrate/20100305023036_change_users_columns_for_authlogic.rb +46 -0
- data/db/migrate/20100305023037_remove_unused_users_columns.rb +16 -0
- data/db/migrate/20100312155331_make_user_perishable_token_nullable.rb +13 -0
- data/db/migrate/20100312160327_make_user_persistence_token_nullable.rb +13 -0
- data/db/migrate/20100315203301_remove_state_from_users.rb +9 -0
- data/db/schema.rb +8 -21
- data/db/seeds.rb +5 -19
- data/lib/refinery/tasks/refinery.rb +1 -1
- data/public/javascripts/admin.js +6 -2
- data/public/javascripts/jquery-ui-1.8.min.js +374 -0
- data/public/javascripts/jquery.js +606 -444
- data/public/javascripts/refinery/admin.js +30 -9
- data/public/javascripts/refinery/boot_wym.js +4 -0
- data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +3 -4
- data/public/stylesheets/refinery/refinery.css +11 -0
- data/public/stylesheets/wymeditor/skins/refinery/skin.css +3 -1
- data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css +5 -5
- data/readme.md +13 -10
- data/test/fixtures/users.yml +5 -5
- data/test/functional/dashboard_controller_test.rb +0 -4
- data/test/functional/images_controller_test.rb +0 -3
- data/test/test_helper.rb +7 -3
- data/themes/hemingway/views/layouts/application.html.erb +1 -12
- data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb +1 -3
- data/vendor/plugins/authentication/app/controllers/sessions_controller.rb +3 -14
- data/vendor/plugins/authentication/app/controllers/users_controller.rb +26 -37
- data/vendor/plugins/authentication/app/models/user.rb +29 -112
- data/vendor/plugins/authentication/app/models/user_mailer.rb +8 -5
- data/vendor/plugins/authentication/app/models/user_session.rb +9 -0
- data/vendor/plugins/authentication/app/views/admin/users/index.html.erb +1 -1
- data/vendor/plugins/authentication/app/views/sessions/new.html.erb +5 -4
- data/vendor/plugins/authentication/lib/authenticated_system.rb +40 -30
- data/vendor/plugins/authentication/rails/init.rb +9 -0
- data/vendor/plugins/authlogic/CHANGELOG.rdoc +345 -0
- data/vendor/plugins/authlogic/LICENSE +20 -0
- data/vendor/plugins/authlogic/README.rdoc +246 -0
- data/vendor/plugins/authlogic/Rakefile +42 -0
- data/vendor/plugins/authlogic/VERSION.yml +5 -0
- data/vendor/plugins/authlogic/authlogic.gemspec +217 -0
- data/vendor/plugins/authlogic/generators/session/session_generator.rb +9 -0
- data/vendor/plugins/authlogic/generators/session/templates/session.rb +2 -0
- data/vendor/plugins/authlogic/init.rb +1 -0
- data/vendor/plugins/authlogic/lib/authlogic.rb +64 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb +107 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb +110 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb +60 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb +141 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb +24 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb +355 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb +105 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb +68 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb +61 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb +139 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb +65 -0
- data/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb +32 -0
- data/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb +42 -0
- data/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb +55 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb +67 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb +30 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb +48 -0
- data/vendor/plugins/authlogic/lib/authlogic/controller_adapters/sinatra_adapter.rb +61 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb +43 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb +90 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb +34 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb +35 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha256.rb +50 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb +50 -0
- data/vendor/plugins/authlogic/lib/authlogic/crypto_providers/wordpress.rb +43 -0
- data/vendor/plugins/authlogic/lib/authlogic/i18n.rb +83 -0
- data/vendor/plugins/authlogic/lib/authlogic/i18n/translator.rb +15 -0
- data/vendor/plugins/authlogic/lib/authlogic/random.rb +33 -0
- data/vendor/plugins/authlogic/lib/authlogic/regex.rb +25 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/activation.rb +58 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb +64 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/base.rb +37 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb +96 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb +99 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb +130 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/existence.rb +93 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb +63 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb +58 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/id.rb +41 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/klass.rb +78 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb +95 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb +59 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/params.rb +101 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/password.rb +240 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb +18 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb +70 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb +34 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb +101 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/session.rb +62 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb +82 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb +50 -0
- data/vendor/plugins/authlogic/lib/authlogic/session/validation.rb +82 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case.rb +120 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb +45 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb +14 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_logger.rb +10 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/mock_request.rb +19 -0
- data/vendor/plugins/authlogic/lib/authlogic/test_case/rails_request_adapter.rb +30 -0
- data/vendor/plugins/authlogic/rails/init.rb +1 -0
- data/vendor/plugins/authlogic/shoulda_macros/authlogic.rb +69 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/base_test.rb +18 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb +97 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb +36 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb +109 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb +27 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb +236 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb +90 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb +55 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb +40 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb +84 -0
- data/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb +44 -0
- data/vendor/plugins/authlogic/test/authenticates_many_test.rb +16 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb +14 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb +14 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb +23 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/sha256_test.rb +14 -0
- data/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb +14 -0
- data/vendor/plugins/authlogic/test/fixtures/companies.yml +5 -0
- data/vendor/plugins/authlogic/test/fixtures/employees.yml +17 -0
- data/vendor/plugins/authlogic/test/fixtures/projects.yml +3 -0
- data/vendor/plugins/authlogic/test/fixtures/users.yml +24 -0
- data/vendor/plugins/authlogic/test/i18n_test.rb +33 -0
- data/vendor/plugins/authlogic/test/libs/affiliate.rb +7 -0
- data/vendor/plugins/authlogic/test/libs/company.rb +6 -0
- data/vendor/plugins/authlogic/test/libs/employee.rb +7 -0
- data/vendor/plugins/authlogic/test/libs/employee_session.rb +2 -0
- data/vendor/plugins/authlogic/test/libs/ldaper.rb +3 -0
- data/vendor/plugins/authlogic/test/libs/ordered_hash.rb +9 -0
- data/vendor/plugins/authlogic/test/libs/project.rb +3 -0
- data/vendor/plugins/authlogic/test/libs/user.rb +5 -0
- data/vendor/plugins/authlogic/test/libs/user_session.rb +6 -0
- data/vendor/plugins/authlogic/test/random_test.rb +49 -0
- data/vendor/plugins/authlogic/test/session_test/activation_test.rb +43 -0
- data/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb +36 -0
- data/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb +101 -0
- data/vendor/plugins/authlogic/test/session_test/callbacks_test.rb +6 -0
- data/vendor/plugins/authlogic/test/session_test/cookies_test.rb +112 -0
- data/vendor/plugins/authlogic/test/session_test/credentials_test.rb +0 -0
- data/vendor/plugins/authlogic/test/session_test/existence_test.rb +64 -0
- data/vendor/plugins/authlogic/test/session_test/http_auth_test.rb +28 -0
- data/vendor/plugins/authlogic/test/session_test/id_test.rb +17 -0
- data/vendor/plugins/authlogic/test/session_test/klass_test.rb +40 -0
- data/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb +62 -0
- data/vendor/plugins/authlogic/test/session_test/magic_states_test.rb +60 -0
- data/vendor/plugins/authlogic/test/session_test/params_test.rb +53 -0
- data/vendor/plugins/authlogic/test/session_test/password_test.rb +106 -0
- data/vendor/plugins/authlogic/test/session_test/perishability_test.rb +15 -0
- data/vendor/plugins/authlogic/test/session_test/persistence_test.rb +21 -0
- data/vendor/plugins/authlogic/test/session_test/scopes_test.rb +60 -0
- data/vendor/plugins/authlogic/test/session_test/session_test.rb +59 -0
- data/vendor/plugins/authlogic/test/session_test/timeout_test.rb +52 -0
- data/vendor/plugins/authlogic/test/session_test/unauthorized_record_test.rb +13 -0
- data/vendor/plugins/authlogic/test/session_test/validation_test.rb +23 -0
- data/vendor/plugins/authlogic/test/test_helper.rb +182 -0
- data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
- data/vendor/plugins/friendly_id/Changelog.md +243 -0
- data/vendor/plugins/friendly_id/Contributors.md +30 -0
- data/vendor/plugins/friendly_id/Gemfile +2 -0
- data/vendor/plugins/friendly_id/Guide.md +509 -0
- data/vendor/plugins/friendly_id/LICENSE +19 -0
- data/vendor/plugins/friendly_id/README.md +76 -0
- data/vendor/plugins/friendly_id/Rakefile +68 -0
- data/vendor/plugins/friendly_id/extras/README.txt +3 -0
- data/vendor/plugins/friendly_id/extras/bench.rb +59 -0
- data/vendor/plugins/friendly_id/extras/extras.rb +31 -0
- data/vendor/plugins/friendly_id/extras/prof.rb +14 -0
- data/vendor/plugins/friendly_id/extras/template-gem.rb +26 -0
- data/vendor/plugins/friendly_id/extras/template-plugin.rb +28 -0
- data/vendor/plugins/friendly_id/friendly_id.gemspec +40 -0
- data/vendor/plugins/friendly_id/generators/friendly_id/friendly_id_generator.rb +28 -0
- data/vendor/plugins/friendly_id/generators/friendly_id/templates/create_slugs.rb +18 -0
- data/vendor/plugins/friendly_id/lib/friendly_id.rb +67 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2.rb +47 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/configuration.rb +66 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/finders.rb +140 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/simple_model.rb +162 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/slug.rb +111 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/slugged_model.rb +323 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/tasks.rb +66 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/active_record2/tasks/friendly_id.rake +19 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/configuration.rb +132 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/finders.rb +106 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/slug_string.rb +292 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/slugged.rb +91 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/status.rb +35 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/test.rb +175 -0
- data/vendor/plugins/friendly_id/lib/friendly_id/version.rb +8 -0
- data/vendor/plugins/friendly_id/rails/init.rb +2 -0
- data/vendor/plugins/friendly_id/test/active_record2/basic_slugged_model_test.rb +14 -0
- data/vendor/plugins/friendly_id/test/active_record2/cached_slug_test.rb +61 -0
- data/vendor/plugins/friendly_id/test/active_record2/core.rb +93 -0
- data/vendor/plugins/friendly_id/test/active_record2/custom_normalizer_test.rb +20 -0
- data/vendor/plugins/friendly_id/test/active_record2/custom_table_name_test.rb +22 -0
- data/vendor/plugins/friendly_id/test/active_record2/deprecated_test.rb +23 -0
- data/vendor/plugins/friendly_id/test/active_record2/scoped_model_test.rb +111 -0
- data/vendor/plugins/friendly_id/test/active_record2/simple_test.rb +59 -0
- data/vendor/plugins/friendly_id/test/active_record2/slug_test.rb +34 -0
- data/vendor/plugins/friendly_id/test/active_record2/slugged.rb +30 -0
- data/vendor/plugins/friendly_id/test/active_record2/slugged_status_test.rb +61 -0
- data/vendor/plugins/friendly_id/test/active_record2/sti_test.rb +22 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/database.mysql.yml +4 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/database.postgres.yml +6 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/database.sqlite3.yml +2 -0
- data/vendor/plugins/friendly_id/test/active_record2/support/models.rb +78 -0
- data/vendor/plugins/friendly_id/test/active_record2/tasks_test.rb +82 -0
- data/vendor/plugins/friendly_id/test/active_record2/test_helper.rb +114 -0
- data/vendor/plugins/friendly_id/test/friendly_id_test.rb +60 -0
- data/vendor/plugins/friendly_id/test/slug_string_test.rb +78 -0
- data/vendor/plugins/friendly_id/test/test_helper.rb +9 -0
- data/vendor/plugins/hpricot/CHANGELOG +88 -0
- data/vendor/plugins/hpricot/COPYING +18 -0
- data/vendor/plugins/hpricot/README +275 -0
- data/vendor/plugins/hpricot/Rakefile +272 -0
- data/vendor/plugins/hpricot/ext/fast_xs/FastXsService.java +1030 -0
- data/vendor/plugins/hpricot/ext/fast_xs/extconf.rb +4 -0
- data/vendor/plugins/hpricot/ext/fast_xs/fast_xs.c +201 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/HpricotCss.java +831 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/HpricotScanService.java +2086 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/MANIFEST +0 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/extconf.rb +6 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_common.rl +76 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.c +3503 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.java.rl +155 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_css.rl +115 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.c +6927 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.h +79 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.java.rl +1152 -0
- data/vendor/plugins/hpricot/ext/hpricot_scan/hpricot_scan.rl +788 -0
- data/vendor/plugins/hpricot/extras/mingw-rbconfig.rb +176 -0
- data/vendor/plugins/hpricot/hpricot.gemspec +17 -0
- data/vendor/plugins/hpricot/lib/hpricot.rb +26 -0
- data/vendor/plugins/hpricot/lib/hpricot/blankslate.rb +63 -0
- data/vendor/plugins/hpricot/lib/hpricot/builder.rb +216 -0
- data/vendor/plugins/hpricot/lib/hpricot/elements.rb +510 -0
- data/vendor/plugins/hpricot/lib/hpricot/htmlinfo.rb +691 -0
- data/vendor/plugins/hpricot/lib/hpricot/inspect.rb +103 -0
- data/vendor/plugins/hpricot/lib/hpricot/modules.rb +40 -0
- data/vendor/plugins/hpricot/lib/hpricot/parse.rb +38 -0
- data/vendor/plugins/hpricot/lib/hpricot/tag.rb +219 -0
- data/vendor/plugins/hpricot/lib/hpricot/tags.rb +164 -0
- data/vendor/plugins/hpricot/lib/hpricot/traverse.rb +839 -0
- data/vendor/plugins/hpricot/lib/hpricot/xchar.rb +94 -0
- data/vendor/plugins/hpricot/setup.rb +1585 -0
- data/vendor/plugins/hpricot/test/files/basic.xhtml +17 -0
- data/vendor/plugins/hpricot/test/files/boingboing.html +2266 -0
- data/vendor/plugins/hpricot/test/files/cy0.html +3653 -0
- data/vendor/plugins/hpricot/test/files/immob.html +400 -0
- data/vendor/plugins/hpricot/test/files/pace_application.html +1320 -0
- data/vendor/plugins/hpricot/test/files/tenderlove.html +16 -0
- data/vendor/plugins/hpricot/test/files/uswebgen.html +220 -0
- data/vendor/plugins/hpricot/test/files/utf8.html +1054 -0
- data/vendor/plugins/hpricot/test/files/week9.html +1723 -0
- data/vendor/plugins/hpricot/test/files/why.xml +19 -0
- data/vendor/plugins/hpricot/test/load_files.rb +7 -0
- data/vendor/plugins/hpricot/test/nokogiri-bench.rb +64 -0
- data/vendor/plugins/hpricot/test/test_alter.rb +96 -0
- data/vendor/plugins/hpricot/test/test_builder.rb +37 -0
- data/vendor/plugins/hpricot/test/test_parser.rb +428 -0
- data/vendor/plugins/hpricot/test/test_paths.rb +25 -0
- data/vendor/plugins/hpricot/test/test_preserved.rb +88 -0
- data/vendor/plugins/hpricot/test/test_xml.rb +28 -0
- data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb +1 -6
- data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb +0 -11
- data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb +10 -6
- data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb +1 -1
- data/vendor/plugins/inquiries/config/routes.rb +1 -1
- data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb +16 -3
- data/vendor/plugins/pages/app/models/page_part.rb +9 -0
- data/vendor/plugins/rails_indexes/lib/indexer.rb +0 -2
- data/vendor/plugins/refinery/app/views/admin/_head.html.erb +2 -1
- data/vendor/plugins/refinery/app/views/shared/_head.html.erb +0 -1
- data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb +23 -11
- data/vendor/plugins/refinery/app/views/welcome.html.erb +1 -1
- data/vendor/plugins/refinery/app/views/wymiframe.html.erb +2 -1
- data/vendor/plugins/refinery/lib/generators/refinery/USAGE +1 -1
- data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb +2 -2
- data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb +4 -0
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb +6 -0
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb +5 -3
- data/vendor/plugins/refinery/lib/refinery/application_helper.rb +2 -2
- data/vendor/plugins/refinery/lib/refinery/initializer.rb +4 -41
- data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb +7 -3
- data/vendor/plugins/slim_scrooge/README.textile +112 -0
- data/vendor/plugins/slim_scrooge/Rakefile +29 -0
- data/vendor/plugins/slim_scrooge/VERSION.yml +5 -0
- data/vendor/plugins/slim_scrooge/ext/Rakefile +42 -0
- data/vendor/plugins/slim_scrooge/ext/extconf.rb +5 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge.rb +16 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/callsite.rb +96 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/callsites.rb +70 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/monitored_hash.rb +103 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/result_set.rb +38 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/simple_set.rb +34 -0
- data/vendor/plugins/slim_scrooge/lib/slim_scrooge/slim_scrooge.rb +46 -0
- data/vendor/plugins/slim_scrooge/rails/init.rb +8 -0
- data/vendor/plugins/slim_scrooge/slim_scrooge.gemspec +62 -0
- data/vendor/plugins/slim_scrooge/slim_scrooge_windows.gemspec +59 -0
- data/vendor/plugins/slim_scrooge/test/active_record_setup.rb +3 -0
- data/vendor/plugins/slim_scrooge/test/helper.rb +91 -0
- data/vendor/plugins/slim_scrooge/test/models/course.rb +2 -0
- data/vendor/plugins/slim_scrooge/test/schema/schema.rb +5 -0
- data/vendor/plugins/slim_scrooge/test/setup.rb +5 -0
- data/vendor/plugins/themes/app/models/theme.rb +7 -0
- data/vendor/plugins/themes/lib/theme_server.rb +3 -1
- data/vendor/plugins/themes/rails/init.rb +16 -13
- data/vendor/plugins/will_paginate/.manifest +43 -0
- data/vendor/plugins/will_paginate/CHANGELOG.rdoc +139 -0
- data/vendor/plugins/will_paginate/LICENSE +18 -0
- data/vendor/plugins/will_paginate/README.rdoc +107 -0
- data/vendor/plugins/will_paginate/Rakefile +53 -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.rb +90 -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 +43 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/finder.rb +264 -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 +408 -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 +473 -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/will_paginate/test/fixtures/developers_projects.yml +13 -0
- data/vendor/plugins/will_paginate/test/fixtures/project.rb +15 -0
- data/vendor/plugins/will_paginate/test/fixtures/projects.yml +6 -0
- data/vendor/plugins/will_paginate/test/fixtures/replies.yml +29 -0
- data/vendor/plugins/will_paginate/test/fixtures/reply.rb +7 -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/will_paginate/test/fixtures/topics.yml +30 -0
- data/vendor/plugins/will_paginate/test/fixtures/user.rb +2 -0
- data/vendor/plugins/will_paginate/test/fixtures/users.yml +35 -0
- data/vendor/plugins/will_paginate/test/helper.rb +37 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb +43 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb +75 -0
- data/vendor/plugins/will_paginate/test/lib/load_fixtures.rb +11 -0
- data/vendor/plugins/will_paginate/test/lib/view_test_process.rb +179 -0
- data/vendor/plugins/will_paginate/test/tasks.rake +59 -0
- data/vendor/plugins/will_paginate/test/view_test.rb +373 -0
- data/vendor/plugins/will_paginate/will_paginate.gemspec +19 -0
- metadata +308 -27
- data/db/migrate/20091029034951_remove_blurb_from_news_items.rb +0 -9
- data/public/javascripts/jquery-ui-1.8rc1.min.js +0 -375
- data/test/fixtures/news_items.yml +0 -14
- data/test/unit/news_items_test.rb +0 -33
- data/vendor/plugins/authentication/test/fixtures/users.yml +0 -19
- data/vendor/plugins/authentication/test/functional/sessions_controller_test.rb +0 -85
- data/vendor/plugins/authentication/test/functional/users_controller_test.rb +0 -99
- data/vendor/plugins/authentication/test/unit/user_test.rb +0 -164
- data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb +0 -5
- data/vendor/plugins/news/app/controllers/news_items_controller.rb +0 -20
- data/vendor/plugins/news/app/models/news_item.rb +0 -24
- data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb +0 -19
- data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb +0 -15
- data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb +0 -1
- data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +0 -31
- data/vendor/plugins/news/app/views/admin/news_items/new.html.erb +0 -1
- data/vendor/plugins/news/app/views/news_items/_recent_posts.html.erb +0 -8
- data/vendor/plugins/news/app/views/news_items/index.html.erb +0 -17
- data/vendor/plugins/news/app/views/news_items/index.rss.builder +0 -26
- data/vendor/plugins/news/app/views/news_items/show.html.erb +0 -13
- data/vendor/plugins/news/config/routes.rb +0 -7
- data/vendor/plugins/news/news.md +0 -20
- data/vendor/plugins/news/rails/init.rb +0 -11
@@ -0,0 +1,408 @@
|
|
1
|
+
require 'will_paginate/core_ext'
|
2
|
+
|
3
|
+
module WillPaginate
|
4
|
+
# = Will Paginate view helpers
|
5
|
+
#
|
6
|
+
# The main view helper, #will_paginate, renders
|
7
|
+
# pagination links for the given collection. The helper itself is lightweight
|
8
|
+
# and serves only as a wrapper around LinkRenderer instantiation; the
|
9
|
+
# renderer then does all the hard work of generating the HTML.
|
10
|
+
#
|
11
|
+
# == Global options for helpers
|
12
|
+
#
|
13
|
+
# Options for pagination helpers are optional and get their default values from the
|
14
|
+
# <tt>WillPaginate::ViewHelpers.pagination_options</tt> hash. You can write to this hash to
|
15
|
+
# override default options on the global level:
|
16
|
+
#
|
17
|
+
# WillPaginate::ViewHelpers.pagination_options[:previous_label] = 'Previous page'
|
18
|
+
#
|
19
|
+
# By putting this into "config/initializers/will_paginate.rb" (or simply environment.rb in
|
20
|
+
# older versions of Rails) you can easily translate link texts to previous
|
21
|
+
# and next pages, as well as override some other defaults to your liking.
|
22
|
+
module ViewHelpers
|
23
|
+
# default options that can be overridden on the global level
|
24
|
+
@@pagination_options = {
|
25
|
+
:class => 'pagination',
|
26
|
+
:previous_label => '« Previous',
|
27
|
+
:next_label => 'Next »',
|
28
|
+
:inner_window => 4, # links around the current page
|
29
|
+
:outer_window => 1, # links around beginning and end
|
30
|
+
:separator => ' ', # single space is friendly to spiders and non-graphic browsers
|
31
|
+
:param_name => :page,
|
32
|
+
:params => nil,
|
33
|
+
:renderer => 'WillPaginate::LinkRenderer',
|
34
|
+
:page_links => true,
|
35
|
+
:container => true
|
36
|
+
}
|
37
|
+
mattr_reader :pagination_options
|
38
|
+
|
39
|
+
# Renders Digg/Flickr-style pagination for a WillPaginate::Collection
|
40
|
+
# object. Nil is returned if there is only one page in total; no point in
|
41
|
+
# rendering the pagination in that case...
|
42
|
+
#
|
43
|
+
# ==== Options
|
44
|
+
# Display options:
|
45
|
+
# * <tt>:previous_label</tt> -- default: "« Previous" (this parameter is called <tt>:prev_label</tt> in versions <b>2.3.2</b> and older!)
|
46
|
+
# * <tt>:next_label</tt> -- default: "Next »"
|
47
|
+
# * <tt>:page_links</tt> -- when false, only previous/next links are rendered (default: true)
|
48
|
+
# * <tt>:inner_window</tt> -- how many links are shown around the current page (default: 4)
|
49
|
+
# * <tt>:outer_window</tt> -- how many links are around the first and the last page (default: 1)
|
50
|
+
# * <tt>:separator</tt> -- string separator for page HTML elements (default: single space)
|
51
|
+
#
|
52
|
+
# HTML options:
|
53
|
+
# * <tt>:class</tt> -- CSS class name for the generated DIV (default: "pagination")
|
54
|
+
# * <tt>:container</tt> -- toggles rendering of the DIV container for pagination links, set to
|
55
|
+
# false only when you are rendering your own pagination markup (default: true)
|
56
|
+
# * <tt>:id</tt> -- HTML ID for the container (default: nil). Pass +true+ to have the ID
|
57
|
+
# automatically generated from the class name of objects in collection: for example, paginating
|
58
|
+
# ArticleComment models would yield an ID of "article_comments_pagination".
|
59
|
+
#
|
60
|
+
# Advanced options:
|
61
|
+
# * <tt>:param_name</tt> -- parameter name for page number in URLs (default: <tt>:page</tt>)
|
62
|
+
# * <tt>:params</tt> -- additional parameters when generating pagination links
|
63
|
+
# (eg. <tt>:controller => "foo", :action => nil</tt>)
|
64
|
+
# * <tt>:renderer</tt> -- class name, class or instance of a link renderer (default:
|
65
|
+
# <tt>WillPaginate::LinkRenderer</tt>)
|
66
|
+
#
|
67
|
+
# All options not recognized by will_paginate will become HTML attributes on the container
|
68
|
+
# element for pagination links (the DIV). For example:
|
69
|
+
#
|
70
|
+
# <%= will_paginate @posts, :style => 'font-size: small' %>
|
71
|
+
#
|
72
|
+
# ... will result in:
|
73
|
+
#
|
74
|
+
# <div class="pagination" style="font-size: small"> ... </div>
|
75
|
+
#
|
76
|
+
# ==== Using the helper without arguments
|
77
|
+
# If the helper is called without passing in the collection object, it will
|
78
|
+
# try to read from the instance variable inferred by the controller name.
|
79
|
+
# For example, calling +will_paginate+ while the current controller is
|
80
|
+
# PostsController will result in trying to read from the <tt>@posts</tt>
|
81
|
+
# variable. Example:
|
82
|
+
#
|
83
|
+
# <%= will_paginate :id => true %>
|
84
|
+
#
|
85
|
+
# ... will result in <tt>@post</tt> collection getting paginated:
|
86
|
+
#
|
87
|
+
# <div class="pagination" id="posts_pagination"> ... </div>
|
88
|
+
#
|
89
|
+
def will_paginate(collection = nil, options = {})
|
90
|
+
options, collection = collection, nil if collection.is_a? Hash
|
91
|
+
unless collection or !controller
|
92
|
+
collection_name = "@#{controller.controller_name}"
|
93
|
+
collection = instance_variable_get(collection_name)
|
94
|
+
raise ArgumentError, "The #{collection_name} variable appears to be empty. Did you " +
|
95
|
+
"forget to pass the collection object for will_paginate?" unless collection
|
96
|
+
end
|
97
|
+
# early exit if there is nothing to render
|
98
|
+
return nil unless WillPaginate::ViewHelpers.total_pages_for_collection(collection) > 1
|
99
|
+
|
100
|
+
options = options.symbolize_keys.reverse_merge WillPaginate::ViewHelpers.pagination_options
|
101
|
+
if options[:prev_label]
|
102
|
+
WillPaginate::Deprecation::warn(":prev_label view parameter is now :previous_label; the old name has been deprecated", caller)
|
103
|
+
options[:previous_label] = options.delete(:prev_label)
|
104
|
+
end
|
105
|
+
|
106
|
+
# get the renderer instance
|
107
|
+
renderer = case options[:renderer]
|
108
|
+
when String
|
109
|
+
options[:renderer].to_s.constantize.new
|
110
|
+
when Class
|
111
|
+
options[:renderer].new
|
112
|
+
else
|
113
|
+
options[:renderer]
|
114
|
+
end
|
115
|
+
# render HTML for pagination
|
116
|
+
renderer.prepare collection, options, self
|
117
|
+
renderer.to_html
|
118
|
+
end
|
119
|
+
|
120
|
+
# Wrapper for rendering pagination links at both top and bottom of a block
|
121
|
+
# of content.
|
122
|
+
#
|
123
|
+
# <% paginated_section @posts do %>
|
124
|
+
# <ol id="posts">
|
125
|
+
# <% for post in @posts %>
|
126
|
+
# <li> ... </li>
|
127
|
+
# <% end %>
|
128
|
+
# </ol>
|
129
|
+
# <% end %>
|
130
|
+
#
|
131
|
+
# will result in:
|
132
|
+
#
|
133
|
+
# <div class="pagination"> ... </div>
|
134
|
+
# <ol id="posts">
|
135
|
+
# ...
|
136
|
+
# </ol>
|
137
|
+
# <div class="pagination"> ... </div>
|
138
|
+
#
|
139
|
+
# Arguments are passed to a <tt>will_paginate</tt> call, so the same options
|
140
|
+
# apply. Don't use the <tt>:id</tt> option; otherwise you'll finish with two
|
141
|
+
# blocks of pagination links sharing the same ID (which is invalid HTML).
|
142
|
+
def paginated_section(*args, &block)
|
143
|
+
pagination = will_paginate(*args).to_s
|
144
|
+
|
145
|
+
unless ActionView::Base.respond_to? :erb_variable
|
146
|
+
concat pagination
|
147
|
+
yield
|
148
|
+
concat pagination
|
149
|
+
else
|
150
|
+
content = pagination + capture(&block) + pagination
|
151
|
+
concat(content, block.binding)
|
152
|
+
end
|
153
|
+
end
|
154
|
+
|
155
|
+
# Renders a helpful message with numbers of displayed vs. total entries.
|
156
|
+
# You can use this as a blueprint for your own, similar helpers.
|
157
|
+
#
|
158
|
+
# <%= page_entries_info @posts %>
|
159
|
+
# #-> Displaying posts 6 - 10 of 26 in total
|
160
|
+
#
|
161
|
+
# By default, the message will use the humanized class name of objects
|
162
|
+
# in collection: for instance, "project types" for ProjectType models.
|
163
|
+
# Override this with the <tt>:entry_name</tt> parameter:
|
164
|
+
#
|
165
|
+
# <%= page_entries_info @posts, :entry_name => 'item' %>
|
166
|
+
# #-> Displaying items 6 - 10 of 26 in total
|
167
|
+
def page_entries_info(collection, options = {})
|
168
|
+
entry_name = options[:entry_name] ||
|
169
|
+
(collection.empty?? 'entry' : collection.first.class.name.underscore.sub('_', ' '))
|
170
|
+
|
171
|
+
if collection.total_pages < 2
|
172
|
+
case collection.size
|
173
|
+
when 0; "No #{entry_name.pluralize} found"
|
174
|
+
when 1; "Displaying <b>1</b> #{entry_name}"
|
175
|
+
else; "Displaying <b>all #{collection.size}</b> #{entry_name.pluralize}"
|
176
|
+
end
|
177
|
+
else
|
178
|
+
%{Displaying #{entry_name.pluralize} <b>%d - %d</b> of <b>%d</b> in total} % [
|
179
|
+
collection.offset + 1,
|
180
|
+
collection.offset + collection.length,
|
181
|
+
collection.total_entries
|
182
|
+
]
|
183
|
+
end
|
184
|
+
end
|
185
|
+
|
186
|
+
if respond_to? :safe_helper
|
187
|
+
safe_helper :will_paginate, :paginated_section, :page_entries_info
|
188
|
+
end
|
189
|
+
|
190
|
+
def self.total_pages_for_collection(collection) #:nodoc:
|
191
|
+
if collection.respond_to?('page_count') and !collection.respond_to?('total_pages')
|
192
|
+
WillPaginate::Deprecation.warn %{
|
193
|
+
You are using a paginated collection of class #{collection.class.name}
|
194
|
+
which conforms to the old API of WillPaginate::Collection by using
|
195
|
+
`page_count`, while the current method name is `total_pages`. Please
|
196
|
+
upgrade yours or 3rd-party code that provides the paginated collection}, caller
|
197
|
+
class << collection
|
198
|
+
def total_pages; page_count; end
|
199
|
+
end
|
200
|
+
end
|
201
|
+
collection.total_pages
|
202
|
+
end
|
203
|
+
end
|
204
|
+
|
205
|
+
# This class does the heavy lifting of actually building the pagination
|
206
|
+
# links. It is used by the <tt>will_paginate</tt> helper internally.
|
207
|
+
class LinkRenderer
|
208
|
+
|
209
|
+
# The gap in page links is represented by:
|
210
|
+
#
|
211
|
+
# <span class="gap">…</span>
|
212
|
+
attr_accessor :gap_marker
|
213
|
+
|
214
|
+
def initialize
|
215
|
+
@gap_marker = '<span class="gap">…</span>'
|
216
|
+
end
|
217
|
+
|
218
|
+
# * +collection+ is a WillPaginate::Collection instance or any other object
|
219
|
+
# that conforms to that API
|
220
|
+
# * +options+ are forwarded from +will_paginate+ view helper
|
221
|
+
# * +template+ is the reference to the template being rendered
|
222
|
+
def prepare(collection, options, template)
|
223
|
+
@collection = collection
|
224
|
+
@options = options
|
225
|
+
@template = template
|
226
|
+
|
227
|
+
# reset values in case we're re-using this instance
|
228
|
+
@total_pages = @param_name = @url_string = nil
|
229
|
+
end
|
230
|
+
|
231
|
+
# Process it! This method returns the complete HTML string which contains
|
232
|
+
# pagination links. Feel free to subclass LinkRenderer and change this
|
233
|
+
# method as you see fit.
|
234
|
+
def to_html
|
235
|
+
links = @options[:page_links] ? windowed_links : []
|
236
|
+
# previous/next buttons
|
237
|
+
links.unshift page_link_or_span(@collection.previous_page, 'disabled prev_page', @options[:previous_label])
|
238
|
+
links.push page_link_or_span(@collection.next_page, 'disabled next_page', @options[:next_label])
|
239
|
+
|
240
|
+
html = links.join(@options[:separator])
|
241
|
+
@options[:container] ? @template.content_tag(:div, html, html_attributes) : html
|
242
|
+
end
|
243
|
+
|
244
|
+
# Returns the subset of +options+ this instance was initialized with that
|
245
|
+
# represent HTML attributes for the container element of pagination links.
|
246
|
+
def html_attributes
|
247
|
+
return @html_attributes if @html_attributes
|
248
|
+
@html_attributes = @options.except *(WillPaginate::ViewHelpers.pagination_options.keys - [:class])
|
249
|
+
# pagination of Post models will have the ID of "posts_pagination"
|
250
|
+
if @options[:container] and @options[:id] === true
|
251
|
+
@html_attributes[:id] = @collection.first.class.name.underscore.pluralize + '_pagination'
|
252
|
+
end
|
253
|
+
@html_attributes
|
254
|
+
end
|
255
|
+
|
256
|
+
protected
|
257
|
+
|
258
|
+
# Collects link items for visible page numbers.
|
259
|
+
def windowed_links
|
260
|
+
prev = nil
|
261
|
+
|
262
|
+
visible_page_numbers.inject [] do |links, n|
|
263
|
+
# detect gaps:
|
264
|
+
links << gap_marker if prev and n > prev + 1
|
265
|
+
links << page_link_or_span(n, 'current')
|
266
|
+
prev = n
|
267
|
+
links
|
268
|
+
end
|
269
|
+
end
|
270
|
+
|
271
|
+
# Calculates visible page numbers using the <tt>:inner_window</tt> and
|
272
|
+
# <tt>:outer_window</tt> options.
|
273
|
+
def visible_page_numbers
|
274
|
+
inner_window, outer_window = @options[:inner_window].to_i, @options[:outer_window].to_i
|
275
|
+
window_from = current_page - inner_window
|
276
|
+
window_to = current_page + inner_window
|
277
|
+
|
278
|
+
# adjust lower or upper limit if other is out of bounds
|
279
|
+
if window_to > total_pages
|
280
|
+
window_from -= window_to - total_pages
|
281
|
+
window_to = total_pages
|
282
|
+
end
|
283
|
+
if window_from < 1
|
284
|
+
window_to += 1 - window_from
|
285
|
+
window_from = 1
|
286
|
+
window_to = total_pages if window_to > total_pages
|
287
|
+
end
|
288
|
+
|
289
|
+
visible = (1..total_pages).to_a
|
290
|
+
left_gap = (2 + outer_window)...window_from
|
291
|
+
right_gap = (window_to + 1)...(total_pages - outer_window)
|
292
|
+
visible -= left_gap.to_a if left_gap.last - left_gap.first > 1
|
293
|
+
visible -= right_gap.to_a if right_gap.last - right_gap.first > 1
|
294
|
+
|
295
|
+
visible
|
296
|
+
end
|
297
|
+
|
298
|
+
def page_link_or_span(page, span_class, text = nil)
|
299
|
+
text ||= page.to_s
|
300
|
+
|
301
|
+
if page and page != current_page
|
302
|
+
classnames = span_class && span_class.index(' ') && span_class.split(' ', 2).last
|
303
|
+
page_link page, text, :rel => rel_value(page), :class => classnames
|
304
|
+
else
|
305
|
+
page_span page, text, :class => span_class
|
306
|
+
end
|
307
|
+
end
|
308
|
+
|
309
|
+
def page_link(page, text, attributes = {})
|
310
|
+
@template.link_to text, url_for(page), attributes
|
311
|
+
end
|
312
|
+
|
313
|
+
def page_span(page, text, attributes = {})
|
314
|
+
@template.content_tag :span, text, attributes
|
315
|
+
end
|
316
|
+
|
317
|
+
# Returns URL params for +page_link_or_span+, taking the current GET params
|
318
|
+
# and <tt>:params</tt> option into account.
|
319
|
+
def url_for(page)
|
320
|
+
page_one = page == 1
|
321
|
+
unless @url_string and !page_one
|
322
|
+
@url_params = {}
|
323
|
+
# page links should preserve GET parameters
|
324
|
+
stringified_merge @url_params, @template.params if @template.request.get?
|
325
|
+
stringified_merge @url_params, @options[:params] if @options[:params]
|
326
|
+
|
327
|
+
if complex = param_name.index(/[^\w-]/)
|
328
|
+
page_param = parse_query_parameters("#{param_name}=#{page}")
|
329
|
+
|
330
|
+
stringified_merge @url_params, page_param
|
331
|
+
else
|
332
|
+
@url_params[param_name] = page_one ? 1 : 2
|
333
|
+
end
|
334
|
+
|
335
|
+
url = @template.url_for(@url_params)
|
336
|
+
return url if page_one
|
337
|
+
|
338
|
+
if complex
|
339
|
+
@url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, "\\1\0")
|
340
|
+
return url
|
341
|
+
else
|
342
|
+
@url_string = url
|
343
|
+
@url_params[param_name] = 3
|
344
|
+
@template.url_for(@url_params).split(//).each_with_index do |char, i|
|
345
|
+
if char == '3' and url[i, 1] == '2'
|
346
|
+
@url_string[i] = "\0"
|
347
|
+
break
|
348
|
+
end
|
349
|
+
end
|
350
|
+
end
|
351
|
+
end
|
352
|
+
# finally!
|
353
|
+
@url_string.sub "\0", page.to_s
|
354
|
+
end
|
355
|
+
|
356
|
+
private
|
357
|
+
|
358
|
+
def rel_value(page)
|
359
|
+
case page
|
360
|
+
when @collection.previous_page; 'prev' + (page == 1 ? ' start' : '')
|
361
|
+
when @collection.next_page; 'next'
|
362
|
+
when 1; 'start'
|
363
|
+
end
|
364
|
+
end
|
365
|
+
|
366
|
+
def current_page
|
367
|
+
@collection.current_page
|
368
|
+
end
|
369
|
+
|
370
|
+
def total_pages
|
371
|
+
@total_pages ||= WillPaginate::ViewHelpers.total_pages_for_collection(@collection)
|
372
|
+
end
|
373
|
+
|
374
|
+
def param_name
|
375
|
+
@param_name ||= @options[:param_name].to_s
|
376
|
+
end
|
377
|
+
|
378
|
+
# Recursively merge into target hash by using stringified keys from the other one
|
379
|
+
def stringified_merge(target, other)
|
380
|
+
other.each do |key, value|
|
381
|
+
key = key.to_s # this line is what it's all about!
|
382
|
+
existing = target[key]
|
383
|
+
|
384
|
+
if value.is_a?(Hash) and (existing.is_a?(Hash) or existing.nil?)
|
385
|
+
stringified_merge(existing || (target[key] = {}), value)
|
386
|
+
else
|
387
|
+
target[key] = value
|
388
|
+
end
|
389
|
+
end
|
390
|
+
end
|
391
|
+
|
392
|
+
def parse_query_parameters(params)
|
393
|
+
if defined? Rack::Utils
|
394
|
+
# For Rails > 2.3
|
395
|
+
Rack::Utils.parse_nested_query(params)
|
396
|
+
elsif defined?(ActionController::AbstractRequest)
|
397
|
+
ActionController::AbstractRequest.parse_query_parameters(params)
|
398
|
+
elsif defined?(ActionController::UrlEncodedPairParser)
|
399
|
+
# For Rails > 2.2
|
400
|
+
ActionController::UrlEncodedPairParser.parse_query_parameters(params)
|
401
|
+
elsif defined?(CGIMethods)
|
402
|
+
CGIMethods.parse_query_parameters(params)
|
403
|
+
else
|
404
|
+
raise "unsupported ActionPack version"
|
405
|
+
end
|
406
|
+
end
|
407
|
+
end
|
408
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
plugin_root = File.join(File.dirname(__FILE__), '..')
|
2
|
+
version = ENV['RAILS_VERSION']
|
3
|
+
version = nil if version and version == ""
|
4
|
+
|
5
|
+
# first look for a symlink to a copy of the framework
|
6
|
+
if !version and framework_root = ["#{plugin_root}/rails", "#{plugin_root}/../../rails"].find { |p| File.directory? p }
|
7
|
+
puts "found framework root: #{framework_root}"
|
8
|
+
# this allows for a plugin to be tested outside of an app and without Rails gems
|
9
|
+
$:.unshift "#{framework_root}/activesupport/lib", "#{framework_root}/activerecord/lib", "#{framework_root}/actionpack/lib"
|
10
|
+
else
|
11
|
+
# simply use installed gems if available
|
12
|
+
puts "using Rails#{version ? ' ' + version : nil} gems"
|
13
|
+
require 'rubygems'
|
14
|
+
|
15
|
+
if version
|
16
|
+
gem 'rails', version
|
17
|
+
else
|
18
|
+
gem 'actionpack'
|
19
|
+
gem 'activerecord'
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,143 @@
|
|
1
|
+
require 'helper'
|
2
|
+
require 'will_paginate/array'
|
3
|
+
|
4
|
+
class ArrayPaginationTest < Test::Unit::TestCase
|
5
|
+
|
6
|
+
def setup ; end
|
7
|
+
|
8
|
+
def test_simple
|
9
|
+
collection = ('a'..'e').to_a
|
10
|
+
|
11
|
+
[{ :page => 1, :per_page => 3, :expected => %w( a b c ) },
|
12
|
+
{ :page => 2, :per_page => 3, :expected => %w( d e ) },
|
13
|
+
{ :page => 1, :per_page => 5, :expected => %w( a b c d e ) },
|
14
|
+
{ :page => 3, :per_page => 5, :expected => [] },
|
15
|
+
].
|
16
|
+
each do |conditions|
|
17
|
+
expected = conditions.delete :expected
|
18
|
+
assert_equal expected, collection.paginate(conditions)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
def test_defaults
|
23
|
+
result = (1..50).to_a.paginate
|
24
|
+
assert_equal 1, result.current_page
|
25
|
+
assert_equal 30, result.size
|
26
|
+
end
|
27
|
+
|
28
|
+
def test_deprecated_api
|
29
|
+
assert_raise(ArgumentError) { [].paginate(2) }
|
30
|
+
assert_raise(ArgumentError) { [].paginate(2, 10) }
|
31
|
+
end
|
32
|
+
|
33
|
+
def test_total_entries_has_precedence
|
34
|
+
result = %w(a b c).paginate :total_entries => 5
|
35
|
+
assert_equal 5, result.total_entries
|
36
|
+
end
|
37
|
+
|
38
|
+
def test_argument_error_with_params_and_another_argument
|
39
|
+
assert_raise ArgumentError do
|
40
|
+
[].paginate({}, 5)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
def test_paginated_collection
|
45
|
+
entries = %w(a b c)
|
46
|
+
collection = create(2, 3, 10) do |pager|
|
47
|
+
assert_equal entries, pager.replace(entries)
|
48
|
+
end
|
49
|
+
|
50
|
+
assert_equal entries, collection
|
51
|
+
assert_respond_to_all collection, %w(total_pages each offset size current_page per_page total_entries)
|
52
|
+
assert_kind_of Array, collection
|
53
|
+
assert_instance_of Array, collection.entries
|
54
|
+
assert_equal 3, collection.offset
|
55
|
+
assert_equal 4, collection.total_pages
|
56
|
+
assert !collection.out_of_bounds?
|
57
|
+
end
|
58
|
+
|
59
|
+
def test_previous_next_pages
|
60
|
+
collection = create(1, 1, 3)
|
61
|
+
assert_nil collection.previous_page
|
62
|
+
assert_equal 2, collection.next_page
|
63
|
+
|
64
|
+
collection = create(2, 1, 3)
|
65
|
+
assert_equal 1, collection.previous_page
|
66
|
+
assert_equal 3, collection.next_page
|
67
|
+
|
68
|
+
collection = create(3, 1, 3)
|
69
|
+
assert_equal 2, collection.previous_page
|
70
|
+
assert_nil collection.next_page
|
71
|
+
end
|
72
|
+
|
73
|
+
def test_out_of_bounds
|
74
|
+
entries = create(2, 3, 2){}
|
75
|
+
assert entries.out_of_bounds?
|
76
|
+
|
77
|
+
entries = create(1, 3, 2){}
|
78
|
+
assert !entries.out_of_bounds?
|
79
|
+
end
|
80
|
+
|
81
|
+
def test_guessing_total_count
|
82
|
+
entries = create do |pager|
|
83
|
+
# collection is shorter than limit
|
84
|
+
pager.replace array
|
85
|
+
end
|
86
|
+
assert_equal 8, entries.total_entries
|
87
|
+
|
88
|
+
entries = create(2, 5, 10) do |pager|
|
89
|
+
# collection is shorter than limit, but we have an explicit count
|
90
|
+
pager.replace array
|
91
|
+
end
|
92
|
+
assert_equal 10, entries.total_entries
|
93
|
+
|
94
|
+
entries = create do |pager|
|
95
|
+
# collection is the same as limit; we can't guess
|
96
|
+
pager.replace array(5)
|
97
|
+
end
|
98
|
+
assert_equal nil, entries.total_entries
|
99
|
+
|
100
|
+
entries = create do |pager|
|
101
|
+
# collection is empty; we can't guess
|
102
|
+
pager.replace array(0)
|
103
|
+
end
|
104
|
+
assert_equal nil, entries.total_entries
|
105
|
+
|
106
|
+
entries = create(1) do |pager|
|
107
|
+
# collection is empty and we're on page 1,
|
108
|
+
# so the whole thing must be empty, too
|
109
|
+
pager.replace array(0)
|
110
|
+
end
|
111
|
+
assert_equal 0, entries.total_entries
|
112
|
+
end
|
113
|
+
|
114
|
+
def test_invalid_page
|
115
|
+
bad_inputs = [0, -1, nil, '', 'Schnitzel']
|
116
|
+
|
117
|
+
bad_inputs.each do |bad|
|
118
|
+
assert_raise(WillPaginate::InvalidPage) { create bad }
|
119
|
+
end
|
120
|
+
end
|
121
|
+
|
122
|
+
def test_invalid_per_page_setting
|
123
|
+
assert_raise(ArgumentError) { create(1, -1) }
|
124
|
+
end
|
125
|
+
|
126
|
+
def test_page_count_was_removed
|
127
|
+
assert_raise(NoMethodError) { create.page_count }
|
128
|
+
# It's `total_pages` now.
|
129
|
+
end
|
130
|
+
|
131
|
+
private
|
132
|
+
def create(page = 2, limit = 5, total = nil, &block)
|
133
|
+
if block_given?
|
134
|
+
WillPaginate::Collection.create(page, limit, total, &block)
|
135
|
+
else
|
136
|
+
WillPaginate::Collection.new(page, limit, total)
|
137
|
+
end
|
138
|
+
end
|
139
|
+
|
140
|
+
def array(size = 3)
|
141
|
+
Array.new(size)
|
142
|
+
end
|
143
|
+
end
|