typo 5.2.98 → 5.3
Sign up to get free protection for your applications and to get access to all the features.
- data/app/controllers/admin/sidebar_controller.rb +15 -3
- data/app/helpers/sidebar_helper.rb +9 -4
- data/app/models/feedback.rb +10 -2
- data/app/models/page_cache.rb +5 -1
- data/app/views/admin/blacklist/_blacklist_patterns.html.erb +2 -0
- data/app/views/admin/categories/new.html.erb +1 -1
- data/app/views/admin/content/_form.html.erb +3 -3
- data/app/views/admin/content/_simple_editor.html.erb +2 -0
- data/app/views/admin/content/_visual_editor.html.erb +2 -0
- data/app/views/admin/pages/_form.html.erb +5 -5
- data/app/views/admin/pages/_simple_editor.html.erb +2 -0
- data/app/views/admin/pages/_visual_editor.html.erb +2 -0
- data/app/views/articles/_comment_box.html.erb +1 -1
- data/app/views/articles/_comment_failed.html.erb +1 -1
- data/app/views/articles/read.html.erb +1 -1
- data/config/environment.rb +3 -2
- data/lib/tasks/release.rake +3 -4
- data/lib/typo_version.rb +1 -1
- data/public/stylesheets/administration.css +37 -2
- data/public/stylesheets/administration_rtl.css +316 -437
- data/vendor/actionwebservice/CHANGELOG +320 -0
- data/vendor/actionwebservice/MIT-LICENSE +21 -0
- data/vendor/actionwebservice/README +381 -0
- data/vendor/actionwebservice/Rakefile +173 -0
- data/vendor/actionwebservice/TODO +32 -0
- data/vendor/actionwebservice/examples/googlesearch/README +143 -0
- data/vendor/actionwebservice/examples/googlesearch/autoloading/google_search_api.rb +50 -0
- data/vendor/actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb +57 -0
- data/vendor/actionwebservice/examples/googlesearch/delegated/google_search_service.rb +108 -0
- data/vendor/actionwebservice/examples/googlesearch/delegated/search_controller.rb +7 -0
- data/vendor/actionwebservice/examples/googlesearch/direct/google_search_api.rb +50 -0
- data/vendor/actionwebservice/examples/googlesearch/direct/search_controller.rb +58 -0
- data/vendor/actionwebservice/examples/metaWeblog/README +17 -0
- data/vendor/actionwebservice/examples/metaWeblog/apis/blogger_api.rb +60 -0
- data/vendor/actionwebservice/examples/metaWeblog/apis/blogger_service.rb +34 -0
- data/vendor/actionwebservice/examples/metaWeblog/apis/meta_weblog_api.rb +67 -0
- data/vendor/actionwebservice/examples/metaWeblog/apis/meta_weblog_service.rb +48 -0
- data/vendor/actionwebservice/examples/metaWeblog/controllers/xmlrpc_controller.rb +16 -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/lib/action_web_service.rb +66 -0
- data/vendor/actionwebservice/lib/action_web_service/api.rb +297 -0
- data/vendor/actionwebservice/lib/action_web_service/base.rb +38 -0
- data/vendor/actionwebservice/lib/action_web_service/casting.rb +144 -0
- data/vendor/actionwebservice/lib/action_web_service/client.rb +3 -0
- data/vendor/actionwebservice/lib/action_web_service/client/base.rb +28 -0
- data/vendor/actionwebservice/lib/action_web_service/client/soap_client.rb +113 -0
- data/vendor/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb +58 -0
- data/vendor/actionwebservice/lib/action_web_service/container.rb +3 -0
- data/vendor/actionwebservice/lib/action_web_service/container/action_controller_container.rb +93 -0
- data/vendor/actionwebservice/lib/action_web_service/container/delegated_container.rb +86 -0
- data/vendor/actionwebservice/lib/action_web_service/container/direct_container.rb +69 -0
- data/vendor/actionwebservice/lib/action_web_service/dispatcher.rb +2 -0
- data/vendor/actionwebservice/lib/action_web_service/dispatcher/abstract.rb +207 -0
- data/vendor/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +379 -0
- data/vendor/actionwebservice/lib/action_web_service/invocation.rb +202 -0
- data/vendor/actionwebservice/lib/action_web_service/protocol.rb +4 -0
- data/vendor/actionwebservice/lib/action_web_service/protocol/abstract.rb +112 -0
- data/vendor/actionwebservice/lib/action_web_service/protocol/discovery.rb +37 -0
- data/vendor/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb +176 -0
- data/vendor/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb +242 -0
- data/vendor/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb +122 -0
- data/vendor/actionwebservice/lib/action_web_service/scaffolding.rb +281 -0
- data/vendor/actionwebservice/lib/action_web_service/struct.rb +64 -0
- data/vendor/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb +26 -0
- data/vendor/actionwebservice/lib/action_web_service/support/signature_types.rb +226 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/layout.html.erb +65 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/methods.html.erb +6 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.html.erb +29 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/result.html.erb +30 -0
- data/vendor/actionwebservice/lib/action_web_service/test_invoke.rb +110 -0
- data/vendor/actionwebservice/lib/action_web_service/version.rb +9 -0
- data/vendor/actionwebservice/lib/actionwebservice.rb +1 -0
- data/vendor/actionwebservice/setup.rb +1379 -0
- data/vendor/actionwebservice/test/abstract_client.rb +183 -0
- data/vendor/actionwebservice/test/abstract_dispatcher.rb +547 -0
- data/vendor/actionwebservice/test/abstract_unit.rb +33 -0
- data/vendor/actionwebservice/test/api_test.rb +102 -0
- data/vendor/actionwebservice/test/apis/auto_load_api.rb +3 -0
- data/vendor/actionwebservice/test/apis/broken_auto_load_api.rb +2 -0
- data/vendor/actionwebservice/test/base_test.rb +42 -0
- data/vendor/actionwebservice/test/casting_test.rb +86 -0
- data/vendor/actionwebservice/test/client_soap_test.rb +155 -0
- data/vendor/actionwebservice/test/client_xmlrpc_test.rb +153 -0
- data/vendor/actionwebservice/test/container_test.rb +73 -0
- data/vendor/actionwebservice/test/dispatcher_action_controller_soap_test.rb +137 -0
- data/vendor/actionwebservice/test/dispatcher_action_controller_xmlrpc_test.rb +59 -0
- data/vendor/actionwebservice/test/fixtures/db_definitions/mysql.sql +8 -0
- data/vendor/actionwebservice/test/fixtures/users.yml +12 -0
- data/vendor/actionwebservice/test/gencov +3 -0
- data/vendor/actionwebservice/test/invocation_test.rb +185 -0
- data/vendor/actionwebservice/test/run +6 -0
- data/vendor/actionwebservice/test/scaffolded_controller_test.rb +146 -0
- data/vendor/actionwebservice/test/struct_test.rb +52 -0
- data/vendor/actionwebservice/test/test_invoke_test.rb +112 -0
- data/vendor/gems/calendar_date_select-1.15/.specification +56 -0
- data/vendor/gems/calendar_date_select-1.15/History.txt +237 -0
- data/vendor/gems/calendar_date_select-1.15/MIT-LICENSE +20 -0
- data/vendor/gems/calendar_date_select-1.15/Manifest.txt +42 -0
- data/vendor/gems/calendar_date_select-1.15/Rakefile +31 -0
- data/vendor/gems/calendar_date_select-1.15/Readme.txt +16 -0
- data/vendor/gems/calendar_date_select-1.15/init.rb +1 -0
- data/vendor/gems/calendar_date_select-1.15/js_test/functional/cds_test.html +334 -0
- data/vendor/gems/calendar_date_select-1.15/js_test/prototype.js +4184 -0
- data/vendor/gems/calendar_date_select-1.15/js_test/test.css +40 -0
- data/vendor/gems/calendar_date_select-1.15/js_test/unit/cds_helper_methods.html +46 -0
- data/vendor/gems/calendar_date_select-1.15/js_test/unittest.js +564 -0
- data/vendor/gems/calendar_date_select-1.15/lib/calendar_date_select.rb +33 -0
- data/vendor/gems/calendar_date_select-1.15/lib/calendar_date_select/calendar_date_select.rb +116 -0
- data/vendor/gems/calendar_date_select-1.15/lib/calendar_date_select/form_helpers.rb +225 -0
- data/vendor/gems/calendar_date_select-1.15/lib/calendar_date_select/includes_helper.rb +29 -0
- data/vendor/gems/calendar_date_select-1.15/public/blank_iframe.html +2 -0
- data/vendor/gems/calendar_date_select-1.15/public/images/calendar_date_select/calendar.gif +0 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/calendar_date_select.js +443 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_american.js +34 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_db.js +27 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_euro_24hr.js +7 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_euro_24hr_ymd.js +7 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_finnish.js +32 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_hyphen_ampm.js +37 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_iso_date.js +46 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/format_italian.js +24 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/locale/de.js +11 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/locale/fi.js +10 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/locale/fr.js +10 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/locale/pl.js +10 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/locale/pt.js +11 -0
- data/vendor/gems/calendar_date_select-1.15/public/javascripts/calendar_date_select/locale/ru.js +10 -0
- data/vendor/gems/calendar_date_select-1.15/public/stylesheets/calendar_date_select/blue.css +130 -0
- data/vendor/gems/calendar_date_select-1.15/public/stylesheets/calendar_date_select/default.css +135 -0
- data/vendor/gems/calendar_date_select-1.15/public/stylesheets/calendar_date_select/plain.css +128 -0
- data/vendor/gems/calendar_date_select-1.15/public/stylesheets/calendar_date_select/red.css +135 -0
- data/vendor/gems/calendar_date_select-1.15/public/stylesheets/calendar_date_select/silver.css +133 -0
- data/vendor/gems/calendar_date_select-1.15/spec/calendar_date_select/calendar_date_select_spec.rb +14 -0
- data/vendor/gems/calendar_date_select-1.15/spec/calendar_date_select/form_helpers_spec.rb +166 -0
- data/vendor/gems/calendar_date_select-1.15/spec/spec_helper.rb +26 -0
- data/vendor/gems/coderay-0.8.260/.specification +2 -1
- data/vendor/gems/htmlentities-4.0.0/.specification +68 -0
- data/vendor/gems/htmlentities-4.0.0/COPYING.txt +21 -0
- data/vendor/gems/htmlentities-4.0.0/History.txt +47 -0
- data/vendor/gems/htmlentities-4.0.0/README.txt +44 -0
- data/vendor/gems/htmlentities-4.0.0/lib/htmlentities.rb +165 -0
- data/vendor/gems/htmlentities-4.0.0/lib/htmlentities/html4.rb +257 -0
- data/vendor/gems/htmlentities-4.0.0/lib/htmlentities/legacy.rb +27 -0
- data/vendor/gems/htmlentities-4.0.0/lib/htmlentities/string.rb +26 -0
- data/vendor/gems/htmlentities-4.0.0/lib/htmlentities/xhtml1.rb +258 -0
- data/vendor/gems/htmlentities-4.0.0/test/entities_test.rb +206 -0
- data/vendor/gems/htmlentities-4.0.0/test/html4_test.rb +24 -0
- data/vendor/gems/htmlentities-4.0.0/test/legacy_test.rb +34 -0
- data/vendor/gems/htmlentities-4.0.0/test/roundtrip_test.rb +94 -0
- data/vendor/gems/htmlentities-4.0.0/test/string_test.rb +24 -0
- data/vendor/gems/htmlentities-4.0.0/test/test_all.rb +3 -0
- data/vendor/gems/htmlentities-4.0.0/test/xhtml1_test.rb +23 -0
- data/vendor/gems/json-1.1.3/.require_paths +4 -0
- data/vendor/gems/json-1.1.3/.specification +58 -0
- data/vendor/gems/json-1.1.3/CHANGES +93 -0
- data/vendor/gems/json-1.1.3/GPL +340 -0
- data/vendor/gems/json-1.1.3/README +78 -0
- data/vendor/gems/json-1.1.3/RUBY +58 -0
- data/vendor/gems/json-1.1.3/Rakefile +309 -0
- data/vendor/gems/json-1.1.3/TODO +1 -0
- data/vendor/gems/json-1.1.3/VERSION +1 -0
- data/vendor/gems/json-1.1.3/benchmarks/benchmark.txt +133 -0
- data/vendor/gems/json-1.1.3/benchmarks/benchmark_generator.rb +48 -0
- data/vendor/gems/json-1.1.3/benchmarks/benchmark_parser.rb +26 -0
- data/vendor/gems/json-1.1.3/benchmarks/benchmark_rails.rb +26 -0
- data/vendor/gems/json-1.1.3/bin/edit_json.rb +10 -0
- data/vendor/gems/json-1.1.3/bin/prettify_json.rb +76 -0
- data/vendor/gems/json-1.1.3/data/example.json +1 -0
- data/vendor/gems/json-1.1.3/data/index.html +38 -0
- data/vendor/gems/json-1.1.3/data/prototype.js +4184 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator.bundle +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/Makefile +149 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/extconf.rb +9 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/generator.bundle +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/generator.c +875 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/generator.o +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/unicode.c +182 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/unicode.h +53 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/generator/unicode.o +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser.bundle +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/Makefile +149 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/extconf.rb +9 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/parser.bundle +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/parser.c +1758 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/parser.o +0 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/parser.rl +638 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/unicode.c +154 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/unicode.h +58 -0
- data/vendor/gems/json-1.1.3/ext/json/ext/parser/unicode.o +0 -0
- data/vendor/gems/json-1.1.3/install.rb +26 -0
- data/vendor/gems/json-1.1.3/lib/json.rb +235 -0
- data/vendor/gems/json-1.1.3/lib/json/Array.xpm +21 -0
- data/vendor/gems/json-1.1.3/lib/json/FalseClass.xpm +21 -0
- data/vendor/gems/json-1.1.3/lib/json/Hash.xpm +21 -0
- data/vendor/gems/json-1.1.3/lib/json/Key.xpm +73 -0
- data/vendor/gems/json-1.1.3/lib/json/NilClass.xpm +21 -0
- data/vendor/gems/json-1.1.3/lib/json/Numeric.xpm +28 -0
- data/vendor/gems/json-1.1.3/lib/json/String.xpm +96 -0
- data/vendor/gems/json-1.1.3/lib/json/TrueClass.xpm +21 -0
- data/vendor/gems/json-1.1.3/lib/json/add/core.rb +135 -0
- data/vendor/gems/json-1.1.3/lib/json/add/rails.rb +58 -0
- data/vendor/gems/json-1.1.3/lib/json/common.rb +354 -0
- data/vendor/gems/json-1.1.3/lib/json/editor.rb +1362 -0
- data/vendor/gems/json-1.1.3/lib/json/ext.rb +13 -0
- data/vendor/gems/json-1.1.3/lib/json/json.xpm +1499 -0
- data/vendor/gems/json-1.1.3/lib/json/pure.rb +75 -0
- data/vendor/gems/json-1.1.3/lib/json/pure/generator.rb +394 -0
- data/vendor/gems/json-1.1.3/lib/json/pure/parser.rb +259 -0
- data/vendor/gems/json-1.1.3/lib/json/version.rb +9 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail1.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail10.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail11.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail12.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail13.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail14.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail18.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail19.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail2.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail20.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail21.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail22.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail23.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail24.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail25.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail27.json +2 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail28.json +2 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail3.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail4.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail5.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail6.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail7.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail8.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/fail9.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass1.json +56 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass15.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass16.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass17.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass2.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass26.json +1 -0
- data/vendor/gems/json-1.1.3/tests/fixtures/pass3.json +6 -0
- data/vendor/gems/json-1.1.3/tests/runner.rb +25 -0
- data/vendor/gems/json-1.1.3/tests/test_json.rb +293 -0
- data/vendor/gems/json-1.1.3/tests/test_json_addition.rb +161 -0
- data/vendor/gems/json-1.1.3/tests/test_json_fixtures.rb +30 -0
- data/vendor/gems/json-1.1.3/tests/test_json_generate.rb +100 -0
- data/vendor/gems/json-1.1.3/tests/test_json_rails.rb +118 -0
- data/vendor/gems/json-1.1.3/tests/test_json_unicode.rb +61 -0
- data/vendor/gems/json-1.1.3/tools/fuzz.rb +140 -0
- data/vendor/gems/json-1.1.3/tools/server.rb +62 -0
- data/vendor/plugins/localization/bin/make_language.rb +2 -2
- data/vendor/plugins/localization/lib/localization.rb +2 -2
- 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.rb +82 -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/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/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 +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/lib/xml_sidebar.rb +1 -1
- metadata +349 -16
- data/migrate.txt +0 -142
@@ -0,0 +1,37 @@
|
|
1
|
+
ActiveRecord::Associations::AssociationProxy.class_eval do
|
2
|
+
protected
|
3
|
+
def with_scope(*args, &block)
|
4
|
+
@reflection.klass.send :with_scope, *args, &block
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
[ ActiveRecord::Associations::AssociationCollection,
|
9
|
+
ActiveRecord::Associations::HasManyThroughAssociation ].each do |klass|
|
10
|
+
klass.class_eval do
|
11
|
+
protected
|
12
|
+
alias :method_missing_without_scopes :method_missing_without_paginate
|
13
|
+
def method_missing_without_paginate(method, *args, &block)
|
14
|
+
if @reflection.klass.scopes.include?(method)
|
15
|
+
@reflection.klass.scopes[method].call(self, *args, &block)
|
16
|
+
else
|
17
|
+
method_missing_without_scopes(method, *args, &block)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
# Rails 1.2.6
|
24
|
+
ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
|
25
|
+
protected
|
26
|
+
def method_missing(method, *args, &block)
|
27
|
+
if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
|
28
|
+
super
|
29
|
+
elsif @reflection.klass.scopes.include?(method)
|
30
|
+
@reflection.klass.scopes[method].call(self, *args)
|
31
|
+
else
|
32
|
+
@reflection.klass.with_scope(:find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false }) do
|
33
|
+
@reflection.klass.send(method, *args, &block)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end if ActiveRecord::Base.respond_to? :find_first
|
@@ -0,0 +1,383 @@
|
|
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.")
|
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
|
+
content = pagination + capture(&block) + pagination
|
145
|
+
concat content, block.binding
|
146
|
+
end
|
147
|
+
|
148
|
+
# Renders a helpful message with numbers of displayed vs. total entries.
|
149
|
+
# You can use this as a blueprint for your own, similar helpers.
|
150
|
+
#
|
151
|
+
# <%= page_entries_info @posts %>
|
152
|
+
# #-> Displaying posts 6 - 10 of 26 in total
|
153
|
+
#
|
154
|
+
# By default, the message will use the humanized class name of objects
|
155
|
+
# in collection: for instance, "project types" for ProjectType models.
|
156
|
+
# Override this with the <tt>:entry_name</tt> parameter:
|
157
|
+
#
|
158
|
+
# <%= page_entries_info @posts, :entry_name => 'item' %>
|
159
|
+
# #-> Displaying items 6 - 10 of 26 in total
|
160
|
+
def page_entries_info(collection, options = {})
|
161
|
+
entry_name = options[:entry_name] ||
|
162
|
+
(collection.empty?? 'entry' : collection.first.class.name.underscore.sub('_', ' '))
|
163
|
+
|
164
|
+
if collection.total_pages < 2
|
165
|
+
case collection.size
|
166
|
+
when 0; "No #{entry_name.pluralize} found"
|
167
|
+
when 1; "Displaying <b>1</b> #{entry_name}"
|
168
|
+
else; "Displaying <b>all #{collection.size}</b> #{entry_name.pluralize}"
|
169
|
+
end
|
170
|
+
else
|
171
|
+
%{Displaying #{entry_name.pluralize} <b>%d - %d</b> of <b>%d</b> in total} % [
|
172
|
+
collection.offset + 1,
|
173
|
+
collection.offset + collection.length,
|
174
|
+
collection.total_entries
|
175
|
+
]
|
176
|
+
end
|
177
|
+
end
|
178
|
+
|
179
|
+
def self.total_pages_for_collection(collection) #:nodoc:
|
180
|
+
if collection.respond_to?('page_count') and !collection.respond_to?('total_pages')
|
181
|
+
WillPaginate::Deprecation.warn <<-MSG
|
182
|
+
You are using a paginated collection of class #{collection.class.name}
|
183
|
+
which conforms to the old API of WillPaginate::Collection by using
|
184
|
+
`page_count`, while the current method name is `total_pages`. Please
|
185
|
+
upgrade yours or 3rd-party code that provides the paginated collection.
|
186
|
+
MSG
|
187
|
+
class << collection
|
188
|
+
def total_pages; page_count; end
|
189
|
+
end
|
190
|
+
end
|
191
|
+
collection.total_pages
|
192
|
+
end
|
193
|
+
end
|
194
|
+
|
195
|
+
# This class does the heavy lifting of actually building the pagination
|
196
|
+
# links. It is used by the <tt>will_paginate</tt> helper internally.
|
197
|
+
class LinkRenderer
|
198
|
+
|
199
|
+
# The gap in page links is represented by:
|
200
|
+
#
|
201
|
+
# <span class="gap">…</span>
|
202
|
+
attr_accessor :gap_marker
|
203
|
+
|
204
|
+
def initialize
|
205
|
+
@gap_marker = '<span class="gap">…</span>'
|
206
|
+
end
|
207
|
+
|
208
|
+
# * +collection+ is a WillPaginate::Collection instance or any other object
|
209
|
+
# that conforms to that API
|
210
|
+
# * +options+ are forwarded from +will_paginate+ view helper
|
211
|
+
# * +template+ is the reference to the template being rendered
|
212
|
+
def prepare(collection, options, template)
|
213
|
+
@collection = collection
|
214
|
+
@options = options
|
215
|
+
@template = template
|
216
|
+
|
217
|
+
# reset values in case we're re-using this instance
|
218
|
+
@total_pages = @param_name = @url_string = nil
|
219
|
+
end
|
220
|
+
|
221
|
+
# Process it! This method returns the complete HTML string which contains
|
222
|
+
# pagination links. Feel free to subclass LinkRenderer and change this
|
223
|
+
# method as you see fit.
|
224
|
+
def to_html
|
225
|
+
links = @options[:page_links] ? windowed_links : []
|
226
|
+
# previous/next buttons
|
227
|
+
links.unshift page_link_or_span(@collection.previous_page, 'disabled prev_page', @options[:previous_label])
|
228
|
+
links.push page_link_or_span(@collection.next_page, 'disabled next_page', @options[:next_label])
|
229
|
+
|
230
|
+
html = links.join(@options[:separator])
|
231
|
+
@options[:container] ? @template.content_tag(:div, html, html_attributes) : html
|
232
|
+
end
|
233
|
+
|
234
|
+
# Returns the subset of +options+ this instance was initialized with that
|
235
|
+
# represent HTML attributes for the container element of pagination links.
|
236
|
+
def html_attributes
|
237
|
+
return @html_attributes if @html_attributes
|
238
|
+
@html_attributes = @options.except *(WillPaginate::ViewHelpers.pagination_options.keys - [:class])
|
239
|
+
# pagination of Post models will have the ID of "posts_pagination"
|
240
|
+
if @options[:container] and @options[:id] === true
|
241
|
+
@html_attributes[:id] = @collection.first.class.name.underscore.pluralize + '_pagination'
|
242
|
+
end
|
243
|
+
@html_attributes
|
244
|
+
end
|
245
|
+
|
246
|
+
protected
|
247
|
+
|
248
|
+
# Collects link items for visible page numbers.
|
249
|
+
def windowed_links
|
250
|
+
prev = nil
|
251
|
+
|
252
|
+
visible_page_numbers.inject [] do |links, n|
|
253
|
+
# detect gaps:
|
254
|
+
links << gap_marker if prev and n > prev + 1
|
255
|
+
links << page_link_or_span(n, 'current')
|
256
|
+
prev = n
|
257
|
+
links
|
258
|
+
end
|
259
|
+
end
|
260
|
+
|
261
|
+
# Calculates visible page numbers using the <tt>:inner_window</tt> and
|
262
|
+
# <tt>:outer_window</tt> options.
|
263
|
+
def visible_page_numbers
|
264
|
+
inner_window, outer_window = @options[:inner_window].to_i, @options[:outer_window].to_i
|
265
|
+
window_from = current_page - inner_window
|
266
|
+
window_to = current_page + inner_window
|
267
|
+
|
268
|
+
# adjust lower or upper limit if other is out of bounds
|
269
|
+
if window_to > total_pages
|
270
|
+
window_from -= window_to - total_pages
|
271
|
+
window_to = total_pages
|
272
|
+
end
|
273
|
+
if window_from < 1
|
274
|
+
window_to += 1 - window_from
|
275
|
+
window_from = 1
|
276
|
+
window_to = total_pages if window_to > total_pages
|
277
|
+
end
|
278
|
+
|
279
|
+
visible = (1..total_pages).to_a
|
280
|
+
left_gap = (2 + outer_window)...window_from
|
281
|
+
right_gap = (window_to + 1)...(total_pages - outer_window)
|
282
|
+
visible -= left_gap.to_a if left_gap.last - left_gap.first > 1
|
283
|
+
visible -= right_gap.to_a if right_gap.last - right_gap.first > 1
|
284
|
+
|
285
|
+
visible
|
286
|
+
end
|
287
|
+
|
288
|
+
def page_link_or_span(page, span_class, text = nil)
|
289
|
+
text ||= page.to_s
|
290
|
+
|
291
|
+
if page and page != current_page
|
292
|
+
classnames = span_class && span_class.index(' ') && span_class.split(' ', 2).last
|
293
|
+
page_link page, text, :rel => rel_value(page), :class => classnames
|
294
|
+
else
|
295
|
+
page_span page, text, :class => span_class
|
296
|
+
end
|
297
|
+
end
|
298
|
+
|
299
|
+
def page_link(page, text, attributes = {})
|
300
|
+
@template.link_to text, url_for(page), attributes
|
301
|
+
end
|
302
|
+
|
303
|
+
def page_span(page, text, attributes = {})
|
304
|
+
@template.content_tag :span, text, attributes
|
305
|
+
end
|
306
|
+
|
307
|
+
# Returns URL params for +page_link_or_span+, taking the current GET params
|
308
|
+
# and <tt>:params</tt> option into account.
|
309
|
+
def url_for(page)
|
310
|
+
page_one = page == 1
|
311
|
+
unless @url_string and !page_one
|
312
|
+
@url_params = {}
|
313
|
+
# page links should preserve GET parameters
|
314
|
+
stringified_merge @url_params, @template.params if @template.request.get?
|
315
|
+
stringified_merge @url_params, @options[:params] if @options[:params]
|
316
|
+
|
317
|
+
if complex = param_name.index(/[^\w-]/)
|
318
|
+
page_param = (defined?(CGIMethods) ? CGIMethods : ActionController::AbstractRequest).
|
319
|
+
parse_query_parameters("#{param_name}=#{page}")
|
320
|
+
|
321
|
+
stringified_merge @url_params, page_param
|
322
|
+
else
|
323
|
+
@url_params[param_name] = page_one ? 1 : 2
|
324
|
+
end
|
325
|
+
|
326
|
+
url = @template.url_for(@url_params)
|
327
|
+
return url if page_one
|
328
|
+
|
329
|
+
if complex
|
330
|
+
@url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, '\1@')
|
331
|
+
return url
|
332
|
+
else
|
333
|
+
@url_string = url
|
334
|
+
@url_params[param_name] = 3
|
335
|
+
@template.url_for(@url_params).split(//).each_with_index do |char, i|
|
336
|
+
if char == '3' and url[i, 1] == '2'
|
337
|
+
@url_string[i] = '@'
|
338
|
+
break
|
339
|
+
end
|
340
|
+
end
|
341
|
+
end
|
342
|
+
end
|
343
|
+
# finally!
|
344
|
+
@url_string.sub '@', page.to_s
|
345
|
+
end
|
346
|
+
|
347
|
+
private
|
348
|
+
|
349
|
+
def rel_value(page)
|
350
|
+
case page
|
351
|
+
when @collection.previous_page; 'prev' + (page == 1 ? ' start' : '')
|
352
|
+
when @collection.next_page; 'next'
|
353
|
+
when 1; 'start'
|
354
|
+
end
|
355
|
+
end
|
356
|
+
|
357
|
+
def current_page
|
358
|
+
@collection.current_page
|
359
|
+
end
|
360
|
+
|
361
|
+
def total_pages
|
362
|
+
@total_pages ||= WillPaginate::ViewHelpers.total_pages_for_collection(@collection)
|
363
|
+
end
|
364
|
+
|
365
|
+
def param_name
|
366
|
+
@param_name ||= @options[:param_name].to_s
|
367
|
+
end
|
368
|
+
|
369
|
+
# Recursively merge into target hash by using stringified keys from the other one
|
370
|
+
def stringified_merge(target, other)
|
371
|
+
other.each do |key, value|
|
372
|
+
key = key.to_s # this line is what it's all about!
|
373
|
+
existing = target[key]
|
374
|
+
|
375
|
+
if value.is_a?(Hash) and (existing.is_a?(Hash) or existing.nil?)
|
376
|
+
stringified_merge(existing || (target[key] = {}), value)
|
377
|
+
else
|
378
|
+
target[key] = value
|
379
|
+
end
|
380
|
+
end
|
381
|
+
end
|
382
|
+
end
|
383
|
+
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
|