radiant 0.7.2 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of radiant might be problematic. Click here for more details.
- data/CHANGELOG +295 -195
- data/CONTRIBUTORS +14 -2
- data/INSTALL +0 -0
- data/LICENSE +0 -0
- data/README +0 -0
- data/Rakefile +0 -0
- data/app/controllers/admin/export_controller.rb +0 -0
- data/app/controllers/admin/extensions_controller.rb +6 -0
- data/app/controllers/admin/layouts_controller.rb +4 -0
- data/app/controllers/admin/page_parts_controller.rb +1 -1
- data/app/controllers/admin/pages_controller.rb +13 -5
- data/app/controllers/admin/preferences_controller.rb +1 -1
- data/app/controllers/admin/references_controller.rb +0 -0
- data/app/controllers/admin/resource_controller.rb +12 -14
- data/app/controllers/admin/snippets_controller.rb +3 -0
- data/app/controllers/admin/users_controller.rb +4 -0
- data/app/controllers/admin/welcome_controller.rb +2 -2
- data/app/controllers/{application.rb → application_controller.rb} +13 -1
- data/app/controllers/site_controller.rb +21 -21
- data/app/helpers/admin/abstract_model_helper.rb +0 -0
- data/app/helpers/admin/export_helper.rb +0 -0
- data/app/helpers/admin/extensions_helper.rb +0 -0
- data/app/helpers/admin/layouts_helper.rb +0 -0
- data/app/helpers/admin/node_helper.rb +0 -0
- data/app/helpers/admin/pages_helper.rb +1 -1
- data/app/helpers/admin/preferences_helper.rb +0 -0
- data/app/helpers/admin/references_helper.rb +1 -1
- data/app/helpers/admin/regions_helper.rb +8 -8
- data/app/helpers/admin/snippets_helper.rb +0 -0
- data/app/helpers/admin/users_helper.rb +0 -0
- data/app/helpers/admin/welcome_helper.rb +0 -0
- data/app/helpers/application_helper.rb +1 -1
- data/app/helpers/site_helper.rb +0 -0
- data/app/models/env_dump_page.rb +0 -0
- data/app/models/file_not_found_page.rb +3 -3
- data/app/models/layout.rb +2 -2
- data/app/models/page.rb +59 -78
- data/app/models/page_context.rb +0 -0
- data/app/models/page_part.rb +3 -3
- data/app/models/radiant/config.rb +23 -23
- data/app/models/radiant/exporter.rb +0 -0
- data/app/models/snippet.rb +3 -3
- data/app/models/standard_tags.rb +11 -2
- data/app/models/status.rb +0 -0
- data/app/models/text_filter.rb +0 -0
- data/app/models/user.rb +14 -5
- data/app/models/user_action_observer.rb +0 -0
- data/app/views/admin/extensions/index.html.haml +0 -0
- data/app/views/admin/layouts/_form.html.haml +0 -0
- data/app/views/admin/layouts/edit.html.haml +0 -0
- data/app/views/admin/layouts/index.html.haml +0 -0
- data/app/views/admin/layouts/new.html.haml +0 -0
- data/app/views/admin/layouts/remove.html.haml +0 -0
- data/app/views/admin/page_parts/_page_part.html.haml +5 -3
- data/app/views/admin/pages/_edit_styles.html.haml +0 -0
- data/app/views/admin/pages/_fields.html.haml +0 -0
- data/app/views/admin/pages/_meta_row.html.haml +0 -0
- data/app/views/admin/pages/_node.html.haml +0 -0
- data/app/views/admin/pages/_popups.html.haml +2 -1
- data/app/views/admin/pages/children.html.haml +0 -0
- data/app/views/admin/pages/edit.html.haml +0 -0
- data/app/views/admin/pages/index.html.haml +0 -0
- data/app/views/admin/pages/new.html.haml +0 -0
- data/app/views/admin/pages/remove.html.haml +0 -0
- data/app/views/admin/preferences/edit.html.haml +0 -0
- data/app/views/admin/references/_tag_reference.haml +0 -0
- data/app/views/admin/references/filters.js.erb +0 -0
- data/app/views/admin/references/tags.js.erb +0 -0
- data/app/views/admin/snippets/_form.html.haml +0 -0
- data/app/views/admin/snippets/edit.html.haml +0 -0
- data/app/views/admin/snippets/index.html.haml +0 -0
- data/app/views/admin/snippets/new.html.haml +0 -0
- data/app/views/admin/snippets/remove.html.haml +0 -0
- data/app/views/admin/users/_form.html.haml +0 -0
- data/app/views/admin/users/edit.html.haml +0 -0
- data/app/views/admin/users/index.html.haml +0 -0
- data/app/views/admin/users/new.html.haml +0 -0
- data/app/views/admin/users/remove.html.haml +0 -0
- data/app/views/admin/welcome/login.html.haml +0 -0
- data/app/views/layouts/application.html.haml +0 -0
- data/app/views/site/not_found.html.haml +0 -0
- data/config/boot.rb +5 -4
- data/config/database.mysql.yml +0 -0
- data/config/database.postgresql.yml +0 -0
- data/config/database.sqlite.yml +1 -1
- data/config/database.sqlserver.yml +0 -0
- data/config/environment.rb +30 -43
- data/config/environments/development.rb +1 -2
- data/config/environments/production.rb +0 -1
- data/config/environments/test.rb +6 -2
- data/config/routes.rb +0 -0
- data/db/migrate/001_create_radiant_tables.rb +0 -0
- data/db/migrate/002_insert_initial_data.rb +0 -0
- data/db/migrate/003_rename_behavior_column.rb +0 -0
- data/db/migrate/004_rename_filter_column.rb +0 -0
- data/db/migrate/005_add_virtual_column_to_page.rb +0 -0
- data/db/migrate/006_integer_columns_to_boolean.rb +0 -0
- data/db/migrate/007_remove_virtual_column_from_page.rb +0 -0
- data/db/migrate/008_add_virtual_column_to_page_again.rb +0 -0
- data/db/migrate/009_add_content_type_field_to_layout.rb +0 -0
- data/db/migrate/010_merge_behaviors_and_pages.rb +0 -0
- data/db/migrate/011_rename_type_column_on_page_to_class_name.rb +0 -0
- data/db/migrate/012_create_extension_meta.rb +0 -0
- data/db/migrate/013_add_notes_field_to_user.rb +0 -0
- data/db/migrate/014_rename_config_default_parts_key.rb +0 -0
- data/db/migrate/015_add_optimistic_locking.rb +0 -0
- data/db/migrate/016_add_sessions.rb +0 -0
- data/db/migrate/017_rename_created_by_updated_by_columns.rb +0 -0
- data/db/migrate/018_add_description_and_keywords_to_pages.rb +0 -0
- data/db/migrate/019_add_salt_to_users.rb +0 -0
- data/db/migrate/020_add_session_info_to_users.rb +0 -0
- data/db/migrate/021_remove_session_expire_from_users.rb +0 -0
- data/db/migrate/20081203140407_add_indexes.rb +0 -0
- data/db/schema.rb +1 -1
- data/db/templates/empty.yml +0 -0
- data/db/templates/roasters.yml +0 -0
- data/db/templates/simple-blog.yml +0 -0
- data/db/templates/styled-blog.yml +0 -0
- data/features/admin/content_negotiation.feature +24 -0
- data/features/admin/layouts_management.feature +10 -0
- data/features/admin/pages_management.feature +71 -0
- data/features/admin/snippets_management.feature +54 -0
- data/features/admin/user_permissions.feature +149 -0
- data/features/admin/user_preferences.feature +18 -0
- data/features/admin/users_management.feature +63 -0
- data/features/page_serving.feature +42 -0
- data/features/step_definitions/admin/admin_steps.rb +31 -0
- data/features/step_definitions/admin/content_negotiation_steps.rb +37 -0
- data/features/step_definitions/admin/pages_management_steps.rb +14 -0
- data/features/step_definitions/admin/users_management_steps.rb +12 -0
- data/features/step_definitions/page_serving_steps.rb +65 -0
- data/features/step_definitions/webrat_steps.rb +117 -0
- data/features/support/env.rb +23 -0
- data/features/support/paths.rb +14 -0
- data/lib/annotatable.rb +0 -0
- data/lib/autotest/discover.rb +0 -0
- data/lib/autotest/radiant_rails_rspec.rb +0 -0
- data/lib/generators/extension/USAGE +0 -0
- data/lib/generators/extension/extension_generator.rb +0 -0
- data/lib/generators/extension/templates/README +0 -0
- data/lib/generators/extension/templates/RSpecRakefile +0 -0
- data/lib/generators/extension/templates/extension.rb +0 -0
- data/lib/generators/extension/templates/functional_test.rb +0 -0
- data/lib/generators/extension/templates/migration.rb +0 -0
- data/lib/generators/extension/templates/spec.opts +0 -0
- data/lib/generators/extension/templates/spec_helper.rb +0 -0
- data/lib/generators/extension/templates/tasks.rake +2 -2
- data/lib/generators/extension/templates/test_helper.rb +0 -0
- data/lib/generators/extension_controller/USAGE +0 -0
- data/lib/generators/extension_controller/extension_controller_generator.rb +0 -0
- data/lib/generators/extension_controller/templates/controller.rb +0 -0
- data/lib/generators/extension_controller/templates/controller_spec.rb +0 -0
- data/lib/generators/extension_controller/templates/functional_test.rb +0 -0
- data/lib/generators/extension_controller/templates/helper.rb +0 -0
- data/lib/generators/extension_controller/templates/helper_spec.rb +0 -0
- data/lib/generators/extension_controller/templates/helper_test.rb +4 -0
- data/lib/generators/extension_controller/templates/view.html.erb +0 -0
- data/lib/generators/extension_controller/templates/view_spec.rb +0 -0
- data/lib/generators/extension_mailer/USAGE +0 -0
- data/lib/generators/extension_mailer/extension_mailer_generator.rb +0 -0
- data/lib/generators/extension_mailer/templates/fixture.erb +0 -0
- data/lib/generators/extension_mailer/templates/mailer.rb +0 -0
- data/lib/generators/extension_mailer/templates/unit_test.rb +0 -0
- data/lib/generators/extension_mailer/templates/view.erb +0 -0
- data/lib/generators/extension_migration/USAGE +0 -0
- data/lib/generators/extension_migration/extension_migration_generator.rb +0 -0
- data/lib/generators/extension_migration/templates/migration.rb +0 -0
- data/lib/generators/extension_model/USAGE +0 -0
- data/lib/generators/extension_model/extension_model_generator.rb +0 -0
- data/lib/generators/extension_model/templates/fixtures.yml +0 -0
- data/lib/generators/extension_model/templates/migration.rb +0 -0
- data/lib/generators/extension_model/templates/model.rb +0 -0
- data/lib/generators/extension_model/templates/model_spec.rb +0 -0
- data/lib/generators/extension_model/templates/unit_test.rb +0 -0
- data/lib/generators/generator_base_extension.rb +0 -0
- data/lib/generators/instance/instance_generator.rb +0 -0
- data/lib/generators/instance/templates/databases/mysql.yml +0 -0
- data/lib/generators/instance/templates/databases/postgresql.yml +0 -0
- data/lib/generators/instance/templates/databases/sqlite3.yml +0 -0
- data/lib/generators/instance/templates/databases/sqlserver.yml +0 -0
- data/lib/generators/instance/templates/instance_boot.rb +1 -4
- data/lib/generators/instance/templates/instance_environment.rb +36 -44
- data/lib/generators/instance/templates/instance_generate +0 -0
- data/lib/generators/instance/templates/instance_rakefile +0 -0
- data/lib/generators/instance/templates/instance_routes.rb +0 -0
- data/lib/inheritable_class_attributes.rb +0 -0
- data/lib/local_time.rb +0 -0
- data/lib/login_system.rb +59 -40
- data/lib/method_observer.rb +0 -0
- data/lib/plugins/active_record_extensions/init.rb +0 -0
- data/lib/plugins/active_record_extensions/lib/active_record_extensions.rb +0 -0
- data/lib/plugins/extension_patches/init.rb +1 -3
- data/lib/plugins/extension_patches/lib/routing_extension.rb +0 -0
- data/lib/plugins/object_extensions/init.rb +0 -0
- data/lib/plugins/object_extensions/lib/object_extensions.rb +0 -0
- data/lib/plugins/response_cache_timeout/init.rb +1 -1
- data/lib/plugins/string_extensions/init.rb +0 -0
- data/lib/plugins/string_extensions/lib/string_extensions.rb +10 -9
- data/lib/plugins/symbol_extensions/init.rb +0 -0
- data/lib/plugins/symbol_extensions/lib/symbol_extensions.rb +2 -4
- data/lib/radiant.rb +2 -2
- data/lib/radiant/admin_ui.rb +0 -0
- data/lib/radiant/admin_ui/region_partials.rb +0 -0
- data/lib/radiant/admin_ui/region_set.rb +0 -0
- data/lib/radiant/cache.rb +84 -0
- data/lib/radiant/extension.rb +0 -0
- data/lib/radiant/extension/script.rb +0 -0
- data/lib/radiant/extension_loader.rb +1 -1
- data/lib/radiant/extension_migrator.rb +0 -0
- data/lib/radiant/initializer.rb +33 -8
- data/lib/radiant/legacy_routes.rb +0 -0
- data/lib/radiant/resource_responses.rb +0 -0
- data/lib/radiant/setup.rb +1 -1
- data/lib/radiant/taggable.rb +0 -0
- data/lib/simpleton.rb +0 -0
- data/lib/tasks/cucumber.rake +17 -0
- data/lib/tasks/database.rake +0 -0
- data/lib/tasks/environments.rake +0 -0
- data/lib/tasks/extensions.rake +0 -0
- data/lib/tasks/framework.rake +49 -16
- data/lib/tasks/instance.rake +0 -0
- data/lib/tasks/release.rake +8 -3
- data/lib/tasks/rspec.rake +178 -130
- data/lib/tasks/undefine.rake +0 -0
- data/log/.keep +0 -0
- data/public/.htaccess +0 -0
- data/public/404.html +0 -0
- data/public/500.html +0 -0
- data/public/favicon.ico +0 -0
- data/public/images/admin/add-child.png +0 -0
- data/public/images/admin/clear-page-cache.png +0 -0
- data/public/images/admin/collapse.png +0 -0
- data/public/images/admin/expand.png +0 -0
- data/public/images/admin/layout.png +0 -0
- data/public/images/admin/minus.png +0 -0
- data/public/images/admin/new-homepage.png +0 -0
- data/public/images/admin/new-layout.png +0 -0
- data/public/images/admin/new-snippet.png +0 -0
- data/public/images/admin/new-user.png +0 -0
- data/public/images/admin/page.png +0 -0
- data/public/images/admin/plus.png +0 -0
- data/public/images/admin/remove-disabled.png +0 -0
- data/public/images/admin/remove.png +0 -0
- data/public/images/admin/snippet.png +0 -0
- data/public/images/admin/spinner.gif +0 -0
- data/public/images/admin/virtual-page.png +0 -0
- data/public/javascripts/admin/admin.js +1 -0
- data/public/javascripts/admin/ruledtable.js +0 -0
- data/public/javascripts/admin/sitemap.js +0 -0
- data/public/javascripts/admin/tabcontrol.js +6 -0
- data/public/javascripts/application.js +0 -0
- data/public/javascripts/controls.js +72 -72
- data/public/javascripts/dragdrop.js +165 -164
- data/public/javascripts/effects.js +173 -165
- data/public/javascripts/pngfix.js +0 -0
- data/public/javascripts/prototype.js +362 -267
- data/public/javascripts/string.js +0 -0
- data/public/robots.txt +0 -0
- data/public/stylesheets/admin/main.css +0 -0
- data/script/cucumber +8 -0
- data/spec/controllers/admin/export_controller_spec.rb +0 -0
- data/spec/controllers/admin/extensions_controller_spec.rb +23 -8
- data/spec/controllers/admin/layouts_controller_spec.rb +41 -1
- data/spec/controllers/admin/pages_controller_spec.rb +73 -25
- data/spec/controllers/admin/preferences_controller_spec.rb +6 -0
- data/spec/controllers/admin/references_controller_spec.rb +0 -0
- data/spec/controllers/admin/snippets_controller_spec.rb +71 -18
- data/spec/controllers/admin/users_controller_spec.rb +44 -0
- data/spec/controllers/admin/welcome_controller_spec.rb +10 -1
- data/spec/controllers/application_controller_spec.rb +25 -4
- data/spec/controllers/site_controller_spec.rb +49 -12
- data/spec/datasets/config_dataset.rb +11 -0
- data/spec/datasets/file_not_found_dataset.rb +0 -0
- data/spec/datasets/home_page_dataset.rb +0 -0
- data/spec/datasets/layouts_dataset.rb +0 -0
- data/spec/datasets/markup_pages_dataset.rb +0 -0
- data/spec/datasets/pages_dataset.rb +5 -0
- data/spec/datasets/pages_with_layouts_dataset.rb +0 -0
- data/spec/datasets/snippets_dataset.rb +0 -0
- data/spec/datasets/users_and_pages_dataset.rb +0 -0
- data/spec/datasets/users_dataset.rb +0 -0
- data/spec/fixtures/example_extension/README +0 -0
- data/spec/fixtures/example_extension/Rakefile +0 -0
- data/spec/fixtures/example_extension/example_extension.rb +0 -0
- data/spec/fixtures/example_extension/lib/tasks/example_extension_tasks.rake +0 -0
- data/spec/fixtures/example_extension/spec/spec.opts +0 -0
- data/spec/fixtures/example_extension/spec/spec_helper.rb +0 -0
- data/spec/fixtures/sample.txt +0 -0
- data/spec/generators/extension_controller_generator_spec.rb +0 -0
- data/spec/generators/extension_generator_spec.rb +0 -0
- data/spec/generators/extension_generators_spec_helper.rb +0 -0
- data/spec/generators/extension_mailer_generator_spec.rb +0 -0
- data/spec/generators/extension_migration_generator_spec.rb +0 -0
- data/spec/generators/extension_model_generator_spec.rb +0 -0
- data/spec/helpers/admin/abstract_model_helper_spec.rb +0 -0
- data/spec/helpers/admin/export_helper_spec.rb +0 -0
- data/spec/helpers/admin/extensions_helper_spec.rb +0 -0
- data/spec/helpers/admin/layouts_helper_spec.rb +0 -0
- data/spec/helpers/admin/node_helper_spec.rb +0 -0
- data/spec/helpers/admin/pages_helper_spec.rb +0 -0
- data/spec/helpers/admin/preferences_helper_spec.rb +0 -0
- data/spec/helpers/admin/references_helper_spec.rb +0 -0
- data/spec/helpers/admin/regions_helper_spec.rb +6 -9
- data/spec/helpers/admin/snippets_helper_spec.rb +0 -0
- data/spec/helpers/admin/users_helper_spec.rb +0 -0
- data/spec/helpers/admin/welcome_helper_spec.rb +0 -0
- data/spec/helpers/application_helper_spec.rb +0 -0
- data/spec/helpers/site_helper_spec.rb +0 -0
- data/spec/lib/annotatable_spec.rb +0 -0
- data/spec/lib/autotest_spec.rb +0 -0
- data/spec/lib/core_ext/string_ext_spec.rb +5 -4
- data/spec/lib/inheritable_class_attributes_spec.rb +0 -0
- data/spec/lib/local_time_spec.rb +0 -0
- data/spec/lib/login_system_spec.rb +29 -35
- data/spec/lib/method_observer_spec.rb +0 -0
- data/spec/lib/radiant/admin_ui/region_partials_spec.rb +0 -0
- data/spec/lib/radiant/admin_ui/region_set_spec.rb +0 -0
- data/spec/lib/radiant/admin_ui_spec.rb +0 -0
- data/spec/lib/radiant/extension/script_spec.rb +0 -0
- data/spec/lib/radiant/extension_loader_spec.rb +32 -23
- data/spec/lib/radiant/extension_migrator_spec.rb +0 -0
- data/spec/lib/radiant/extension_spec.rb +0 -0
- data/spec/lib/radiant/initializer_spec.rb +17 -0
- data/spec/lib/radiant/legacy_routes_spec.rb +0 -0
- data/spec/lib/radiant/resource_responses_spec.rb +0 -0
- data/spec/lib/radiant/taggable_spec.rb +0 -0
- data/spec/lib/radiant_spec.rb +0 -0
- data/spec/lib/simpleton_spec.rb +0 -0
- data/spec/matchers/autotest_matchers.rb +0 -0
- data/spec/matchers/generator_matchers.rb +0 -0
- data/spec/matchers/login_system_matcher.rb +0 -0
- data/spec/matchers/render_form_errors_matcher.rb +0 -0
- data/spec/matchers/render_matcher.rb +9 -4
- data/spec/models/env_dump_page_spec.rb +0 -0
- data/spec/models/file_not_found_page_spec.rb +2 -2
- data/spec/models/layout_spec.rb +0 -0
- data/spec/models/page_context_spec.rb +0 -0
- data/spec/models/page_part_spec.rb +0 -0
- data/spec/models/page_spec.rb +23 -30
- data/spec/models/radiant/config_spec.rb +17 -1
- data/spec/models/radiant/exporter_spec.rb +0 -0
- data/spec/models/snippet_spec.rb +0 -0
- data/spec/models/standard_tags_spec.rb +17 -3
- data/spec/models/status_spec.rb +0 -0
- data/spec/models/text_filter_spec.rb +0 -0
- data/spec/models/user_action_observer_spec.rb +0 -0
- data/spec/models/user_spec.rb +15 -0
- data/spec/rcov.opts +0 -0
- data/spec/spec.opts +1 -1
- data/spec/spec_helper.rb +12 -45
- data/test/fixtures/extensions/01_basic/app/controllers/basic_extension_controller.rb +0 -0
- data/test/fixtures/extensions/01_basic/app/models/basic_extension_mailer.rb +0 -0
- data/test/fixtures/extensions/01_basic/app/models/basic_extension_model.rb +0 -0
- data/test/fixtures/extensions/01_basic/app/views/basic_extension/index.html.erb +0 -0
- data/test/fixtures/extensions/01_basic/app/views/basic_extension/override.html.erb +0 -0
- data/test/fixtures/extensions/01_basic/app/views/basic_extension_mailer/message.text.html.erb +0 -0
- data/test/fixtures/extensions/01_basic/basic_extension.rb +0 -0
- data/test/fixtures/extensions/01_basic/db/migrate/200812131420_create_initial_schema.rb +0 -0
- data/test/fixtures/extensions/01_basic/db/migrate/200812131421_modify_initial_schema.rb +0 -0
- data/test/fixtures/extensions/01_basic/lib/new_module.rb +0 -0
- data/test/fixtures/extensions/01_basic/vendor/plugins/multiple/init.rb +0 -0
- data/test/fixtures/extensions/01_basic/vendor/plugins/multiple/lib/multiple.rb +0 -0
- data/test/fixtures/extensions/01_basic/vendor/plugins/plugin_normal/init.rb +0 -0
- data/test/fixtures/extensions/01_basic/vendor/plugins/plugin_normal/lib/normal_plugin.rb +0 -0
- data/test/fixtures/extensions/02_overriding/app/views/basic_extension/override.html.erb +0 -0
- data/test/fixtures/extensions/02_overriding/overriding_extension.rb +0 -0
- data/test/fixtures/extensions/02_overriding/vendor/plugins/multiple/init.rb +0 -0
- data/test/fixtures/extensions/02_overriding/vendor/plugins/multiple/lib/multiple.rb +0 -0
- data/test/fixtures/extensions/03_upgrading/db/migrate/01_first.rb +0 -0
- data/test/fixtures/extensions/03_upgrading/db/migrate/02_second.rb +0 -0
- data/test/fixtures/extensions/03_upgrading/db/migrate/03_pending.rb +0 -0
- data/test/fixtures/extensions/03_upgrading/db/migrate/04_dont_run.rb +0 -0
- data/test/fixtures/extensions/03_upgrading/upgrading_extension.rb +0 -0
- data/test/fixtures/extensions/load_order_blue/load_order_blue_extension.rb +0 -0
- data/test/fixtures/extensions/load_order_green/load_order_green_extension.rb +0 -0
- data/test/fixtures/extensions/load_order_red/load_order_red_extension.rb +0 -0
- data/test/fixtures/extensions/special_characters/db/migrate/001_create_initial_schema.rb +0 -0
- data/test/fixtures/extensions/special_characters/special_characters_extension.rb +0 -0
- data/test/helpers/page_test_helper.rb +0 -0
- data/test/helpers/render_test_helper.rb +0 -0
- data/test/helpers/user_test_helper.rb +0 -0
- data/test/test_helper.rb +0 -0
- data/vendor/extensions/archive/README +0 -0
- data/vendor/extensions/archive/Rakefile +0 -0
- data/vendor/extensions/archive/app/models/archive_finder.rb +0 -0
- data/vendor/extensions/archive/archive_extension.rb +0 -0
- data/vendor/extensions/archive/lib/tasks/archive_extension_tasks.rake +0 -0
- data/vendor/extensions/archive/spec/datasets/archive_dataset.rb +0 -0
- data/vendor/extensions/archive/spec/models/archive_day_index_page_spec.rb +0 -0
- data/vendor/extensions/archive/spec/models/archive_month_index_page_spec.rb +0 -0
- data/vendor/extensions/archive/spec/models/archive_page_spec.rb +0 -0
- data/vendor/extensions/archive/spec/models/archive_year_index_page_spec.rb +0 -0
- data/vendor/extensions/archive/spec/spec.opts +0 -0
- data/vendor/extensions/archive/spec/spec_helper.rb +0 -0
- data/vendor/extensions/archive/test/fixtures/pages.yml +0 -0
- data/vendor/extensions/archive/test/functional/archive_extension_test.rb +0 -0
- data/vendor/extensions/archive/test/test_helper.rb +0 -0
- data/vendor/extensions/markdown_filter/README +0 -0
- data/vendor/extensions/markdown_filter/Rakefile +0 -0
- data/vendor/extensions/markdown_filter/lib/markdown_filter.rb +0 -0
- data/vendor/extensions/markdown_filter/lib/markdown_tags.rb +0 -0
- data/vendor/extensions/markdown_filter/lib/smarty_pants_filter.rb +0 -0
- data/vendor/extensions/markdown_filter/lib/tasks/markdown_filter_extension_tasks.rake +0 -0
- data/vendor/extensions/markdown_filter/lib/tasks/textile_filter_extension_tasks.rake +0 -0
- data/vendor/extensions/markdown_filter/markdown.html +0 -0
- data/vendor/extensions/markdown_filter/markdown_filter_extension.rb +0 -0
- data/vendor/extensions/markdown_filter/smartypants.html +0 -0
- data/vendor/extensions/markdown_filter/spec/models/markdown_filter_spec.rb +0 -0
- data/vendor/extensions/markdown_filter/spec/models/smarty_pants_filter_spec.rb +0 -0
- data/vendor/extensions/markdown_filter/spec/spec.opts +0 -0
- data/vendor/extensions/markdown_filter/spec/spec_helper.rb +0 -0
- data/vendor/extensions/markdown_filter/test/test_helper.rb +0 -0
- data/vendor/extensions/markdown_filter/test/unit/markdown_filter_test.rb +0 -0
- data/vendor/extensions/markdown_filter/test/unit/smarty_pants_filter_test.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/CHANGES +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/LICENSE +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/README +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/bin/bluecloth +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/install.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/lib/bluecloth.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/test.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/00_Class.tests.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/05_Markdown.tests.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/10_Bug.tests.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/15_Contrib.tests.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/bctestcase.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/data/antsugar.txt +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/data/ml-announce.txt +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/data/re-overflow.txt +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/tests/data/re-overflow2.txt +0 -0
- data/vendor/extensions/markdown_filter/vendor/bluecloth/utils.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/rubypants/README +0 -0
- data/vendor/extensions/markdown_filter/vendor/rubypants/Rakefile +0 -0
- data/vendor/extensions/markdown_filter/vendor/rubypants/install.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/rubypants/rubypants.rb +0 -0
- data/vendor/extensions/markdown_filter/vendor/rubypants/test_rubypants.rb +0 -0
- data/vendor/extensions/textile_filter/README +0 -0
- data/vendor/extensions/textile_filter/Rakefile +0 -0
- data/vendor/extensions/textile_filter/lib/tasks/textile_filter_extension_tasks.rake +0 -0
- data/vendor/extensions/textile_filter/lib/textile_filter.rb +0 -0
- data/vendor/extensions/textile_filter/lib/textile_tags.rb +0 -0
- data/vendor/extensions/textile_filter/spec/models/textile_filter_spec.rb +0 -0
- data/vendor/extensions/textile_filter/spec/spec.opts +0 -0
- data/vendor/extensions/textile_filter/spec/spec_helper.rb +0 -0
- data/vendor/extensions/textile_filter/test/test_helper.rb +0 -0
- data/vendor/extensions/textile_filter/test/unit/textile_filter_test.rb +0 -0
- data/vendor/extensions/textile_filter/textile.html +0 -0
- data/vendor/extensions/textile_filter/textile_filter_extension.rb +0 -0
- data/vendor/highline/CHANGELOG +39 -0
- data/vendor/highline/INSTALL +0 -0
- data/vendor/highline/LICENSE +1 -1
- data/vendor/highline/README +0 -0
- data/vendor/highline/Rakefile +1 -1
- data/vendor/highline/TODO +0 -0
- data/vendor/highline/examples/ansi_colors.rb +0 -0
- data/vendor/highline/examples/asking_for_arrays.rb +0 -0
- data/vendor/highline/examples/basic_usage.rb +0 -0
- data/vendor/highline/examples/color_scheme.rb +0 -0
- data/vendor/highline/examples/limit.rb +12 -0
- data/vendor/highline/examples/menus.rb +0 -0
- data/vendor/highline/examples/overwrite.rb +0 -0
- data/vendor/highline/examples/page_and_wrap.rb +0 -0
- data/vendor/highline/examples/password.rb +0 -0
- data/vendor/highline/examples/trapping_eof.rb +0 -0
- data/vendor/highline/examples/using_readline.rb +1 -1
- data/vendor/highline/lib/highline.rb +86 -32
- data/vendor/highline/lib/highline/color_scheme.rb +0 -0
- data/vendor/highline/lib/highline/compatibility.rb +17 -0
- data/vendor/highline/lib/highline/import.rb +0 -0
- data/vendor/highline/lib/highline/menu.rb +0 -0
- data/vendor/highline/lib/highline/question.rb +3 -2
- data/vendor/highline/lib/highline/system_extensions.rb +93 -25
- data/vendor/highline/setup.rb +0 -0
- data/vendor/highline/test/tc_color_scheme.rb +0 -0
- data/vendor/highline/test/tc_highline.rb +46 -3
- data/vendor/highline/test/tc_import.rb +0 -0
- data/vendor/highline/test/tc_menu.rb +0 -0
- data/vendor/highline/test/ts_all.rb +0 -0
- data/vendor/plugins/acts_as_tree/README +0 -0
- data/vendor/plugins/acts_as_tree/Rakefile +0 -0
- data/vendor/plugins/acts_as_tree/init.rb +0 -0
- data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +0 -0
- data/vendor/plugins/acts_as_tree/test/abstract_unit.rb +0 -0
- data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +0 -0
- data/vendor/plugins/acts_as_tree/test/database.yml +0 -0
- data/vendor/plugins/acts_as_tree/test/fixtures/mixin.rb +0 -0
- data/vendor/plugins/acts_as_tree/test/fixtures/mixins.yml +0 -0
- data/vendor/plugins/acts_as_tree/test/schema.rb +0 -0
- data/vendor/plugins/dataset/CHANGELOG +58 -0
- data/vendor/plugins/dataset/LICENSE +1 -1
- data/vendor/plugins/dataset/{README.txt → README} +0 -0
- data/vendor/plugins/dataset/Rakefile +16 -8
- data/vendor/plugins/dataset/TODO +2 -6
- data/vendor/plugins/dataset/VERSION.yml +4 -0
- data/vendor/plugins/dataset/dataset.gemspec +27 -0
- data/vendor/plugins/dataset/lib/dataset.rb +3 -1
- data/vendor/plugins/dataset/lib/dataset/base.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/collection.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/database/base.rb +1 -1
- data/vendor/plugins/dataset/lib/dataset/database/mysql.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/database/postgresql.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/database/sqlite3.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/extensions/cucumber.rb +20 -0
- data/vendor/plugins/dataset/lib/dataset/extensions/rspec.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/extensions/test_unit.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/instance_methods.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/load.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/record/fixture.rb +28 -9
- data/vendor/plugins/dataset/lib/dataset/record/meta.rb +31 -7
- data/vendor/plugins/dataset/lib/dataset/record/model.rb +15 -6
- data/vendor/plugins/dataset/lib/dataset/resolver.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/session.rb +0 -0
- data/vendor/plugins/dataset/lib/dataset/session_binding.rb +56 -38
- data/vendor/plugins/dataset/lib/dataset/version.rb +0 -0
- data/vendor/plugins/dataset/spec/dataset/cucumber_spec.rb +54 -0
- data/vendor/plugins/dataset/spec/dataset/database/base_spec.rb +3 -3
- data/vendor/plugins/dataset/spec/dataset/record/meta_spec.rb +14 -0
- data/vendor/plugins/dataset/spec/dataset/resolver_spec.rb +1 -1
- data/vendor/plugins/dataset/spec/dataset/rspec_spec.rb +107 -111
- data/vendor/plugins/dataset/spec/dataset/session_binding_spec.rb +42 -4
- data/vendor/plugins/dataset/spec/dataset/session_spec.rb +1 -1
- data/vendor/plugins/dataset/spec/dataset/test_unit_spec.rb +2 -1
- data/vendor/plugins/dataset/spec/fixtures/datasets/constant_not_defined.rb +0 -0
- data/vendor/plugins/dataset/spec/fixtures/datasets/ending_with_dataset.rb +0 -0
- data/vendor/plugins/dataset/spec/fixtures/datasets/exact_name.rb +0 -0
- data/vendor/plugins/dataset/spec/fixtures/datasets/not_a_dataset_base.rb +0 -0
- data/vendor/plugins/dataset/spec/fixtures/more_datasets/in_another_directory.rb +0 -0
- data/vendor/plugins/dataset/spec/models.rb +14 -2
- data/vendor/plugins/dataset/spec/schema.rb +3 -1
- data/vendor/plugins/dataset/spec/spec.opts +0 -0
- data/vendor/plugins/dataset/spec/spec_helper.rb +7 -9
- data/vendor/plugins/dataset/spec/stubs/mini_rails.rb +18 -0
- data/vendor/plugins/dataset/spec/stubs/test_help.rb +1 -0
- data/vendor/plugins/dataset/tasks/dataset.rake +0 -0
- data/vendor/plugins/haml/FAQ +0 -0
- data/vendor/plugins/haml/MIT-LICENSE +0 -0
- data/vendor/plugins/haml/README.rdoc +4 -4
- data/vendor/plugins/haml/REVISION +0 -0
- data/vendor/plugins/haml/Rakefile +35 -1
- data/vendor/plugins/haml/VERSION +1 -1
- data/vendor/plugins/haml/bin/haml +2 -1
- data/vendor/plugins/haml/extra/haml-mode.el +331 -0
- data/vendor/plugins/haml/extra/sass-mode.el +89 -0
- data/vendor/plugins/haml/init.rb +1 -0
- data/vendor/plugins/haml/lib/haml.rb +58 -77
- data/vendor/plugins/haml/lib/haml/buffer.rb +12 -8
- data/vendor/plugins/haml/lib/haml/engine.rb +3 -2
- data/vendor/plugins/haml/lib/haml/error.rb +1 -1
- data/vendor/plugins/haml/lib/haml/exec.rb +33 -8
- data/vendor/plugins/haml/lib/haml/filters.rb +41 -29
- data/vendor/plugins/haml/lib/haml/helpers.rb +69 -36
- data/vendor/plugins/haml/lib/haml/helpers/action_view_extensions.rb +0 -0
- data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb +30 -20
- data/vendor/plugins/haml/lib/haml/html.rb +53 -19
- data/vendor/plugins/haml/lib/haml/precompiler.rb +38 -25
- data/vendor/plugins/haml/lib/haml/template.rb +0 -0
- data/vendor/plugins/haml/lib/haml/template/patch.rb +0 -0
- data/vendor/plugins/haml/lib/haml/template/plugin.rb +0 -0
- data/vendor/plugins/haml/lib/haml/util.rb +23 -0
- data/vendor/plugins/haml/lib/haml/version.rb +47 -0
- data/vendor/plugins/haml/lib/sass.rb +25 -8
- data/vendor/plugins/haml/lib/sass/constant.rb +3 -1
- data/vendor/plugins/haml/lib/sass/constant/color.rb +0 -0
- data/vendor/plugins/haml/lib/sass/constant/literal.rb +0 -0
- data/vendor/plugins/haml/lib/sass/constant/nil.rb +0 -0
- data/vendor/plugins/haml/lib/sass/constant/number.rb +1 -1
- data/vendor/plugins/haml/lib/sass/constant/operation.rb +0 -0
- data/vendor/plugins/haml/lib/sass/constant/string.rb +0 -0
- data/vendor/plugins/haml/lib/sass/css.rb +31 -30
- data/vendor/plugins/haml/lib/sass/engine.rb +13 -12
- data/vendor/plugins/haml/lib/sass/error.rb +1 -1
- data/vendor/plugins/haml/lib/sass/plugin.rb +11 -7
- data/vendor/plugins/haml/lib/sass/plugin/merb.rb +1 -1
- data/vendor/plugins/haml/lib/sass/plugin/rails.rb +0 -0
- data/vendor/plugins/haml/lib/sass/tree/attr_node.rb +4 -0
- data/vendor/plugins/haml/lib/sass/tree/comment_node.rb +0 -0
- data/vendor/plugins/haml/lib/sass/tree/directive_node.rb +0 -0
- data/vendor/plugins/haml/lib/sass/tree/node.rb +4 -0
- data/vendor/plugins/haml/lib/sass/tree/rule_node.rb +4 -0
- data/vendor/plugins/haml/lib/sass/tree/value_node.rb +4 -0
- data/vendor/plugins/haml/rails/init.rb +1 -0
- data/vendor/plugins/haml/test/benchmark.rb +49 -32
- data/vendor/plugins/haml/test/haml/engine_test.rb +165 -113
- data/vendor/plugins/haml/test/haml/helper_test.rb +29 -8
- data/vendor/plugins/haml/test/haml/html2haml_test.rb +50 -16
- data/vendor/plugins/haml/test/haml/markaby/standard.mab +0 -0
- data/vendor/plugins/haml/test/haml/mocks/article.rb +0 -0
- data/vendor/plugins/haml/test/haml/results/content_for_layout.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/eval_suppressed.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/filters.xhtml +2 -28
- data/vendor/plugins/haml/test/haml/results/helpers.xhtml +20 -18
- data/vendor/plugins/haml/test/haml/results/helpful.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/just_stuff.xhtml +6 -0
- data/vendor/plugins/haml/test/haml/results/list.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/nuke_inner_whitespace.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/nuke_outer_whitespace.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/original_engine.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/partial_layout.xhtml +5 -0
- data/vendor/plugins/haml/test/haml/results/partials.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/render_layout.xhtml +3 -0
- data/vendor/plugins/haml/test/haml/results/silent_script.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/standard.xhtml +1 -1
- data/vendor/plugins/haml/test/haml/results/tag_parsing.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/very_basic.xhtml +0 -0
- data/vendor/plugins/haml/test/haml/results/whitespace_handling.xhtml +4 -1
- data/vendor/plugins/haml/test/haml/rhtml/_av_partial_1.rhtml +0 -0
- data/vendor/plugins/haml/test/haml/rhtml/_av_partial_2.rhtml +0 -0
- data/vendor/plugins/haml/test/haml/rhtml/action_view.rhtml +0 -0
- data/vendor/plugins/haml/test/haml/rhtml/standard.rhtml +3 -3
- data/vendor/plugins/haml/test/haml/template_test.rb +58 -5
- data/vendor/plugins/haml/test/haml/templates/_av_partial_1.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/_av_partial_1_ugly.haml +9 -0
- data/vendor/plugins/haml/test/haml/templates/_av_partial_2.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/_av_partial_2_ugly.haml +5 -0
- data/vendor/plugins/haml/test/haml/templates/_layout.erb +3 -0
- data/vendor/plugins/haml/test/haml/templates/_layout_for_partial.haml +3 -0
- data/vendor/plugins/haml/test/haml/templates/_partial.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/_text_area.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/action_view.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/action_view_ugly.haml +47 -0
- data/vendor/plugins/haml/test/haml/templates/breakage.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/content_for_layout.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/eval_suppressed.haml +1 -1
- data/vendor/plugins/haml/test/haml/templates/filters.haml +0 -28
- data/vendor/plugins/haml/test/haml/templates/helpers.haml +46 -20
- data/vendor/plugins/haml/test/haml/templates/helpful.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/just_stuff.haml +7 -0
- data/vendor/plugins/haml/test/haml/templates/list.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/nuke_inner_whitespace.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/nuke_outer_whitespace.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/original_engine.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/partial_layout.haml +3 -0
- data/vendor/plugins/haml/test/haml/templates/partialize.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/partials.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/render_layout.haml +2 -0
- data/vendor/plugins/haml/test/haml/templates/silent_script.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/standard.haml +3 -3
- data/vendor/plugins/haml/test/haml/templates/standard_ugly.haml +42 -0
- data/vendor/plugins/haml/test/haml/templates/tag_parsing.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/very_basic.haml +0 -0
- data/vendor/plugins/haml/test/haml/templates/whitespace_handling.haml +2 -2
- data/vendor/plugins/haml/test/linked_rails.rb +12 -0
- data/vendor/plugins/haml/test/sass/css2sass_test.rb +193 -0
- data/vendor/plugins/haml/test/sass/engine_test.rb +14 -2
- data/vendor/plugins/haml/test/sass/plugin_test.rb +12 -6
- data/vendor/plugins/haml/test/sass/results/alt.css +0 -0
- data/vendor/plugins/haml/test/sass/results/basic.css +0 -0
- data/vendor/plugins/haml/test/sass/results/compact.css +0 -0
- data/vendor/plugins/haml/test/sass/results/complex.css +0 -0
- data/vendor/plugins/haml/test/sass/results/compressed.css +0 -0
- data/vendor/plugins/haml/test/sass/results/constants.css +0 -0
- data/vendor/plugins/haml/test/sass/results/expanded.css +0 -0
- data/vendor/plugins/haml/test/sass/results/import.css +0 -0
- data/vendor/plugins/haml/test/sass/results/mixins.css +0 -0
- data/vendor/plugins/haml/test/sass/results/multiline.css +0 -0
- data/vendor/plugins/haml/test/sass/results/nested.css +0 -0
- data/vendor/plugins/haml/test/sass/results/parent_ref.css +0 -0
- data/vendor/plugins/haml/test/sass/results/subdir/nested_subdir/nested_subdir.css +0 -0
- data/vendor/plugins/haml/test/sass/results/subdir/subdir.css +0 -0
- data/vendor/plugins/haml/test/sass/templates/_partial.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/alt.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/basic.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/bork.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/bork2.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/compact.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/complex.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/compressed.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/constants.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/expanded.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/import.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/importee.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/mixins.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/multiline.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/nested.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/parent_ref.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +0 -0
- data/vendor/plugins/haml/test/sass/templates/subdir/subdir.sass +0 -0
- data/vendor/plugins/haml/test/test_helper.rb +11 -14
- data/vendor/rack-cache/CHANGES +128 -0
- data/vendor/rack-cache/COPYING +18 -0
- data/vendor/rack-cache/README +110 -0
- data/vendor/rack-cache/Rakefile +137 -0
- data/vendor/rack-cache/TODO +31 -0
- data/vendor/rack-cache/doc/configuration.markdown +86 -0
- data/vendor/rack-cache/doc/faq.markdown +141 -0
- data/vendor/rack-cache/doc/index.markdown +118 -0
- data/vendor/rack-cache/doc/layout.html.erb +34 -0
- data/vendor/rack-cache/doc/license.markdown +24 -0
- data/vendor/rack-cache/doc/rack-cache.css +362 -0
- data/vendor/rack-cache/doc/server.ru +34 -0
- data/vendor/rack-cache/doc/storage.markdown +162 -0
- data/vendor/rack-cache/example/sinatra/app.rb +25 -0
- data/vendor/rack-cache/example/sinatra/views/index.erb +44 -0
- data/vendor/rack-cache/lib/rack/cache.rb +45 -0
- data/vendor/rack-cache/lib/rack/cache/cachecontrol.rb +193 -0
- data/vendor/rack-cache/lib/rack/cache/context.rb +233 -0
- data/vendor/rack-cache/lib/rack/cache/entitystore.rb +253 -0
- data/vendor/rack-cache/lib/rack/cache/key.rb +52 -0
- data/vendor/rack-cache/lib/rack/cache/metastore.rb +328 -0
- data/vendor/rack-cache/lib/rack/cache/options.rb +150 -0
- data/vendor/rack-cache/lib/rack/cache/request.rb +33 -0
- data/vendor/rack-cache/lib/rack/cache/response.rb +267 -0
- data/vendor/rack-cache/lib/rack/cache/storage.rb +49 -0
- data/vendor/rack-cache/rack-cache.gemspec +69 -0
- data/vendor/rack-cache/test/cache_test.rb +38 -0
- data/vendor/rack-cache/test/cachecontrol_test.rb +139 -0
- data/vendor/rack-cache/test/context_test.rb +727 -0
- data/vendor/rack-cache/test/entitystore_test.rb +189 -0
- data/vendor/rack-cache/test/key_test.rb +50 -0
- data/vendor/rack-cache/test/metastore_test.rb +263 -0
- data/vendor/rack-cache/test/options_test.rb +78 -0
- data/vendor/rack-cache/test/pony.jpg +0 -0
- data/vendor/rack-cache/test/request_test.rb +19 -0
- data/vendor/rack-cache/test/response_test.rb +178 -0
- data/vendor/rack-cache/test/spec_setup.rb +202 -0
- data/vendor/rack-cache/test/storage_test.rb +94 -0
- data/vendor/radius/CHANGELOG +0 -0
- data/vendor/radius/QUICKSTART +0 -0
- data/vendor/radius/README +0 -0
- data/vendor/radius/ROADMAP +0 -0
- data/vendor/radius/Rakefile +0 -0
- data/vendor/radius/lib/radius.rb +0 -0
- data/vendor/radius/test/radius_test.rb +0 -0
- data/vendor/rails/actionmailer/CHANGELOG +23 -11
- data/vendor/rails/actionmailer/MIT-LICENSE +1 -1
- data/vendor/rails/actionmailer/README +0 -0
- data/vendor/rails/actionmailer/Rakefile +3 -5
- data/vendor/rails/actionmailer/install.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer.rb +30 -20
- data/vendor/rails/actionmailer/lib/action_mailer/adv_attr_accessor.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/base.rb +118 -60
- data/vendor/rails/actionmailer/lib/action_mailer/helpers.rb +4 -2
- data/vendor/rails/actionmailer/lib/action_mailer/mail_helper.rb +0 -2
- data/vendor/rails/actionmailer/lib/action_mailer/part.rb +6 -9
- data/vendor/rails/actionmailer/lib/action_mailer/part_container.rb +5 -1
- data/vendor/rails/actionmailer/lib/action_mailer/quoting.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/test_case.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/test_helper.rb +1 -0
- data/vendor/rails/actionmailer/lib/action_mailer/utils.rb +0 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/text_format.rb +10 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb +2 -2
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/compat.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/config.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/core_extensions.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/encode.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/interface.rb +1 -1
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/loader.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb +2 -2
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mailbox.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/main.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/mbox.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/net.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/obsolete.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/port.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/quoting.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner_r.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/utils.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/version.rb +0 -0
- data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb +17 -0
- data/vendor/rails/actionmailer/lib/action_mailer/version.rb +1 -1
- data/vendor/rails/actionmailer/lib/actionmailer.rb +0 -0
- data/vendor/rails/actionmailer/test/abstract_unit.rb +20 -11
- data/vendor/rails/actionmailer/test/asset_host_test.rb +54 -0
- data/vendor/rails/actionmailer/test/delivery_method_test.rb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/asset_host_mailer/email_with_asset.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/hello.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.plain.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/explicit_layout_mailer/logout.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/explicit_layout_mailer/signup.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/first_mailer/share.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/helper_mailer/use_example_helper.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/helper_mailer/use_helper.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/helper_mailer/use_helper_method.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/helper_mailer/use_mail_helper.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/layouts/spam.html.erb +1 -0
- data/vendor/rails/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email10 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email12 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email13 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email2 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email3 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email4 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email5 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email6 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email7 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email8 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email9 +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email_quoted_with_0d0a +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email_with_invalid_characters_in_content_type +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email_with_nested_attachment +0 -0
- data/vendor/rails/actionmailer/test/fixtures/raw_email_with_partially_quoted_subject +0 -0
- data/vendor/rails/actionmailer/test/fixtures/second_mailer/share.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/templates/signed_up.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/_subtemplate.text.plain.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/body_ivar.erb +2 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.html.haml +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.plain.haml +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/rxml_template.builder +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/rxml_template.rxml +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/{signed_up.erb → signed_up.html.erb} +0 -0
- data/vendor/rails/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb +0 -0
- data/vendor/rails/actionmailer/test/mail_helper_test.rb +0 -0
- data/vendor/rails/actionmailer/test/mail_layout_test.rb +123 -0
- data/vendor/rails/actionmailer/test/mail_render_test.rb +3 -9
- data/vendor/rails/actionmailer/test/mail_service_test.rb +126 -27
- data/vendor/rails/actionmailer/test/quoting_test.rb +4 -3
- data/vendor/rails/actionmailer/test/test_helper_test.rb +5 -5
- data/vendor/rails/actionmailer/test/tmail_test.rb +0 -0
- data/vendor/rails/actionmailer/test/url_test.rb +0 -0
- data/vendor/rails/actionpack/CHANGELOG +698 -364
- data/vendor/rails/actionpack/MIT-LICENSE +1 -1
- data/vendor/rails/actionpack/README +26 -86
- data/vendor/rails/actionpack/RUNNING_UNIT_TESTS +0 -0
- data/vendor/rails/actionpack/Rakefile +11 -11
- data/vendor/rails/actionpack/install.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller.rb +86 -49
- data/vendor/rails/actionpack/lib/action_controller/assertions/dom_assertions.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/assertions/model_assertions.rb +1 -0
- data/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb +65 -87
- data/vendor/rails/actionpack/lib/action_controller/assertions/routing_assertions.rb +34 -34
- data/vendor/rails/actionpack/lib/action_controller/assertions/selector_assertions.rb +26 -17
- data/vendor/rails/actionpack/lib/action_controller/assertions/tag_assertions.rb +1 -4
- data/vendor/rails/actionpack/lib/action_controller/base.rb +350 -210
- data/vendor/rails/actionpack/lib/action_controller/benchmarking.rb +39 -26
- data/vendor/rails/actionpack/lib/action_controller/caching.rb +9 -11
- data/vendor/rails/actionpack/lib/action_controller/caching/actions.rb +45 -20
- data/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb +38 -56
- data/vendor/rails/actionpack/lib/action_controller/caching/pages.rb +13 -15
- data/vendor/rails/actionpack/lib/action_controller/caching/sweeping.rb +4 -4
- data/vendor/rails/actionpack/lib/action_controller/cgi_ext.rb +0 -1
- data/vendor/rails/actionpack/lib/action_controller/cgi_ext/cookie.rb +2 -0
- data/vendor/rails/actionpack/lib/action_controller/cgi_ext/query_extension.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/cgi_ext/stdinput.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/cgi_process.rb +54 -200
- data/vendor/rails/actionpack/lib/action_controller/cookies.rb +23 -25
- data/vendor/rails/actionpack/lib/action_controller/dispatcher.rb +57 -101
- data/vendor/rails/actionpack/lib/action_controller/failsafe.rb +52 -0
- data/vendor/rails/actionpack/lib/action_controller/filters.rb +48 -10
- data/vendor/rails/actionpack/lib/action_controller/flash.rb +38 -47
- data/vendor/rails/actionpack/lib/action_controller/headers.rb +16 -14
- data/vendor/rails/actionpack/lib/action_controller/helpers.rb +15 -11
- data/vendor/rails/actionpack/lib/action_controller/http_authentication.rb +204 -24
- data/vendor/rails/actionpack/lib/action_controller/integration.rb +150 -97
- data/vendor/rails/actionpack/lib/action_controller/layout.rb +52 -81
- data/vendor/rails/actionpack/lib/action_controller/middleware_stack.rb +119 -0
- data/vendor/rails/actionpack/lib/action_controller/middlewares.rb +13 -0
- data/vendor/rails/actionpack/lib/action_controller/mime_responds.rb +24 -5
- data/vendor/rails/actionpack/lib/action_controller/mime_type.rb +72 -42
- data/vendor/rails/actionpack/lib/action_controller/mime_types.rb +2 -1
- data/vendor/rails/actionpack/lib/action_controller/params_parser.rb +71 -0
- data/vendor/rails/actionpack/lib/action_controller/performance_test.rb +15 -0
- data/vendor/rails/actionpack/lib/action_controller/polymorphic_routes.rb +44 -31
- data/vendor/rails/actionpack/lib/action_controller/record_identifier.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/reloader.rb +14 -0
- data/vendor/rails/actionpack/lib/action_controller/request.rb +237 -512
- data/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb +9 -41
- data/vendor/rails/actionpack/lib/action_controller/rescue.rb +72 -147
- data/vendor/rails/actionpack/lib/action_controller/resources.rb +196 -90
- data/vendor/rails/actionpack/lib/action_controller/response.rb +190 -34
- data/vendor/rails/actionpack/lib/action_controller/rewindable_input.rb +28 -0
- data/vendor/rails/actionpack/lib/action_controller/routing.rb +35 -37
- data/vendor/rails/actionpack/lib/action_controller/routing/builder.rb +49 -55
- data/vendor/rails/actionpack/lib/action_controller/routing/optimisations.rb +32 -22
- data/vendor/rails/actionpack/lib/action_controller/routing/recognition_optimisation.rb +34 -29
- data/vendor/rails/actionpack/lib/action_controller/routing/route.rb +171 -146
- data/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb +95 -43
- data/vendor/rails/actionpack/lib/action_controller/routing/routing_ext.rb +4 -1
- data/vendor/rails/actionpack/lib/action_controller/routing/segments.rb +91 -31
- data/vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb +181 -0
- data/vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb +198 -143
- data/vendor/rails/actionpack/lib/action_controller/session/mem_cache_store.rb +36 -83
- data/vendor/rails/actionpack/lib/action_controller/session_management.rb +26 -130
- data/vendor/rails/actionpack/lib/action_controller/status_codes.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/streaming.rb +37 -13
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/_trace.erb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/layout.erb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/missing_template.erb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/routing_error.erb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/template_error.erb +2 -2
- data/vendor/rails/actionpack/lib/action_controller/templates/rescues/unknown_action.erb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/test_case.rb +148 -27
- data/vendor/rails/actionpack/lib/action_controller/test_process.rb +190 -144
- data/vendor/rails/actionpack/lib/action_controller/translation.rb +13 -0
- data/vendor/rails/actionpack/lib/action_controller/uploaded_file.rb +44 -0
- data/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb +93 -19
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner.rb +16 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb +9 -2
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb +3 -3
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb +0 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb +89 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb +22 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb +37 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb +37 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb +58 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb +124 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb +51 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb +55 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb +40 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb +480 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb +63 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb +36 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/chunked.rb +49 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb +61 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb +45 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb +29 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_type.rb +23 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb +85 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb +153 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb +88 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb +48 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb +61 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb +8 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb +89 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb +55 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb +84 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb +59 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb +8 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb +18 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb +67 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb +19 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb +462 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb +65 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb +16 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb +27 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb +204 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb +160 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb +57 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb +64 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb +241 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb +179 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb +142 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb +91 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb +109 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb +100 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb +349 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb +106 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb +38 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb +55 -0
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb +392 -0
- data/vendor/rails/actionpack/lib/action_controller/verification.rb +3 -3
- data/vendor/rails/actionpack/lib/action_pack.rb +1 -1
- data/vendor/rails/actionpack/lib/action_pack/version.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view.rb +32 -19
- data/vendor/rails/actionpack/lib/action_view/base.rb +164 -154
- data/vendor/rails/actionpack/lib/action_view/erb/util.rb +38 -0
- data/vendor/rails/actionpack/lib/action_view/helpers.rb +57 -0
- data/vendor/rails/actionpack/lib/action_view/helpers/active_record_helper.rb +56 -27
- data/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +194 -126
- data/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb +75 -20
- data/vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb +27 -6
- data/vendor/rails/actionpack/lib/action_view/helpers/cache_helper.rb +1 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb +19 -44
- data/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb +564 -299
- data/vendor/rails/actionpack/lib/action_view/helpers/debug_helper.rb +20 -13
- data/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +365 -93
- data/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +168 -96
- data/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb +63 -40
- data/vendor/rails/actionpack/lib/action_view/helpers/javascript_helper.rb +80 -89
- data/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb +192 -75
- data/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb +218 -213
- data/vendor/rails/actionpack/lib/action_view/helpers/record_identification_helper.rb +0 -0
- data/vendor/rails/actionpack/lib/action_view/helpers/record_tag_helper.rb +4 -5
- data/vendor/rails/actionpack/lib/action_view/helpers/sanitize_helper.rb +55 -33
- data/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb +3 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb +41 -25
- data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb +294 -223
- data/vendor/rails/actionpack/lib/action_view/helpers/translation_helper.rb +39 -0
- data/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb +124 -59
- data/vendor/rails/actionpack/lib/action_view/inline_template.rb +13 -14
- data/vendor/rails/actionpack/lib/action_view/locale/en.yml +110 -0
- data/vendor/rails/actionpack/lib/action_view/partials.rb +137 -55
- data/vendor/rails/actionpack/lib/action_view/paths.rb +69 -0
- data/vendor/rails/actionpack/lib/action_view/reloadable_template.rb +117 -0
- data/vendor/rails/actionpack/lib/action_view/renderable.rb +95 -0
- data/vendor/rails/actionpack/lib/action_view/renderable_partial.rb +47 -0
- data/vendor/rails/actionpack/lib/action_view/template.rb +223 -93
- data/vendor/rails/actionpack/lib/action_view/template_error.rb +18 -29
- data/vendor/rails/actionpack/lib/action_view/template_handler.rb +23 -23
- data/vendor/rails/actionpack/lib/action_view/template_handlers.rb +48 -0
- data/vendor/rails/actionpack/lib/action_view/template_handlers/builder.rb +5 -15
- data/vendor/rails/actionpack/lib/action_view/template_handlers/erb.rb +11 -45
- data/vendor/rails/actionpack/lib/action_view/template_handlers/rjs.rb +3 -17
- data/vendor/rails/actionpack/lib/action_view/test_case.rb +34 -5
- data/vendor/rails/actionpack/lib/actionpack.rb +0 -0
- data/vendor/rails/actionpack/test/abstract_unit.rb +25 -16
- data/vendor/rails/actionpack/test/active_record_unit.rb +32 -33
- data/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb +139 -106
- data/vendor/rails/actionpack/test/activerecord/render_partial_with_record_identification_test.rb +27 -30
- data/vendor/rails/actionpack/test/adv_attr_test.rb +0 -0
- data/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb +30 -57
- data/vendor/rails/actionpack/test/controller/addresses_render_test.rb +2 -8
- data/vendor/rails/actionpack/test/controller/assert_select_test.rb +125 -85
- data/vendor/rails/actionpack/test/controller/base_test.rb +15 -17
- data/vendor/rails/actionpack/test/controller/benchmark_test.rb +3 -3
- data/vendor/rails/actionpack/test/controller/caching_test.rb +161 -81
- data/vendor/rails/actionpack/test/controller/capture_test.rb +3 -26
- data/vendor/rails/actionpack/test/controller/content_type_test.rb +51 -22
- data/vendor/rails/actionpack/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb +0 -0
- data/vendor/rails/actionpack/test/controller/controller_fixtures/app/controllers/user_controller.rb +0 -0
- data/vendor/rails/actionpack/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb +0 -0
- data/vendor/rails/actionpack/test/controller/cookie_test.rb +32 -67
- data/vendor/rails/actionpack/test/controller/deprecation/deprecated_base_methods_test.rb +9 -14
- data/vendor/rails/actionpack/test/controller/dispatcher_test.rb +26 -28
- data/vendor/rails/actionpack/test/controller/fake_controllers.rb +0 -0
- data/vendor/rails/actionpack/test/controller/fake_models.rb +8 -0
- data/vendor/rails/actionpack/test/controller/filter_params_test.rb +2 -2
- data/vendor/rails/actionpack/test/controller/filters_test.rb +19 -15
- data/vendor/rails/actionpack/test/controller/flash_test.rb +2 -6
- data/vendor/rails/actionpack/test/controller/header_test.rb +0 -0
- data/vendor/rails/actionpack/test/controller/helper_test.rb +15 -1
- data/vendor/rails/actionpack/test/controller/html-scanner/cdata_node_test.rb +15 -0
- data/vendor/rails/actionpack/test/controller/html-scanner/document_test.rb +1 -1
- data/vendor/rails/actionpack/test/controller/html-scanner/node_test.rb +21 -0
- data/vendor/rails/actionpack/test/controller/html-scanner/sanitizer_test.rb +15 -1
- data/vendor/rails/actionpack/test/controller/html-scanner/tag_node_test.rb +0 -0
- data/vendor/rails/actionpack/test/controller/html-scanner/text_node_test.rb +0 -0
- data/vendor/rails/actionpack/test/controller/html-scanner/tokenizer_test.rb +0 -0
- data/vendor/rails/actionpack/test/controller/http_basic_authentication_test.rb +88 -0
- data/vendor/rails/actionpack/test/controller/http_digest_authentication_test.rb +178 -0
- data/vendor/rails/actionpack/test/controller/integration_test.rb +198 -33
- data/vendor/rails/actionpack/test/controller/layout_test.rb +53 -108
- data/vendor/rails/actionpack/test/controller/logging_test.rb +46 -0
- data/vendor/rails/actionpack/test/controller/middleware_stack_test.rb +90 -0
- data/vendor/rails/actionpack/test/controller/mime_responds_test.rb +67 -69
- data/vendor/rails/actionpack/test/controller/mime_type_test.rb +14 -5
- data/vendor/rails/actionpack/test/controller/polymorphic_routes_test.rb +241 -122
- data/vendor/rails/actionpack/test/controller/rack_test.rb +294 -0
- data/vendor/rails/actionpack/test/controller/record_identifier_test.rb +0 -0
- data/vendor/rails/actionpack/test/controller/redirect_test.rb +78 -85
- data/vendor/rails/actionpack/test/controller/render_test.rb +1459 -234
- data/vendor/rails/actionpack/test/controller/request/json_params_parsing_test.rb +45 -0
- data/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb +223 -0
- data/vendor/rails/actionpack/test/controller/request/query_string_parsing_test.rb +120 -0
- data/vendor/rails/actionpack/test/controller/request/url_encoded_params_parsing_test.rb +184 -0
- data/vendor/rails/actionpack/test/controller/request/xml_params_parsing_test.rb +88 -0
- data/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb +63 -130
- data/vendor/rails/actionpack/test/controller/request_test.rb +65 -586
- data/vendor/rails/actionpack/test/controller/rescue_test.rb +63 -44
- data/vendor/rails/actionpack/test/controller/resources_test.rb +505 -37
- data/vendor/rails/actionpack/test/controller/routing_test.rb +1570 -1477
- data/vendor/rails/actionpack/test/controller/selector_test.rb +3 -3
- data/vendor/rails/actionpack/test/controller/send_file_test.rb +30 -7
- data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +171 -190
- data/vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb +94 -148
- data/vendor/rails/actionpack/test/controller/session/test_session_test.rb +58 -0
- data/vendor/rails/actionpack/test/controller/test_test.rb +47 -50
- data/vendor/rails/actionpack/test/controller/translation_test.rb +26 -0
- data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb +80 -31
- data/vendor/rails/actionpack/test/controller/verification_test.rb +1 -1
- data/vendor/rails/actionpack/test/controller/view_paths_test.rb +49 -48
- data/vendor/rails/actionpack/test/controller/webservice_test.rb +178 -147
- data/vendor/rails/actionpack/test/fixtures/_top_level_partial.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/_top_level_partial_only.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/addresses/list.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/alternate_helpers/foo_helper.rb +3 -0
- data/vendor/rails/actionpack/test/fixtures/bad_customers/_bad_customer.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/companies.yml +0 -0
- data/vendor/rails/actionpack/test/fixtures/company.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml +0 -0
- data/vendor/rails/actionpack/test/fixtures/customers/_customer.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/db_definitions/sqlite.sql +0 -0
- data/vendor/rails/actionpack/test/fixtures/developer.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/developers.yml +0 -0
- data/vendor/rails/actionpack/test/fixtures/developers/_developer.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/developers_projects.yml +0 -0
- data/vendor/rails/actionpack/test/fixtures/fun/games/_game.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/fun/games/hello_world.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/fun/serious/games/_game.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/_partial.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/formatted_fragment_cached.html.erb +3 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/formatted_fragment_cached.js.rjs +6 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/formatted_fragment_cached.xml.builder +5 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/html_fragment_cached_with_partial.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/inline_fragment_cached.html.erb +2 -0
- data/vendor/rails/actionpack/test/fixtures/functional_caching/js_fragment_cached_with_partial.js.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/good_customers/_good_customer.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/helpers/abc_helper.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/helpers/fun/games_helper.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/helpers/fun/pdf_helper.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/alt/hello.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/alt/layouts/alt.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/controller_name_space/nested.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/item.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/layout_test.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/third_party_template_library.mab +0 -0
- data/vendor/rails/actionpack/test/fixtures/layout_tests/views/hello.rhtml +0 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/_column.html.erb +2 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/block_with_layout.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/builder.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/default_html.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/partial_with_layout.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/standard.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/talk_from_action.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/xhr.html.erb +2 -0
- data/vendor/rails/actionpack/test/fixtures/layouts/yield.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/mascot.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/mascots.yml +0 -0
- data/vendor/rails/actionpack/test/fixtures/mascots/_mascot.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/binary_file +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/boundary_problem_file +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/bracketed_param +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/empty +10 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/hello.txt +1 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/large_text_file +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/mixed_files +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/mona_lisa.jpg +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/none +9 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/single_parameter +0 -0
- data/vendor/rails/actionpack/test/fixtures/multipart/text_file +0 -0
- data/vendor/rails/actionpack/test/fixtures/override/test/hello_world.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/override2/layouts/test/sub.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/post_test/layouts/post.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/post_test/layouts/super_post.iphone.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/post_test/post/index.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/post_test/post/index.iphone.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/post_test/super_post/index.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/post_test/super_post/index.iphone.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/project.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/projects.yml +0 -0
- data/vendor/rails/actionpack/test/fixtures/projects/_project.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/public/404.html +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/500.da.html +1 -0
- data/vendor/rails/actionpack/test/fixtures/public/500.html +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/images/rails.png +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/application.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/bank.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/controls.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/dragdrop.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/effects.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/prototype.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/robber.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/subdir/subdir.js +1 -0
- data/vendor/rails/actionpack/test/fixtures/public/javascripts/version.1.0.js +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/stylesheets/bank.css +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/stylesheets/robber.css +0 -0
- data/vendor/rails/actionpack/test/fixtures/public/stylesheets/subdir/subdir.css +1 -0
- data/vendor/rails/actionpack/test/fixtures/public/stylesheets/version.1.0.css +0 -0
- data/vendor/rails/actionpack/test/fixtures/quiz/questions/_question.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/replies.yml +1 -1
- data/vendor/rails/actionpack/test/fixtures/replies/_reply.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/reply.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/all_types_with_layout.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/all_types_with_layout.js.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/iphone_with_html_response_type.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/layouts/missing.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/layouts/standard.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/layouts/standard.iphone.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/using_defaults.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/using_defaults.js.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/using_defaults.xml.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.js.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/respond_to/using_defaults_with_type_list.xml.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/scope/test/modgreet.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/shared.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/symlink_parent/symlinked_layout.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_counter.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_customer.erb +1 -1
- data/vendor/rails/actionpack/test/fixtures/test/_customer_counter.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_customer_greeting.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_customer_with_var.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_form.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_hash_greeting.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_hash_object.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_hello.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_labelling_form.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_layout_for_block_with_args.html.erb +3 -0
- data/vendor/rails/actionpack/test/fixtures/test/_layout_for_partial.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_local_inspector.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_one.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_partial.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_partial.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_partial.js.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_partial_for_use_in_layout.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_partial_only.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_partial_with_only_html_version.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/_person.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_raise.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/_two.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/action_talk_to_layout.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/calling_partial_with_layout.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/capturing.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/content_for.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/content_for_concatenated.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/content_for_with_parameter.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/delete_with_js.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/dont_pick_me +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/enum_rjs_test.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/formatted_html_erb.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/formatted_xml_erb.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/formatted_xml_erb.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/formatted_xml_erb.xml.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/greeting.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/greeting.js.rjs +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello.builder +1 -1
- data/vendor/rails/actionpack/test/fixtures/test/hello_world.da.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_world.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_world.pt-BR.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_world_container.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_world_from_rxml.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_world_with_layout_false.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/hello_xml_world.builder +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/hyphen-ated.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/implicit_content_type.atom.builder +2 -0
- data/vendor/rails/actionpack/test/fixtures/test/list.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/nested_layout.erb +3 -0
- data/vendor/rails/actionpack/test/fixtures/test/non_erb_block_content_for.builder +1 -1
- data/vendor/rails/actionpack/test/fixtures/test/potential_conflicts.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_explicit_html_template.js.rjs +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_file_from_template.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_file_with_ivar.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_file_with_locals.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template.js.rjs +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/render_to_string_test.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/sub_template_raise.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/template.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/update_element_with_capture.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/using_layout_around_block.html.erb +0 -0
- data/vendor/rails/actionpack/test/fixtures/test/using_layout_around_block_with_args.html.erb +1 -0
- data/vendor/rails/actionpack/test/fixtures/test/utf8.html.erb +2 -0
- data/vendor/rails/actionpack/test/fixtures/topic.rb +0 -0
- data/vendor/rails/actionpack/test/fixtures/topics.yml +0 -0
- data/vendor/rails/actionpack/test/fixtures/topics/_topic.html.erb +0 -0
- data/vendor/rails/actionpack/test/template/active_record_helper_i18n_test.rb +44 -0
- data/vendor/rails/actionpack/test/template/active_record_helper_test.rb +58 -24
- data/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb +217 -29
- data/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb +117 -10
- data/vendor/rails/actionpack/test/template/benchmark_helper_test.rb +50 -24
- data/vendor/rails/actionpack/test/template/compiled_templates_test.rb +203 -0
- data/vendor/rails/actionpack/test/template/date_helper_i18n_test.rb +120 -0
- data/vendor/rails/actionpack/test/template/date_helper_test.rb +822 -144
- data/vendor/rails/actionpack/test/template/erb_util_test.rb +0 -0
- data/vendor/rails/actionpack/test/template/form_helper_test.rb +454 -196
- data/vendor/rails/actionpack/test/template/form_options_helper_test.rb +653 -1235
- data/vendor/rails/actionpack/test/template/form_tag_helper_test.rb +89 -34
- data/vendor/rails/actionpack/test/template/javascript_helper_test.rb +16 -22
- data/vendor/rails/actionpack/test/template/number_helper_i18n_test.rb +69 -0
- data/vendor/rails/actionpack/test/template/number_helper_test.rb +44 -13
- data/vendor/rails/actionpack/test/template/prototype_helper_test.rb +101 -84
- data/vendor/rails/actionpack/test/template/record_tag_helper_test.rb +24 -20
- data/vendor/rails/actionpack/test/template/render_test.rb +290 -0
- data/vendor/rails/actionpack/test/template/sanitize_helper_test.rb +3 -3
- data/vendor/rails/actionpack/test/template/scriptaculous_helper_test.rb +0 -0
- data/vendor/rails/actionpack/test/template/tag_helper_test.rb +34 -14
- data/vendor/rails/actionpack/test/template/test_test.rb +4 -6
- data/vendor/rails/actionpack/test/template/text_helper_test.rb +210 -57
- data/vendor/rails/actionpack/test/template/translation_helper_test.rb +32 -0
- data/vendor/rails/actionpack/test/template/url_helper_test.rb +88 -18
- data/vendor/rails/actionpack/test/testing_sandbox.rb +0 -0
- data/vendor/rails/actionpack/test/view/test_case_test.rb +8 -0
- data/vendor/rails/activerecord/CHANGELOG +466 -394
- data/vendor/rails/activerecord/README +0 -0
- data/vendor/rails/activerecord/RUNNING_UNIT_TESTS +0 -0
- data/vendor/rails/activerecord/Rakefile +12 -7
- data/vendor/rails/activerecord/examples/associations.png +0 -0
- data/vendor/rails/activerecord/install.rb +0 -0
- data/vendor/rails/activerecord/lib/active_record.rb +56 -52
- data/vendor/rails/activerecord/lib/active_record/aggregations.rb +110 -38
- data/vendor/rails/activerecord/lib/active_record/association_preload.rb +135 -31
- data/vendor/rails/activerecord/lib/active_record/associations.rb +578 -421
- data/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +136 -34
- data/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb +73 -14
- data/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb +2 -2
- data/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb +0 -0
- data/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +24 -8
- data/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb +30 -30
- data/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb +29 -27
- data/vendor/rails/activerecord/lib/active_record/associations/has_one_association.rb +35 -9
- data/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb +3 -4
- data/vendor/rails/activerecord/lib/active_record/attribute_methods.rb +14 -5
- data/vendor/rails/activerecord/lib/active_record/autosave_association.rb +349 -0
- data/vendor/rails/activerecord/lib/active_record/base.rb +692 -281
- data/vendor/rails/activerecord/lib/active_record/batches.rb +73 -0
- data/vendor/rails/activerecord/lib/active_record/calculations.rb +46 -21
- data/vendor/rails/activerecord/lib/active_record/callbacks.rb +65 -17
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +371 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +45 -215
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +133 -20
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +8 -7
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb +0 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +75 -31
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +10 -4
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +94 -29
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +124 -66
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +147 -91
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +41 -21
- data/vendor/rails/activerecord/lib/active_record/dirty.rb +28 -10
- data/vendor/rails/activerecord/lib/active_record/dynamic_finder_match.rb +41 -0
- data/vendor/rails/activerecord/lib/active_record/dynamic_scope_match.rb +25 -0
- data/vendor/rails/activerecord/lib/active_record/fixtures.rb +196 -200
- data/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb +26 -0
- data/vendor/rails/activerecord/lib/active_record/locale/en.yml +54 -0
- data/vendor/rails/activerecord/lib/active_record/locking/optimistic.rb +33 -0
- data/vendor/rails/activerecord/lib/active_record/locking/pessimistic.rb +0 -0
- data/vendor/rails/activerecord/lib/active_record/migration.rb +55 -12
- data/vendor/rails/activerecord/lib/active_record/named_scope.rb +49 -20
- data/vendor/rails/activerecord/lib/active_record/nested_attributes.rb +329 -0
- data/vendor/rails/activerecord/lib/active_record/observer.rb +0 -0
- data/vendor/rails/activerecord/lib/active_record/query_cache.rb +25 -13
- data/vendor/rails/activerecord/lib/active_record/reflection.rb +132 -55
- data/vendor/rails/activerecord/lib/active_record/schema.rb +0 -0
- data/vendor/rails/activerecord/lib/active_record/schema_dumper.rb +15 -7
- data/vendor/rails/activerecord/lib/active_record/serialization.rb +3 -1
- data/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb +19 -0
- data/vendor/rails/activerecord/lib/active_record/serializers/xml_serializer.rb +28 -13
- data/vendor/rails/activerecord/lib/active_record/session_store.rb +318 -0
- data/vendor/rails/activerecord/lib/active_record/test_case.rb +33 -14
- data/vendor/rails/activerecord/lib/active_record/timestamp.rb +2 -2
- data/vendor/rails/activerecord/lib/active_record/transactions.rb +145 -40
- data/vendor/rails/activerecord/lib/active_record/validations.rb +290 -195
- data/vendor/rails/activerecord/lib/active_record/version.rb +1 -1
- data/vendor/rails/activerecord/lib/activerecord.rb +0 -0
- data/vendor/rails/activerecord/test/assets/example.log +0 -0
- data/vendor/rails/activerecord/test/assets/flowers.jpg +0 -0
- data/vendor/rails/activerecord/test/cases/aaa_create_tables_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/active_schema_test_mysql.rb +5 -0
- data/vendor/rails/activerecord/test/cases/active_schema_test_postgresql.rb +0 -0
- data/vendor/rails/activerecord/test/cases/adapter_test.rb +6 -0
- data/vendor/rails/activerecord/test/cases/aggregations_test.rb +39 -0
- data/vendor/rails/activerecord/test/cases/ar_schema_test.rb +0 -1
- data/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb +37 -123
- data/vendor/rails/activerecord/test/cases/associations/callbacks_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/associations/cascaded_eager_loading_test.rb +8 -0
- data/vendor/rails/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb +59 -12
- data/vendor/rails/activerecord/test/cases/associations/eager_singularization_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/associations/eager_test.rb +190 -11
- data/vendor/rails/activerecord/test/cases/associations/extension_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb +127 -11
- data/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +175 -147
- data/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb +82 -3
- data/vendor/rails/activerecord/test/cases/associations/has_one_associations_test.rb +54 -90
- data/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb +80 -1
- data/vendor/rails/activerecord/test/cases/associations/inner_join_association_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/associations/join_model_test.rb +5 -7
- data/vendor/rails/activerecord/test/cases/associations_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/attribute_methods_test.rb +72 -5
- data/vendor/rails/activerecord/test/cases/autosave_association_test.rb +901 -0
- data/vendor/rails/activerecord/test/cases/base_test.rb +120 -28
- data/vendor/rails/activerecord/test/cases/batches_test.rb +61 -0
- data/vendor/rails/activerecord/test/cases/binary_test.rb +1 -5
- data/vendor/rails/activerecord/test/cases/calculations_test.rb +42 -17
- data/vendor/rails/activerecord/test/cases/callbacks_observers_test.rb +38 -0
- data/vendor/rails/activerecord/test/cases/callbacks_test.rb +43 -5
- data/vendor/rails/activerecord/test/cases/class_inheritable_attributes_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/column_alias_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/column_definition_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/connection_pool_test.rb +25 -0
- data/vendor/rails/activerecord/test/cases/connection_test_firebird.rb +0 -0
- data/vendor/rails/activerecord/test/cases/connection_test_mysql.rb +27 -1
- data/vendor/rails/activerecord/test/cases/copy_table_test_sqlite.rb +11 -0
- data/vendor/rails/activerecord/test/cases/database_statements_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/datatype_test_postgresql.rb +1 -0
- data/vendor/rails/activerecord/test/cases/date_time_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/default_test_firebird.rb +0 -0
- data/vendor/rails/activerecord/test/cases/defaults_test.rb +63 -21
- data/vendor/rails/activerecord/test/cases/deprecated_finder_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/dirty_test.rb +52 -3
- data/vendor/rails/activerecord/test/cases/finder_respond_to_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/finder_test.rb +224 -39
- data/vendor/rails/activerecord/test/cases/fixtures_test.rb +47 -22
- data/vendor/rails/activerecord/test/cases/helper.rb +32 -10
- data/vendor/rails/activerecord/test/cases/i18n_test.rb +41 -0
- data/vendor/rails/activerecord/test/cases/inheritance_test.rb +4 -4
- data/vendor/rails/activerecord/test/cases/invalid_date_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/json_serialization_test.rb +1 -1
- data/vendor/rails/activerecord/test/cases/lifecycle_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/locking_test.rb +27 -14
- data/vendor/rails/activerecord/test/cases/method_scoping_test.rb +239 -7
- data/vendor/rails/activerecord/test/cases/migration_test.rb +294 -243
- data/vendor/rails/activerecord/test/cases/migration_test_firebird.rb +0 -0
- data/vendor/rails/activerecord/test/cases/mixin_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/modules_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/multiple_db_test.rb +25 -0
- data/vendor/rails/activerecord/test/cases/named_scope_test.rb +155 -2
- data/vendor/rails/activerecord/test/cases/nested_attributes_test.rb +509 -0
- data/vendor/rails/activerecord/test/cases/pk_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/pooled_connections_test.rb +103 -0
- data/vendor/rails/activerecord/test/cases/query_cache_test.rb +0 -4
- data/vendor/rails/activerecord/test/cases/readonly_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/reflection_test.rb +21 -3
- data/vendor/rails/activerecord/test/cases/reload_models_test.rb +22 -0
- data/vendor/rails/activerecord/test/cases/repair_helper.rb +50 -0
- data/vendor/rails/activerecord/test/cases/reserved_word_test_mysql.rb +0 -0
- data/vendor/rails/activerecord/test/cases/sanitize_test.rb +25 -0
- data/vendor/rails/activerecord/test/cases/schema_authorization_test_postgresql.rb +2 -2
- data/vendor/rails/activerecord/test/cases/schema_dumper_test.rb +0 -1
- data/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb +0 -0
- data/vendor/rails/activerecord/test/cases/serialization_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/synonym_test_oracle.rb +0 -0
- data/vendor/rails/activerecord/test/cases/transactions_test.rb +237 -22
- data/vendor/rails/activerecord/test/cases/unconnected_test.rb +0 -0
- data/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +915 -0
- data/vendor/rails/activerecord/test/cases/validations_test.rb +274 -213
- data/vendor/rails/activerecord/test/cases/xml_serialization_test.rb +19 -1
- data/vendor/rails/activerecord/test/config.rb +0 -0
- data/vendor/rails/activerecord/test/connections/jdbc_jdbcderby/connection.rb +18 -0
- data/vendor/rails/activerecord/test/connections/jdbc_jdbch2/connection.rb +18 -0
- data/vendor/rails/activerecord/test/connections/jdbc_jdbchsqldb/connection.rb +18 -0
- data/vendor/rails/activerecord/test/connections/jdbc_jdbcmysql/connection.rb +26 -0
- data/vendor/rails/activerecord/test/connections/jdbc_jdbcpostgresql/connection.rb +26 -0
- data/vendor/rails/activerecord/test/connections/jdbc_jdbcsqlite3/connection.rb +25 -0
- data/vendor/rails/activerecord/test/connections/native_db2/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_firebird/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_frontbase/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_mysql/connection.rb +1 -3
- data/vendor/rails/activerecord/test/connections/native_openbase/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_oracle/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_postgresql/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_sqlite/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_sqlite3/connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_sqlite3/in_memory_connection.rb +0 -0
- data/vendor/rails/activerecord/test/connections/native_sybase/connection.rb +0 -0
- data/vendor/rails/activerecord/test/fixtures/accounts.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/all/developers.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/all/people.csv +0 -0
- data/vendor/rails/activerecord/test/fixtures/all/tasks.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/author_addresses.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/author_favorites.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/authors.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/binaries.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/books.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/categories.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/categories/special_categories.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/categories/subsubdir/arbitrary_filename.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/categories_ordered.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/categories_posts.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/categorizations.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/clubs.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/comments.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/companies.yml +1 -0
- data/vendor/rails/activerecord/test/fixtures/computers.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/courses.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/customers.yml +10 -1
- data/vendor/rails/activerecord/test/fixtures/developers.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/developers_projects.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/edges.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/entrants.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 +0 -0
- data/vendor/rails/activerecord/test/fixtures/fk_test_has_fk.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/fk_test_has_pk.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/funny_jokes.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/items.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/jobs.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/legacy_things.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/mateys.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/member_types.yml +6 -0
- data/vendor/rails/activerecord/test/fixtures/members.yml +3 -1
- data/vendor/rails/activerecord/test/fixtures/memberships.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/minimalistics.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/mixed_case_monkeys.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/mixins.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/movies.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/naked/csv/accounts.csv +0 -0
- data/vendor/rails/activerecord/test/fixtures/naked/yml/accounts.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/naked/yml/companies.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/naked/yml/courses.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/organizations.yml +5 -0
- data/vendor/rails/activerecord/test/fixtures/owners.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/parrots.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/parrots_pirates.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/people.yml +10 -1
- data/vendor/rails/activerecord/test/fixtures/pets.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/pirates.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/posts.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/price_estimates.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/projects.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/readers.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/references.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/reserved_words/distinct.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/reserved_words/distincts_selects.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/reserved_words/group.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/reserved_words/select.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/reserved_words/values.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/ships.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/sponsors.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/subscribers.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/subscriptions.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/taggings.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/tags.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/tasks.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/topics.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/toys.yml +4 -0
- data/vendor/rails/activerecord/test/fixtures/treasures.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/vertices.yml +0 -0
- data/vendor/rails/activerecord/test/fixtures/warehouse-things.yml +0 -0
- data/vendor/rails/activerecord/test/migrations/broken/100_migration_that_raises_exception.rb +10 -0
- data/vendor/rails/activerecord/test/migrations/decimal/1_give_me_big_numbers.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/duplicate/1_people_have_last_names.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/duplicate/2_we_need_reminders.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/duplicate/3_foo.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/duplicate/3_innocent_jointable.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/duplicate_names/20080507052938_chunky.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/duplicate_names/20080507053028_chunky.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/interleaved/pass_1/3_innocent_jointable.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/interleaved/pass_2/1_people_have_last_names.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/interleaved/pass_2/3_innocent_jointable.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/interleaved/pass_3/1_people_have_last_names.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/interleaved/pass_3/2_i_raise_on_down.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/interleaved/pass_3/3_innocent_jointable.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/missing/1000_people_have_middle_names.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/missing/1_people_have_last_names.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/missing/3_we_need_reminders.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/missing/4_innocent_jointable.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/valid/1_people_have_last_names.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/valid/2_we_need_reminders.rb +0 -0
- data/vendor/rails/activerecord/test/migrations/valid/3_innocent_jointable.rb +0 -0
- data/vendor/rails/activerecord/test/models/author.rb +4 -0
- data/vendor/rails/activerecord/test/models/auto_id.rb +0 -0
- data/vendor/rails/activerecord/test/models/binary.rb +0 -0
- data/vendor/rails/activerecord/test/models/bird.rb +3 -0
- data/vendor/rails/activerecord/test/models/book.rb +0 -0
- data/vendor/rails/activerecord/test/models/categorization.rb +0 -0
- data/vendor/rails/activerecord/test/models/category.rb +4 -0
- data/vendor/rails/activerecord/test/models/citation.rb +0 -0
- data/vendor/rails/activerecord/test/models/club.rb +6 -0
- data/vendor/rails/activerecord/test/models/column_name.rb +0 -0
- data/vendor/rails/activerecord/test/models/comment.rb +0 -0
- data/vendor/rails/activerecord/test/models/company.rb +28 -1
- data/vendor/rails/activerecord/test/models/company_in_module.rb +0 -0
- data/vendor/rails/activerecord/test/models/computer.rb +0 -0
- data/vendor/rails/activerecord/test/models/contact.rb +0 -0
- data/vendor/rails/activerecord/test/models/course.rb +0 -0
- data/vendor/rails/activerecord/test/models/customer.rb +19 -1
- data/vendor/rails/activerecord/test/models/default.rb +0 -0
- data/vendor/rails/activerecord/test/models/developer.rb +12 -0
- data/vendor/rails/activerecord/test/models/edge.rb +0 -0
- data/vendor/rails/activerecord/test/models/entrant.rb +0 -0
- data/vendor/rails/activerecord/test/models/event.rb +3 -0
- data/vendor/rails/activerecord/test/models/guid.rb +0 -0
- data/vendor/rails/activerecord/test/models/item.rb +0 -0
- data/vendor/rails/activerecord/test/models/job.rb +0 -0
- data/vendor/rails/activerecord/test/models/joke.rb +0 -0
- data/vendor/rails/activerecord/test/models/keyboard.rb +0 -0
- data/vendor/rails/activerecord/test/models/legacy_thing.rb +0 -0
- data/vendor/rails/activerecord/test/models/matey.rb +0 -0
- data/vendor/rails/activerecord/test/models/member.rb +3 -0
- data/vendor/rails/activerecord/test/models/member_detail.rb +5 -0
- data/vendor/rails/activerecord/test/models/member_type.rb +3 -0
- data/vendor/rails/activerecord/test/models/membership.rb +0 -0
- data/vendor/rails/activerecord/test/models/minimalistic.rb +0 -0
- data/vendor/rails/activerecord/test/models/mixed_case_monkey.rb +0 -0
- data/vendor/rails/activerecord/test/models/movie.rb +0 -0
- data/vendor/rails/activerecord/test/models/order.rb +0 -0
- data/vendor/rails/activerecord/test/models/organization.rb +4 -0
- data/vendor/rails/activerecord/test/models/owner.rb +2 -1
- data/vendor/rails/activerecord/test/models/parrot.rb +3 -0
- data/vendor/rails/activerecord/test/models/person.rb +6 -0
- data/vendor/rails/activerecord/test/models/pet.rb +2 -1
- data/vendor/rails/activerecord/test/models/pirate.rb +55 -1
- data/vendor/rails/activerecord/test/models/post.rb +15 -0
- data/vendor/rails/activerecord/test/models/price_estimate.rb +0 -0
- data/vendor/rails/activerecord/test/models/project.rb +1 -0
- data/vendor/rails/activerecord/test/models/reader.rb +0 -0
- data/vendor/rails/activerecord/test/models/reference.rb +0 -0
- data/vendor/rails/activerecord/test/models/reply.rb +6 -0
- data/vendor/rails/activerecord/test/models/ship.rb +8 -1
- data/vendor/rails/activerecord/test/models/ship_part.rb +5 -0
- data/vendor/rails/activerecord/test/models/sponsor.rb +0 -0
- data/vendor/rails/activerecord/test/models/subject.rb +0 -0
- data/vendor/rails/activerecord/test/models/subscriber.rb +0 -0
- data/vendor/rails/activerecord/test/models/subscription.rb +0 -0
- data/vendor/rails/activerecord/test/models/tag.rb +0 -0
- data/vendor/rails/activerecord/test/models/tagging.rb +0 -0
- data/vendor/rails/activerecord/test/models/task.rb +0 -0
- data/vendor/rails/activerecord/test/models/topic.rb +16 -1
- data/vendor/rails/activerecord/test/models/toy.rb +4 -0
- data/vendor/rails/activerecord/test/models/treasure.rb +0 -0
- data/vendor/rails/activerecord/test/models/vertex.rb +0 -0
- data/vendor/rails/activerecord/test/models/warehouse_thing.rb +0 -0
- data/vendor/rails/activerecord/test/schema/mysql_specific_schema.rb +0 -0
- data/vendor/rails/activerecord/test/schema/postgresql_specific_schema.rb +0 -0
- data/vendor/rails/activerecord/test/schema/schema.rb +47 -3
- data/vendor/rails/activerecord/test/schema/schema2.rb +0 -0
- data/vendor/rails/activerecord/test/schema/sqlite_specific_schema.rb +0 -0
- data/vendor/rails/activeresource/CHANGELOG +35 -24
- data/vendor/rails/activeresource/README +1 -1
- data/vendor/rails/activeresource/Rakefile +5 -4
- data/vendor/rails/activeresource/lib/active_resource.rb +7 -10
- data/vendor/rails/activeresource/lib/active_resource/base.rb +177 -121
- data/vendor/rails/activeresource/lib/active_resource/connection.rb +28 -17
- data/vendor/rails/activeresource/lib/active_resource/custom_methods.rb +14 -13
- data/vendor/rails/activeresource/lib/active_resource/formats.rb +0 -0
- data/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb +7 -7
- data/vendor/rails/activeresource/lib/active_resource/formats/xml_format.rb +9 -9
- data/vendor/rails/activeresource/lib/active_resource/http_mock.rb +29 -39
- data/vendor/rails/activeresource/lib/active_resource/validations.rb +16 -30
- data/vendor/rails/activeresource/lib/active_resource/version.rb +1 -1
- data/vendor/rails/activeresource/lib/activeresource.rb +0 -0
- data/vendor/rails/activeresource/test/abstract_unit.rb +5 -8
- data/vendor/rails/activeresource/test/authorization_test.rb +12 -12
- data/vendor/rails/activeresource/test/base/custom_methods_test.rb +3 -2
- data/vendor/rails/activeresource/test/base/equality_test.rb +9 -0
- data/vendor/rails/activeresource/test/base/load_test.rb +2 -2
- data/vendor/rails/activeresource/test/base_errors_test.rb +0 -0
- data/vendor/rails/activeresource/test/base_test.rb +144 -101
- data/vendor/rails/activeresource/test/connection_test.rb +14 -8
- data/vendor/rails/activeresource/test/fixtures/beast.rb +0 -0
- data/vendor/rails/activeresource/test/fixtures/customer.rb +0 -0
- data/vendor/rails/activeresource/test/fixtures/person.rb +0 -0
- data/vendor/rails/activeresource/test/fixtures/street_address.rb +0 -0
- data/vendor/rails/activeresource/test/format_test.rb +40 -11
- data/vendor/rails/activeresource/test/setter_trap.rb +2 -3
- data/vendor/rails/activesupport/CHANGELOG +194 -83
- data/vendor/rails/activesupport/README +0 -0
- data/vendor/rails/activesupport/lib/active_support.rb +30 -32
- data/vendor/rails/activesupport/lib/active_support/backtrace_cleaner.rb +72 -0
- data/vendor/rails/activesupport/lib/active_support/base64.rb +13 -2
- data/vendor/rails/activesupport/lib/active_support/basic_object.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/buffered_logger.rb +27 -21
- data/vendor/rails/activesupport/lib/active_support/cache.rb +128 -47
- data/vendor/rails/activesupport/lib/active_support/cache/compressed_mem_cache_store.rb +7 -2
- data/vendor/rails/activesupport/lib/active_support/cache/drb_store.rb +2 -3
- data/vendor/rails/activesupport/lib/active_support/cache/file_store.rb +7 -5
- data/vendor/rails/activesupport/lib/active_support/cache/mem_cache_store.rb +53 -21
- data/vendor/rails/activesupport/lib/active_support/cache/memory_store.rb +16 -2
- data/vendor/rails/activesupport/lib/active_support/cache/strategy/local_cache.rb +104 -0
- data/vendor/rails/activesupport/lib/active_support/cache/synchronized_memory_store.rb +47 -0
- data/vendor/rails/activesupport/lib/active_support/callbacks.rb +34 -30
- data/vendor/rails/activesupport/lib/active_support/core_ext.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/array.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/access.rb +27 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb +30 -12
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/extract_options.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/grouping.rb +53 -10
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/random_access.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/wrapper.rb +24 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/base64.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/base64/encoding.rb +3 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/benchmark.rb +13 -6
- data/vendor/rails/activesupport/lib/active_support/core_ext/bigdecimal.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/bigdecimal/conversions.rb +18 -22
- data/vendor/rails/activesupport/lib/active_support/core_ext/blank.rb +5 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/cgi.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb +14 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/class.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb +24 -24
- data/vendor/rails/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb +20 -19
- data/vendor/rails/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb +39 -39
- data/vendor/rails/activesupport/lib/active_support/core_ext/class/removal.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/date.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/date/behavior.rb +3 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb +24 -9
- data/vendor/rails/activesupport/lib/active_support/core_ext/date/conversions.rb +3 -3
- data/vendor/rails/activesupport/lib/active_support/core_ext/date_time.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/date_time/calculations.rb +19 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/date_time/conversions.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/duplicable.rb +6 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb +51 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/exception.rb +12 -8
- data/vendor/rails/activesupport/lib/active_support/core_ext/file.rb +4 -20
- data/vendor/rails/activesupport/lib/active_support/core_ext/file/atomic.rb +46 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/float.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/float/rounding.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/float/time.rb +27 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash.rb +2 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb +33 -55
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/deep_merge.rb +23 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/diff.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/except.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +6 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/keys.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb +12 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/slice.rb +15 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/integer.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/integer/even_odd.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/integer/inflections.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/integer/time.rb +45 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/agnostics.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/debugger.rb +4 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/requires.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/load_error.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/logger.rb +136 -7
- data/vendor/rails/activesupport/lib/active_support/core_ext/module.rb +11 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/aliasing.rb +71 -67
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb +4 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/attr_internal.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb +24 -24
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/delegation.rb +60 -3
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/inclusion.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/introspection.rb +81 -66
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/loading.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb +8 -7
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/synchronization.rb +39 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/name_error.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/numeric.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/numeric/bytes.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/numeric/conversions.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/numeric/time.rb +0 -10
- data/vendor/rails/activesupport/lib/active_support/core_ext/object.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/conversions.rb +2 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/extending.rb +29 -7
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/instance_variables.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/metaclass.rb +13 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb +52 -21
- data/vendor/rails/activesupport/lib/active_support/core_ext/pathname.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/pathname/clean_within.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/proc.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/process.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/process/daemon.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/range.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/range/blockless_step.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/range/conversions.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/range/include_range.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/range/overlaps.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/rexml.rb +29 -24
- data/vendor/rails/activesupport/lib/active_support/core_ext/string.rb +6 -2
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/access.rb +5 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/behavior.rb +13 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/conversions.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/filters.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/inflections.rb +22 -3
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/iterators.rb +3 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/multibyte.rb +81 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/starts_ends_with.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/xchar.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/symbol.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/time.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/time/behavior.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb +39 -12
- data/vendor/rails/activesupport/lib/active_support/core_ext/time/conversions.rb +2 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/time/zones.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/try.rb +36 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/uri.rb +16 -0
- data/vendor/rails/activesupport/lib/active_support/dependencies.rb +196 -124
- data/vendor/rails/activesupport/lib/active_support/deprecation.rb +33 -60
- data/vendor/rails/activesupport/lib/active_support/duration.rb +3 -1
- data/vendor/rails/activesupport/lib/active_support/gzip.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/inflections.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/inflector.rb +131 -38
- data/vendor/rails/activesupport/lib/active_support/json.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/json/decoding.rb +23 -4
- data/vendor/rails/activesupport/lib/active_support/json/encoders/date.rb +9 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb +9 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoders/enumerable.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/false_class.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb +10 -11
- data/vendor/rails/activesupport/lib/active_support/json/encoders/nil_class.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/numeric.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/object.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/regexp.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/string.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/symbol.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/time.rb +10 -3
- data/vendor/rails/activesupport/lib/active_support/json/encoders/true_class.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoding.rb +23 -29
- data/vendor/rails/activesupport/lib/active_support/json/variable.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/locale/en.yml +33 -0
- data/vendor/rails/activesupport/lib/active_support/memoizable.rb +100 -0
- data/vendor/rails/activesupport/lib/active_support/message_encryptor.rb +70 -0
- data/vendor/rails/activesupport/lib/active_support/message_verifier.rb +46 -0
- data/vendor/rails/activesupport/lib/active_support/multibyte.rb +31 -7
- data/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb +686 -122
- data/vendor/rails/activesupport/lib/active_support/multibyte/exceptions.rb +8 -0
- data/vendor/rails/activesupport/lib/active_support/multibyte/unicode_database.rb +71 -0
- data/vendor/rails/activesupport/lib/active_support/option_merger.rb +6 -8
- data/vendor/rails/activesupport/lib/active_support/ordered_hash.rb +81 -18
- data/vendor/rails/activesupport/lib/active_support/ordered_options.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/rescuable.rb +108 -0
- data/vendor/rails/activesupport/lib/active_support/secure_random.rb +199 -0
- data/vendor/rails/activesupport/lib/active_support/string_inquirer.rb +11 -1
- data/vendor/rails/activesupport/lib/active_support/test_case.rb +33 -7
- data/vendor/rails/activesupport/lib/active_support/{core_ext/test/unit → testing}/assertions.rb +14 -13
- data/vendor/rails/activesupport/lib/active_support/testing/declarative.rb +21 -0
- data/vendor/rails/activesupport/lib/active_support/testing/default.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/testing/deprecation.rb +55 -0
- data/vendor/rails/activesupport/lib/active_support/testing/performance.rb +452 -0
- data/vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb +66 -68
- data/vendor/rails/activesupport/lib/active_support/time_with_zone.rb +80 -50
- data/vendor/rails/activesupport/lib/active_support/values/time_zone.rb +12 -4
- data/vendor/rails/activesupport/lib/active_support/values/unicode_tables.dat +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor.rb +12 -9
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/blankslate.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder/css.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE +20 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile +20 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile +5 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec +27 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb +199 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb +214 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb +53 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb +5 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb +100 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb +125 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml +3 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb +568 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{memcache-client-1.5.0 → memcache-client-1.6.5}/memcache.rb +383 -297
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/data_timezone.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/data_timezone_info.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Algiers.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Cairo.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Casablanca.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Harare.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Johannesburg.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Monrovia.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Africa/Nairobi.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Argentina/Buenos_Aires.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/America/Argentina/San_Juan.rb +86 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Bogota.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Caracas.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Chicago.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Chihuahua.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Denver.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Godthab.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Guatemala.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Halifax.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Indiana/Indianapolis.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Juneau.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/La_Paz.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Lima.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Los_Angeles.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Mazatlan.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Mexico_City.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Monterrey.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/New_York.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Phoenix.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Regina.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Santiago.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Sao_Paulo.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/St_Johns.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/America/Tijuana.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Almaty.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Baghdad.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Baku.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Bangkok.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Chongqing.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.12/tzinfo/definitions/Asia/Colombo.rb +30 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Dhaka.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Hong_Kong.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Irkutsk.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Jakarta.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Jerusalem.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Kabul.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Kamchatka.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Karachi.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Katmandu.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Kolkata.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Krasnoyarsk.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Kuala_Lumpur.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Kuwait.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Magadan.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Muscat.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Novosibirsk.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Rangoon.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Riyadh.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Seoul.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Shanghai.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Singapore.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Taipei.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Tashkent.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Tbilisi.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Tehran.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Tokyo.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Ulaanbaatar.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Urumqi.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Vladivostok.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Yakutsk.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Yekaterinburg.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Asia/Yerevan.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Atlantic/Azores.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Atlantic/Cape_Verde.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Atlantic/South_Georgia.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Adelaide.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Brisbane.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Darwin.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Hobart.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Melbourne.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Perth.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Australia/Sydney.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Etc/UTC.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Amsterdam.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Athens.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Belgrade.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Berlin.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Bratislava.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Brussels.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Bucharest.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Budapest.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Copenhagen.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Dublin.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Helsinki.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Istanbul.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Kiev.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Lisbon.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Ljubljana.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/London.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Madrid.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Minsk.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Moscow.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Paris.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Prague.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Riga.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Rome.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Sarajevo.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Skopje.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Sofia.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Stockholm.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Tallinn.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Vienna.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Vilnius.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Warsaw.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Europe/Zagreb.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Auckland.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Fiji.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Guam.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Honolulu.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Majuro.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Midway.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Noumea.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Pago_Pago.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Port_Moresby.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/definitions/Pacific/Tongatapu.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/info_timezone.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/linked_timezone.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/linked_timezone_info.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/offset_rationals.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/ruby_core_support.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/time_or_datetime.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/timezone.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/timezone_definition.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/timezone_info.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/timezone_offset_info.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/timezone_period.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/vendor/{tzinfo-0.3.11 → tzinfo-0.3.12}/tzinfo/timezone_transition_info.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/version.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/whiny_nil.rb +0 -0
- data/vendor/rails/activesupport/lib/active_support/xml_mini.rb +31 -0
- data/vendor/rails/activesupport/lib/active_support/xml_mini/libxml.rb +133 -0
- data/vendor/rails/activesupport/lib/active_support/xml_mini/nokogiri.rb +77 -0
- data/vendor/rails/activesupport/lib/active_support/xml_mini/rexml.rb +108 -0
- data/vendor/rails/activesupport/lib/activesupport.rb +0 -0
- data/vendor/rails/railties/CHANGELOG +297 -188
- data/vendor/rails/railties/MIT-LICENSE +1 -1
- data/vendor/rails/railties/README +6 -19
- data/vendor/rails/railties/Rakefile +33 -20
- data/vendor/rails/railties/bin/rails +1 -0
- data/vendor/rails/railties/builtin/rails_info/rails/info.rb +12 -8
- data/vendor/rails/railties/builtin/rails_info/rails/info_controller.rb +0 -0
- data/vendor/rails/railties/builtin/rails_info/rails/info_helper.rb +0 -0
- data/vendor/rails/railties/builtin/rails_info/rails_info_controller.rb +0 -0
- data/vendor/rails/railties/configs/databases/frontbase.yml +0 -0
- data/vendor/rails/railties/configs/databases/ibm_db.yml +62 -0
- data/vendor/rails/railties/configs/databases/mysql.yml +6 -0
- data/vendor/rails/railties/configs/databases/oracle.yml +0 -0
- data/vendor/rails/railties/configs/databases/postgresql.yml +3 -0
- data/vendor/rails/railties/configs/databases/sqlite2.yml +3 -0
- data/vendor/rails/railties/configs/databases/sqlite3.yml +3 -0
- data/vendor/rails/railties/configs/empty.log +0 -0
- data/vendor/rails/railties/configs/initializers/backtrace_silencers.rb +7 -0
- data/vendor/rails/railties/configs/initializers/inflections.rb +0 -0
- data/vendor/rails/railties/configs/initializers/mime_types.rb +0 -0
- data/vendor/rails/railties/configs/initializers/new_rails_defaults.rb +2 -0
- data/vendor/rails/railties/configs/initializers/session_store.rb +15 -0
- data/vendor/rails/railties/configs/locales/en.yml +5 -0
- data/vendor/rails/railties/configs/routes.rb +0 -0
- data/vendor/rails/railties/dispatches/config.ru +7 -0
- data/vendor/rails/railties/dispatches/dispatch.fcgi +1 -1
- data/vendor/rails/railties/dispatches/dispatch.rb +2 -2
- data/vendor/rails/railties/dispatches/gateway.cgi +2 -2
- data/vendor/rails/railties/doc/README_FOR_APP +0 -0
- data/vendor/rails/railties/environments/boot.rb +3 -2
- data/vendor/rails/railties/environments/development.rb +0 -0
- data/vendor/rails/railties/environments/environment.rb +16 -42
- data/vendor/rails/railties/environments/production.rb +10 -4
- data/vendor/rails/railties/environments/test.rb +6 -0
- data/vendor/rails/railties/helpers/application_controller.rb +10 -0
- data/vendor/rails/railties/helpers/application_helper.rb +0 -0
- data/vendor/rails/railties/helpers/performance_test.rb +9 -0
- data/vendor/rails/railties/helpers/test_helper.rb +1 -1
- data/vendor/rails/railties/html/404.html +0 -0
- data/vendor/rails/railties/html/422.html +0 -0
- data/vendor/rails/railties/html/500.html +1 -1
- data/vendor/rails/railties/html/favicon.ico +0 -0
- data/vendor/rails/railties/html/images/rails.png +0 -0
- data/vendor/rails/railties/html/index.html +1 -0
- data/vendor/rails/railties/html/javascripts/application.js +0 -0
- data/vendor/rails/railties/html/javascripts/controls.js +72 -72
- data/vendor/rails/railties/html/javascripts/dragdrop.js +165 -164
- data/vendor/rails/railties/html/javascripts/effects.js +173 -165
- data/vendor/rails/railties/html/javascripts/prototype.js +362 -267
- data/vendor/rails/railties/html/robots.txt +0 -0
- data/vendor/rails/railties/lib/code_statistics.rb +0 -0
- data/vendor/rails/railties/lib/commands.rb +0 -0
- data/vendor/rails/railties/lib/commands/about.rb +1 -1
- data/vendor/rails/railties/lib/commands/console.rb +13 -0
- data/vendor/rails/railties/lib/commands/dbconsole.rb +20 -4
- data/vendor/rails/railties/lib/commands/destroy.rb +0 -0
- data/vendor/rails/railties/lib/commands/ncgi/listener +2 -2
- data/vendor/rails/railties/lib/commands/ncgi/tracker +2 -2
- data/vendor/rails/railties/lib/commands/performance/benchmarker.rb +0 -0
- data/vendor/rails/railties/lib/commands/performance/profiler.rb +0 -0
- data/vendor/rails/railties/lib/commands/plugin.rb +43 -25
- data/vendor/rails/railties/lib/commands/runner.rb +13 -7
- data/vendor/rails/railties/lib/commands/server.rb +100 -25
- data/vendor/rails/railties/lib/commands/update.rb +0 -0
- data/vendor/rails/railties/lib/console_app.rb +4 -4
- data/vendor/rails/railties/lib/console_sandbox.rb +0 -0
- data/vendor/rails/railties/lib/console_with_helpers.rb +2 -23
- data/vendor/rails/railties/lib/dispatcher.rb +1 -1
- data/vendor/rails/railties/lib/fcgi_handler.rb +13 -13
- data/vendor/rails/railties/lib/initializer.rb +256 -66
- data/vendor/rails/railties/lib/performance_test_help.rb +5 -0
- data/vendor/rails/railties/lib/rails/backtrace_cleaner.rb +54 -0
- data/vendor/rails/railties/lib/rails/gem_builder.rb +3 -3
- data/vendor/rails/railties/lib/rails/gem_dependency.rb +209 -56
- data/vendor/rails/railties/lib/rails/plugin.rb +59 -8
- data/vendor/rails/railties/lib/rails/plugin/loader.rb +66 -27
- data/vendor/rails/railties/lib/rails/plugin/locator.rb +1 -1
- data/vendor/rails/railties/lib/rails/rack.rb +8 -0
- data/vendor/rails/railties/lib/rails/rack/debugger.rb +21 -0
- data/vendor/rails/railties/lib/rails/rack/log_tailer.rb +35 -0
- data/vendor/rails/railties/lib/rails/rack/metal.rb +51 -0
- data/vendor/rails/railties/lib/rails/rack/static.rb +46 -0
- data/vendor/rails/railties/lib/rails/vendor_gem_source_index.rb +140 -0
- data/vendor/rails/railties/lib/rails/version.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/base.rb +3 -0
- data/vendor/rails/railties/lib/rails_generator/commands.rb +16 -17
- data/vendor/rails/railties/lib/rails_generator/generated_attribute.rb +4 -0
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb +213 -133
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/scm.rb +8 -0
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/scm/svn.rb +7 -0
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/template_runner.rb +401 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/USAGE +12 -11
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/controller_generator.rb +7 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/controller.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/helper.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/helper_test.rb +4 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/controller/templates/view.html.erb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/helper/USAGE +24 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/helper/helper_generator.rb +25 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper.rb +2 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/helper/templates/helper_test.rb +4 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/integration_test/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb +2 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/fixture.erb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/mailer.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb +2 -3
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/view.erb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/mailer/templates/view.rhtml +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/metal/USAGE +8 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/metal/metal_generator.rb +8 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/metal/templates/metal.rb +12 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/migration/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/migration/migration_generator.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/migration/templates/migration.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/model_generator.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/templates/fixtures.yml +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/templates/migration.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/templates/model.rb +3 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/templates/unit_test.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/observer/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/observer/observer_generator.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/observer/templates/observer.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/observer/templates/unit_test.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/performance_test/USAGE +8 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/performance_test/performance_test_generator.rb +16 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb +9 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb +11 -11
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/README +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/Rakefile +1 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/generator.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/init.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/install.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/plugin.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/tasks.rake +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/test_helper.rb +3 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/uninstall.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/unit_test.rb +4 -4
- data/vendor/rails/railties/lib/rails_generator/generators/components/resource/USAGE +2 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/resource/resource_generator.rb +4 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/controller.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/functional_test.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/helper.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/resource/templates/helper_test.rb +4 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/USAGE +9 -5
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +12 -3
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb +11 -11
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/helper.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/helper_test.rb +4 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/style.css +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb +2 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb +2 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb +2 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/session_migration/USAGE +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/generators/components/session_migration/templates/migration.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/lookup.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/manifest.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/options.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/scripts.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/scripts/destroy.rb +6 -7
- data/vendor/rails/railties/lib/rails_generator/scripts/generate.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/scripts/update.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/secret_key_generator.rb +7 -147
- data/vendor/rails/railties/lib/rails_generator/simple_logger.rb +0 -0
- data/vendor/rails/railties/lib/rails_generator/spec.rb +0 -0
- data/vendor/rails/railties/lib/railties_path.rb +0 -0
- data/vendor/rails/railties/lib/ruby_version_check.rb +0 -0
- data/vendor/rails/railties/lib/rubyprof_ext.rb +0 -0
- data/vendor/rails/railties/lib/source_annotation_extractor.rb +0 -0
- data/vendor/rails/railties/lib/tasks/annotations.rake +8 -11
- data/vendor/rails/railties/lib/tasks/databases.rake +55 -21
- data/vendor/rails/railties/lib/tasks/documentation.rake +8 -0
- data/vendor/rails/railties/lib/tasks/framework.rake +31 -2
- data/vendor/rails/railties/lib/tasks/gems.rake +41 -40
- data/vendor/rails/railties/lib/tasks/log.rake +0 -0
- data/vendor/rails/railties/lib/tasks/middleware.rake +7 -0
- data/vendor/rails/railties/lib/tasks/misc.rake +10 -4
- data/vendor/rails/railties/lib/tasks/rails.rb +0 -0
- data/vendor/rails/railties/lib/tasks/routes.rake +0 -0
- data/vendor/rails/railties/lib/tasks/statistics.rake +0 -1
- data/vendor/rails/railties/lib/tasks/testing.rake +30 -9
- data/vendor/rails/railties/lib/test_help.rb +17 -10
- data/vendor/rails/railties/lib/webrick_server.rb +2 -11
- data/vendor/redcloth/Rakefile +0 -0
- data/vendor/redcloth/bin/redcloth +0 -0
- data/vendor/redcloth/doc/CHANGELOG +0 -0
- data/vendor/redcloth/doc/COPYING +0 -0
- data/vendor/redcloth/doc/README +0 -0
- data/vendor/redcloth/doc/REFERENCE +0 -0
- data/vendor/redcloth/doc/make.rb +0 -0
- data/vendor/redcloth/lib/rctodb.rb +0 -0
- data/vendor/redcloth/lib/redcloth.rb +0 -0
- data/vendor/redcloth/run-tests.rb +0 -0
- data/vendor/redcloth/setup.rb +0 -0
- data/vendor/redcloth/tests/code.yml +0 -0
- data/vendor/redcloth/tests/images.yml +0 -0
- data/vendor/redcloth/tests/instiki.yml +0 -0
- data/vendor/redcloth/tests/links.yml +0 -0
- data/vendor/redcloth/tests/lists.yml +0 -0
- data/vendor/redcloth/tests/markdown.yml +0 -0
- data/vendor/redcloth/tests/poignant.yml +0 -0
- data/vendor/redcloth/tests/table.yml +0 -0
- data/vendor/redcloth/tests/textism.yml +0 -0
- metadata +514 -315
- data/app/controllers/admin/abstract_model_controller.rb +0 -134
- data/app/models/response_cache.rb +0 -187
- data/lib/plugins/extension_patches/lib/fixture_loading_extension.rb +0 -76
- data/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb +0 -93
- data/lib/radiant/compat.rb +0 -10
- data/spec/integration/admin/content_negotiation_spec.rb +0 -27
- data/spec/integration/admin/pages_integration_spec.rb +0 -124
- data/spec/integration/admin/permission_integration_spec.rb +0 -24
- data/spec/integration/admin/snippets_integration_spec.rb +0 -73
- data/spec/integration/admin/user_management_integration_spec.rb +0 -80
- data/spec/integration/admin/user_preferences_integration_spec.rb +0 -19
- data/spec/integration/page_serving_spec.rb +0 -37
- data/spec/models/response_cache_spec.rb +0 -286
- data/stories/all.rb +0 -4
- data/stories/helper.rb +0 -3
- data/vendor/highline/AUTHORS +0 -2
- data/vendor/highline/COPYING +0 -340
- data/vendor/highline/site/highline.css +0 -65
- data/vendor/highline/site/images/logo.png +0 -0
- data/vendor/highline/site/index.html +0 -59
- data/vendor/plugins/dataset/History.txt +0 -9
- data/vendor/plugins/dataset/Manifest.txt +0 -21
- data/vendor/plugins/default_order/README +0 -35
- data/vendor/plugins/default_order/Rakefile +0 -22
- data/vendor/plugins/default_order/init.rb +0 -1
- data/vendor/plugins/default_order/lib/default_order.rb +0 -32
- data/vendor/plugins/default_order/test/default_order_test.rb +0 -5
- data/vendor/plugins/spec_integration/LICENSE +0 -19
- data/vendor/plugins/spec_integration/README +0 -117
- data/vendor/plugins/spec_integration/Rakefile +0 -10
- data/vendor/plugins/spec_integration/lib/spec/integration.rb +0 -10
- data/vendor/plugins/spec_integration/lib/spec/integration/dsl.rb +0 -11
- data/vendor/plugins/spec_integration/lib/spec/integration/dsl/form.rb +0 -157
- data/vendor/plugins/spec_integration/lib/spec/integration/dsl/integration_example_group.rb +0 -97
- data/vendor/plugins/spec_integration/lib/spec/integration/dsl/navigation.rb +0 -102
- data/vendor/plugins/spec_integration/lib/spec/integration/extensions.rb +0 -8
- data/vendor/plugins/spec_integration/lib/spec/integration/extensions/action_controller.rb +0 -25
- data/vendor/plugins/spec_integration/lib/spec/integration/extensions/hash.rb +0 -48
- data/vendor/plugins/spec_integration/lib/spec/integration/matchers.rb +0 -1
- data/vendor/plugins/spec_integration/lib/spec/integration/matchers/display_object.rb +0 -41
- data/vendor/plugins/spec_integration/lib/spec/integration/matchers/have_link_to.rb +0 -35
- data/vendor/plugins/spec_integration/lib/spec/integration/matchers/navigate_successfully.rb +0 -60
- data/vendor/plugins/spec_integration/lib/spec/integration/matchers/showing.rb +0 -44
- data/vendor/plugins/spec_integration/spec/application.rb +0 -3
- data/vendor/plugins/spec_integration/spec/dispatcher.rb +0 -24
- data/vendor/plugins/spec_integration/spec/dsl/form_spec.rb +0 -130
- data/vendor/plugins/spec_integration/spec/dsl/integration_spec_spec.rb +0 -38
- data/vendor/plugins/spec_integration/spec/dsl/navigation_spec.rb +0 -35
- data/vendor/plugins/spec_integration/spec/integration_dsl_controller.rb +0 -5
- data/vendor/plugins/spec_integration/spec/spec.opts +0 -7
- data/vendor/plugins/spec_integration/spec/spec_helper.rb +0 -10
- data/vendor/plugins/spec_integration/tasks/integration.rake +0 -14
- data/vendor/plugins/vizres/CHANGELOG +0 -15
- data/vendor/plugins/vizres/MIT-LICENSE +0 -16
- data/vendor/plugins/vizres/README +0 -80
- data/vendor/plugins/vizres/Rakefile +0 -22
- data/vendor/plugins/vizres/init.rb +0 -1
- data/vendor/plugins/vizres/lib/vizres.rb +0 -33
- data/vendor/plugins/vizres/lib/vizres/browser.rb +0 -36
- data/vendor/plugins/vizres/lib/vizres/scm.rb +0 -27
- data/vendor/plugins/vizres/test/vizres/browser_test.rb +0 -76
- data/vendor/plugins/vizres/test/vizres/scm_test.rb +0 -41
- data/vendor/plugins/vizres/test/vizres_test.rb +0 -55
- data/vendor/plugins/vizres/vizres.gemspec +0 -26
- data/vendor/rails/actionmailer/lib/action_mailer/vendor.rb +0 -14
- data/vendor/rails/actionpack/lib/action_controller/assertions.rb +0 -69
- data/vendor/rails/actionpack/lib/action_controller/caching/sql_cache.rb +0 -18
- data/vendor/rails/actionpack/lib/action_controller/cgi_ext/session.rb +0 -73
- data/vendor/rails/actionpack/lib/action_controller/components.rb +0 -166
- data/vendor/rails/actionpack/lib/action_controller/request_profiler.rb +0 -169
- data/vendor/rails/actionpack/lib/action_controller/session/active_record_store.rb +0 -340
- data/vendor/rails/actionpack/lib/action_controller/session/drb_server.rb +0 -32
- data/vendor/rails/actionpack/lib/action_controller/session/drb_store.rb +0 -35
- data/vendor/rails/actionpack/lib/action_view/helpers/javascripts/controls.js +0 -963
- data/vendor/rails/actionpack/lib/action_view/helpers/javascripts/dragdrop.js +0 -972
- data/vendor/rails/actionpack/lib/action_view/helpers/javascripts/effects.js +0 -1120
- data/vendor/rails/actionpack/lib/action_view/helpers/javascripts/prototype.js +0 -4225
- data/vendor/rails/actionpack/lib/action_view/partial_template.rb +0 -70
- data/vendor/rails/actionpack/lib/action_view/template_finder.rb +0 -177
- data/vendor/rails/actionpack/lib/action_view/template_handlers/compilable.rb +0 -128
- data/vendor/rails/actionpack/test/controller/cgi_test.rb +0 -116
- data/vendor/rails/actionpack/test/controller/components_test.rb +0 -140
- data/vendor/rails/actionpack/test/controller/custom_handler_test.rb +0 -45
- data/vendor/rails/actionpack/test/controller/http_authentication_test.rb +0 -54
- data/vendor/rails/actionpack/test/controller/integration_upload_test.rb +0 -43
- data/vendor/rails/actionpack/test/controller/new_render_test.rb +0 -945
- data/vendor/rails/actionpack/test/controller/session_fixation_test.rb +0 -89
- data/vendor/rails/actionpack/test/controller/session_management_test.rb +0 -178
- data/vendor/rails/actionpack/test/fixtures/test/block_content_for.erb +0 -2
- data/vendor/rails/actionpack/test/fixtures/test/erb_content_for.erb +0 -2
- data/vendor/rails/actionpack/test/template/deprecated_erb_variable_test.rb +0 -9
- data/vendor/rails/actionpack/test/template/template_finder_test.rb +0 -73
- data/vendor/rails/actionpack/test/template/template_object_test.rb +0 -95
- data/vendor/rails/activerecord/lib/active_record/vendor/mysql.rb +0 -1214
- data/vendor/rails/activerecord/test/cases/adapter_test_sqlserver.rb +0 -95
- data/vendor/rails/activerecord/test/cases/table_name_test_sqlserver.rb +0 -23
- data/vendor/rails/activerecord/test/cases/threaded_connections_test.rb +0 -48
- data/vendor/rails/activerecord/test/schema/sqlserver_specific_schema.rb +0 -5
- data/vendor/rails/activesupport/lib/active_support/clean_logger.rb +0 -127
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/unicode.rb +0 -66
- data/vendor/rails/activesupport/lib/active_support/core_ext/test.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/multibyte/generators/generate_tables.rb +0 -149
- data/vendor/rails/activesupport/lib/active_support/multibyte/handlers/passthru_handler.rb +0 -9
- data/vendor/rails/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb +0 -564
- data/vendor/rails/activesupport/lib/active_support/multibyte/handlers/utf8_handler_proc.rb +0 -43
- data/vendor/rails/activesupport/lib/active_support/vendor/tzinfo-0.3.11/tzinfo/definitions/America/Argentina/San_Juan.rb +0 -170
- data/vendor/rails/activesupport/lib/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb +0 -1021
- data/vendor/rails/railties/bin/performance/request +0 -3
- data/vendor/rails/railties/bin/process/inspector +0 -3
- data/vendor/rails/railties/bin/process/reaper +0 -3
- data/vendor/rails/railties/bin/process/spawner +0 -3
- data/vendor/rails/railties/configs/apache.conf +0 -40
- data/vendor/rails/railties/configs/lighttpd.conf +0 -54
- data/vendor/rails/railties/helpers/application.rb +0 -15
- data/vendor/rails/railties/lib/commands/performance/request.rb +0 -6
- data/vendor/rails/railties/lib/commands/process/inspector.rb +0 -68
- data/vendor/rails/railties/lib/commands/process/reaper.rb +0 -149
- data/vendor/rails/railties/lib/commands/process/spawner.rb +0 -219
- data/vendor/rails/railties/lib/commands/process/spinner.rb +0 -57
- data/vendor/rails/railties/lib/commands/servers/base.rb +0 -31
- data/vendor/rails/railties/lib/commands/servers/lighttpd.rb +0 -94
- data/vendor/rails/railties/lib/commands/servers/mongrel.rb +0 -69
- data/vendor/rails/railties/lib/commands/servers/new_mongrel.rb +0 -16
- data/vendor/rails/railties/lib/commands/servers/webrick.rb +0 -66
- data/vendor/rails/railties/lib/rails/mongrel_server/commands.rb +0 -342
- data/vendor/rails/railties/lib/rails/mongrel_server/handler.rb +0 -55
File without changes
|
@@ -49,11 +49,10 @@ module ActionView
|
|
49
49
|
#
|
50
50
|
def content_tag_for(tag_name, record, *args, &block)
|
51
51
|
prefix = args.first.is_a?(Hash) ? nil : args.shift
|
52
|
-
options = args.
|
53
|
-
|
54
|
-
|
55
|
-
block.binding
|
52
|
+
options = args.extract_options!
|
53
|
+
options.merge!({ :class => "#{dom_class(record)} #{options[:class]}".strip, :id => dom_id(record, prefix) })
|
54
|
+
content_tag(tag_name, options, &block)
|
56
55
|
end
|
57
56
|
end
|
58
57
|
end
|
59
|
-
end
|
58
|
+
end
|
@@ -1,22 +1,17 @@
|
|
1
1
|
require 'action_view/helpers/tag_helper'
|
2
|
-
require 'html/document'
|
3
2
|
|
4
3
|
module ActionView
|
5
4
|
module Helpers #:nodoc:
|
6
5
|
# The SanitizeHelper module provides a set of methods for scrubbing text of undesired HTML elements.
|
7
6
|
# These helper methods extend ActionView making them callable within your template files.
|
8
7
|
module SanitizeHelper
|
9
|
-
def self.included(base)
|
10
|
-
base.extend(ClassMethods)
|
11
|
-
end
|
12
|
-
|
13
8
|
# This +sanitize+ helper will html encode all tags and strip all attributes that aren't specifically allowed.
|
14
9
|
# It also strips href/src tags with invalid protocols, like javascript: especially. It does its best to counter any
|
15
10
|
# tricks that hackers may use, like throwing in unicode/ascii/hex values to get past the javascript: filters. Check out
|
16
11
|
# the extensive test suite.
|
17
12
|
#
|
18
13
|
# <%= sanitize @article.body %>
|
19
|
-
#
|
14
|
+
#
|
20
15
|
# You can add or remove tags/attributes if you want to customize it a bit. See ActionView::Base for full docs on the
|
21
16
|
# available options. You can add tags/attributes for single uses of +sanitize+ by passing either the <tt>:attributes</tt> or <tt>:tags</tt> options:
|
22
17
|
#
|
@@ -27,27 +22,27 @@ module ActionView
|
|
27
22
|
# Custom Use (only the mentioned tags and attributes are allowed, nothing else)
|
28
23
|
#
|
29
24
|
# <%= sanitize @article.body, :tags => %w(table tr td), :attributes => %w(id class style)
|
30
|
-
#
|
25
|
+
#
|
31
26
|
# Add table tags to the default allowed tags
|
32
|
-
#
|
27
|
+
#
|
33
28
|
# Rails::Initializer.run do |config|
|
34
29
|
# config.action_view.sanitized_allowed_tags = 'table', 'tr', 'td'
|
35
30
|
# end
|
36
|
-
#
|
31
|
+
#
|
37
32
|
# Remove tags to the default allowed tags
|
38
|
-
#
|
33
|
+
#
|
39
34
|
# Rails::Initializer.run do |config|
|
40
35
|
# config.after_initialize do
|
41
36
|
# ActionView::Base.sanitized_allowed_tags.delete 'div'
|
42
37
|
# end
|
43
38
|
# end
|
44
|
-
#
|
39
|
+
#
|
45
40
|
# Change allowed default attributes
|
46
|
-
#
|
41
|
+
#
|
47
42
|
# Rails::Initializer.run do |config|
|
48
43
|
# config.action_view.sanitized_allowed_attributes = 'id', 'class', 'style'
|
49
44
|
# end
|
50
|
-
#
|
45
|
+
#
|
51
46
|
# Please note that sanitizing user-provided text does not guarantee that the
|
52
47
|
# resulting markup is valid (conforming to a document type) or even well-formed.
|
53
48
|
# The output may still contain e.g. unescaped '<', '>', '&' characters and
|
@@ -62,8 +57,8 @@ module ActionView
|
|
62
57
|
self.class.white_list_sanitizer.sanitize_css(style)
|
63
58
|
end
|
64
59
|
|
65
|
-
# Strips all HTML tags from the +html+, including comments. This uses the
|
66
|
-
# html-scanner tokenizer and so its HTML parsing ability is limited by
|
60
|
+
# Strips all HTML tags from the +html+, including comments. This uses the
|
61
|
+
# html-scanner tokenizer and so its HTML parsing ability is limited by
|
67
62
|
# that of html-scanner.
|
68
63
|
#
|
69
64
|
# ==== Examples
|
@@ -73,10 +68,10 @@ module ActionView
|
|
73
68
|
#
|
74
69
|
# strip_tags("<b>Bold</b> no more! <a href='more.html'>See more here</a>...")
|
75
70
|
# # => Bold no more! See more here...
|
76
|
-
#
|
71
|
+
#
|
77
72
|
# strip_tags("<div id='top-bar'>Welcome to my website!</div>")
|
78
73
|
# # => Welcome to my website!
|
79
|
-
def strip_tags(html)
|
74
|
+
def strip_tags(html)
|
80
75
|
self.class.full_sanitizer.sanitize(html)
|
81
76
|
end
|
82
77
|
|
@@ -96,21 +91,48 @@ module ActionView
|
|
96
91
|
end
|
97
92
|
|
98
93
|
module ClassMethods #:nodoc:
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
94
|
+
attr_writer :full_sanitizer, :link_sanitizer, :white_list_sanitizer
|
95
|
+
|
96
|
+
def sanitized_protocol_separator
|
97
|
+
white_list_sanitizer.protocol_separator
|
98
|
+
end
|
99
|
+
|
100
|
+
def sanitized_uri_attributes
|
101
|
+
white_list_sanitizer.uri_attributes
|
102
|
+
end
|
103
|
+
|
104
|
+
def sanitized_bad_tags
|
105
|
+
white_list_sanitizer.bad_tags
|
106
|
+
end
|
107
|
+
|
108
|
+
def sanitized_allowed_tags
|
109
|
+
white_list_sanitizer.allowed_tags
|
110
|
+
end
|
111
|
+
|
112
|
+
def sanitized_allowed_attributes
|
113
|
+
white_list_sanitizer.allowed_attributes
|
114
|
+
end
|
115
|
+
|
116
|
+
def sanitized_allowed_css_properties
|
117
|
+
white_list_sanitizer.allowed_css_properties
|
118
|
+
end
|
119
|
+
|
120
|
+
def sanitized_allowed_css_keywords
|
121
|
+
white_list_sanitizer.allowed_css_keywords
|
122
|
+
end
|
123
|
+
|
124
|
+
def sanitized_shorthand_css_properties
|
125
|
+
white_list_sanitizer.shorthand_css_properties
|
126
|
+
end
|
127
|
+
|
128
|
+
def sanitized_allowed_protocols
|
129
|
+
white_list_sanitizer.allowed_protocols
|
130
|
+
end
|
131
|
+
|
132
|
+
def sanitized_protocol_separator=(value)
|
133
|
+
white_list_sanitizer.protocol_separator = value
|
134
|
+
end
|
135
|
+
|
114
136
|
# Gets the HTML::FullSanitizer instance used by +strip_tags+. Replace with
|
115
137
|
# any object that responds to +sanitize+.
|
116
138
|
#
|
@@ -184,7 +206,7 @@ module ActionView
|
|
184
206
|
HTML::WhiteListSanitizer.allowed_attributes.merge(attributes)
|
185
207
|
end
|
186
208
|
|
187
|
-
# Adds to the Set of allowed CSS properties for the #sanitize and +sanitize_css+
|
209
|
+
# Adds to the Set of allowed CSS properties for the #sanitize and +sanitize_css+ helpers.
|
188
210
|
#
|
189
211
|
# Rails::Initializer.run do |config|
|
190
212
|
# config.action_view.sanitized_allowed_css_properties = 'expression'
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'action_view/helpers/javascript_helper'
|
2
|
+
require 'active_support/json'
|
2
3
|
|
3
4
|
module ActionView
|
4
5
|
module Helpers
|
@@ -95,7 +96,7 @@ module ActionView
|
|
95
96
|
# * <tt>:containment</tt> - Takes an element or array of elements to treat as
|
96
97
|
# potential drop targets (defaults to the original target element).
|
97
98
|
#
|
98
|
-
# * <tt>:only</tt> - A CSS class name or
|
99
|
+
# * <tt>:only</tt> - A CSS class name or array of class names used to filter
|
99
100
|
# out child elements as candidates.
|
100
101
|
#
|
101
102
|
# * <tt>:scroll</tt> - Determines whether to scroll the list during drag
|
@@ -193,7 +194,7 @@ module ActionView
|
|
193
194
|
#
|
194
195
|
# * <tt>:onDrop</tt> - Called when a +draggable_element+ is dropped onto
|
195
196
|
# this element. Override this callback with a JavaScript expression to
|
196
|
-
# change the default drop
|
197
|
+
# change the default drop behaviour. Example:
|
197
198
|
#
|
198
199
|
# :onDrop => "function(draggable_element, droppable_element, event) { alert('I like bananas') }"
|
199
200
|
#
|
@@ -1,5 +1,4 @@
|
|
1
|
-
require '
|
2
|
-
require 'erb'
|
1
|
+
require 'action_view/erb/util'
|
3
2
|
require 'set'
|
4
3
|
|
5
4
|
module ActionView
|
@@ -9,17 +8,17 @@ module ActionView
|
|
9
8
|
module TagHelper
|
10
9
|
include ERB::Util
|
11
10
|
|
12
|
-
BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple).to_set
|
11
|
+
BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked).to_set
|
13
12
|
BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map(&:to_sym))
|
14
13
|
|
15
|
-
# Returns an empty HTML tag of type +name+ which by default is XHTML
|
16
|
-
# compliant. Set +open+ to true to create an open tag compatible
|
17
|
-
# with HTML 4.0 and below. Add HTML attributes by passing an attributes
|
14
|
+
# Returns an empty HTML tag of type +name+ which by default is XHTML
|
15
|
+
# compliant. Set +open+ to true to create an open tag compatible
|
16
|
+
# with HTML 4.0 and below. Add HTML attributes by passing an attributes
|
18
17
|
# hash to +options+. Set +escape+ to false to disable attribute value
|
19
18
|
# escaping.
|
20
19
|
#
|
21
20
|
# ==== Options
|
22
|
-
# The +options+ hash is used with attributes with no value like (<tt>disabled</tt> and
|
21
|
+
# The +options+ hash is used with attributes with no value like (<tt>disabled</tt> and
|
23
22
|
# <tt>readonly</tt>), which you can give a value of true in the +options+ hash. You can use
|
24
23
|
# symbols or strings for the attribute names.
|
25
24
|
#
|
@@ -30,7 +29,7 @@ module ActionView
|
|
30
29
|
# tag("br", nil, true)
|
31
30
|
# # => <br>
|
32
31
|
#
|
33
|
-
# tag("input", { :type => 'text', :disabled => true })
|
32
|
+
# tag("input", { :type => 'text', :disabled => true })
|
34
33
|
# # => <input type="text" disabled="disabled" />
|
35
34
|
#
|
36
35
|
# tag("img", { :src => "open & shut.png" })
|
@@ -43,13 +42,13 @@ module ActionView
|
|
43
42
|
end
|
44
43
|
|
45
44
|
# Returns an HTML block tag of type +name+ surrounding the +content+. Add
|
46
|
-
# HTML attributes by passing an attributes hash to +options+.
|
45
|
+
# HTML attributes by passing an attributes hash to +options+.
|
47
46
|
# Instead of passing the content as an argument, you can also use a block
|
48
47
|
# in which case, you pass your +options+ as the second parameter.
|
49
48
|
# Set escape to false to disable attribute value escaping.
|
50
49
|
#
|
51
50
|
# ==== Options
|
52
|
-
# The +options+ hash is used with attributes with no value like (<tt>disabled</tt> and
|
51
|
+
# The +options+ hash is used with attributes with no value like (<tt>disabled</tt> and
|
53
52
|
# <tt>readonly</tt>), which you can give a value of true in the +options+ hash. You can use
|
54
53
|
# symbols or strings for the attribute names.
|
55
54
|
#
|
@@ -64,16 +63,19 @@ module ActionView
|
|
64
63
|
# <% content_tag :div, :class => "strong" do -%>
|
65
64
|
# Hello world!
|
66
65
|
# <% end -%>
|
67
|
-
# # => <div class="strong"
|
66
|
+
# # => <div class="strong">Hello world!</div>
|
68
67
|
def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
|
69
68
|
if block_given?
|
70
69
|
options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
|
71
|
-
|
72
|
-
|
73
|
-
|
70
|
+
content_tag = content_tag_string(name, capture(&block), options, escape)
|
71
|
+
|
72
|
+
if block_called_from_erb?(block)
|
73
|
+
concat(content_tag)
|
74
|
+
else
|
75
|
+
content_tag
|
76
|
+
end
|
74
77
|
else
|
75
|
-
|
76
|
-
content_tag_string(name, content, options, escape)
|
78
|
+
content_tag_string(name, content_or_options_with_block, options, escape)
|
77
79
|
end
|
78
80
|
end
|
79
81
|
|
@@ -95,7 +97,7 @@ module ActionView
|
|
95
97
|
# Returns an escaped version of +html+ without affecting existing escaped entities.
|
96
98
|
#
|
97
99
|
# ==== Examples
|
98
|
-
# escape_once("1
|
100
|
+
# escape_once("1 < 2 & 3")
|
99
101
|
# # => "1 < 2 & 3"
|
100
102
|
#
|
101
103
|
# escape_once("<< Accept & Checkout")
|
@@ -105,6 +107,22 @@ module ActionView
|
|
105
107
|
end
|
106
108
|
|
107
109
|
private
|
110
|
+
BLOCK_CALLED_FROM_ERB = 'defined? __in_erb_template'
|
111
|
+
|
112
|
+
if RUBY_VERSION < '1.9.0'
|
113
|
+
# Check whether we're called from an erb template.
|
114
|
+
# We'd return a string in any other case, but erb <%= ... %>
|
115
|
+
# can't take an <% end %> later on, so we have to use <% ... %>
|
116
|
+
# and implicitly concat.
|
117
|
+
def block_called_from_erb?(block)
|
118
|
+
block && eval(BLOCK_CALLED_FROM_ERB, block)
|
119
|
+
end
|
120
|
+
else
|
121
|
+
def block_called_from_erb?(block)
|
122
|
+
block && eval(BLOCK_CALLED_FROM_ERB, block.binding)
|
123
|
+
end
|
124
|
+
end
|
125
|
+
|
108
126
|
def content_tag_string(name, content, options, escape = true)
|
109
127
|
tag_options = tag_options(options, escape) if options
|
110
128
|
"<#{name}#{tag_options}>#{content}</#{name}>"
|
@@ -114,10 +132,12 @@ module ActionView
|
|
114
132
|
unless options.blank?
|
115
133
|
attrs = []
|
116
134
|
if escape
|
117
|
-
options.
|
118
|
-
|
119
|
-
|
120
|
-
|
135
|
+
options.each_pair do |key, value|
|
136
|
+
if BOOLEAN_ATTRIBUTES.include?(key)
|
137
|
+
attrs << %(#{key}="#{key}") if value
|
138
|
+
else
|
139
|
+
attrs << %(#{key}="#{escape_once(value)}") if !value.nil?
|
140
|
+
end
|
121
141
|
end
|
122
142
|
else
|
123
143
|
attrs = options.map { |key, value| %(#{key}="#{value}") }
|
@@ -125,10 +145,6 @@ module ActionView
|
|
125
145
|
" #{attrs.sort * ' '}" unless attrs.empty?
|
126
146
|
end
|
127
147
|
end
|
128
|
-
|
129
|
-
def block_is_within_action_view?(block)
|
130
|
-
eval("defined? _erbout", block.binding)
|
131
|
-
end
|
132
148
|
end
|
133
149
|
end
|
134
150
|
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'action_view/helpers/tag_helper'
|
2
|
-
require 'html/document'
|
3
2
|
|
4
3
|
module ActionView
|
5
4
|
module Helpers #:nodoc:
|
@@ -15,55 +14,69 @@ module ActionView
|
|
15
14
|
#
|
16
15
|
# ==== Examples
|
17
16
|
# <%
|
18
|
-
# concat "hello"
|
17
|
+
# concat "hello"
|
19
18
|
# # is the equivalent of <%= "hello" %>
|
20
19
|
#
|
21
20
|
# if (logged_in == true):
|
22
|
-
# concat "Logged in!"
|
21
|
+
# concat "Logged in!"
|
23
22
|
# else
|
24
|
-
# concat link_to('login', :action => login)
|
23
|
+
# concat link_to('login', :action => login)
|
25
24
|
# end
|
26
25
|
# # will either display "Logged in!" or a login link
|
27
26
|
# %>
|
28
|
-
def concat(string,
|
29
|
-
|
27
|
+
def concat(string, unused_binding = nil)
|
28
|
+
if unused_binding
|
29
|
+
ActiveSupport::Deprecation.warn("The binding argument of #concat is no longer needed. Please remove it from your views and helpers.", caller)
|
30
|
+
end
|
31
|
+
|
32
|
+
output_buffer << string
|
30
33
|
end
|
31
34
|
|
32
|
-
if
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
35
|
+
# Truncates a given +text+ after a given <tt>:length</tt> if +text+ is longer than <tt>:length</tt>
|
36
|
+
# (defaults to 30). The last characters will be replaced with the <tt>:omission</tt> (defaults to "...").
|
37
|
+
#
|
38
|
+
# ==== Examples
|
39
|
+
#
|
40
|
+
# truncate("Once upon a time in a world far far away")
|
41
|
+
# # => Once upon a time in a world f...
|
42
|
+
#
|
43
|
+
# truncate("Once upon a time in a world far far away", :length => 14)
|
44
|
+
# # => Once upon a...
|
45
|
+
#
|
46
|
+
# truncate("And they found that many people were sleeping better.", :length => 25, "(clipped)")
|
47
|
+
# # => And they found that many (clipped)
|
48
|
+
#
|
49
|
+
# truncate("And they found that many people were sleeping better.", :omission => "... (continued)", :length => 15)
|
50
|
+
# # => And they found... (continued)
|
51
|
+
#
|
52
|
+
# You can still use <tt>truncate</tt> with the old API that accepts the
|
53
|
+
# +length+ as its optional second and the +ellipsis+ as its
|
54
|
+
# optional third parameter:
|
55
|
+
# truncate("Once upon a time in a world far far away", 14)
|
56
|
+
# # => Once upon a time in a world f...
|
57
|
+
#
|
58
|
+
# truncate("And they found that many people were sleeping better.", 15, "... (continued)")
|
59
|
+
# # => And they found... (continued)
|
60
|
+
def truncate(text, *args)
|
61
|
+
options = args.extract_options!
|
62
|
+
unless args.empty?
|
63
|
+
ActiveSupport::Deprecation.warn('truncate takes an option hash instead of separate ' +
|
64
|
+
'length and omission arguments', caller)
|
65
|
+
|
66
|
+
options[:length] = args[0] || 30
|
67
|
+
options[:omission] = args[1] || "..."
|
55
68
|
end
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
69
|
+
options.reverse_merge!(:length => 30, :omission => "...")
|
70
|
+
|
71
|
+
if text
|
72
|
+
l = options[:length] - options[:omission].mb_chars.length
|
73
|
+
chars = text.mb_chars
|
74
|
+
(chars.length > options[:length] ? chars[0...l] + options[:omission] : text).to_s
|
62
75
|
end
|
63
76
|
end
|
64
77
|
|
65
78
|
# Highlights one or more +phrases+ everywhere in +text+ by inserting it into
|
66
|
-
# a
|
79
|
+
# a <tt>:highlighter</tt> string. The highlighter can be specialized by passing <tt>:highlighter</tt>
|
67
80
|
# as a single-quoted string with \1 where the phrase is to be inserted (defaults to
|
68
81
|
# '<strong class="highlight">\1</strong>')
|
69
82
|
#
|
@@ -74,75 +87,78 @@ module ActionView
|
|
74
87
|
# highlight('You searched for: ruby, rails, dhh', 'actionpack')
|
75
88
|
# # => You searched for: ruby, rails, dhh
|
76
89
|
#
|
77
|
-
# highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')
|
90
|
+
# highlight('You searched for: rails', ['for', 'rails'], :highlighter => '<em>\1</em>')
|
78
91
|
# # => You searched <em>for</em>: <em>rails</em>
|
79
92
|
#
|
80
|
-
# highlight('You searched for: rails', 'rails',
|
81
|
-
# # => You searched for: <a href=
|
82
|
-
|
93
|
+
# highlight('You searched for: rails', 'rails', :highlighter => '<a href="search?q=\1">\1</a>')
|
94
|
+
# # => You searched for: <a href="search?q=rails">rails</a>
|
95
|
+
#
|
96
|
+
# You can still use <tt>highlight</tt> with the old API that accepts the
|
97
|
+
# +highlighter+ as its optional third parameter:
|
98
|
+
# highlight('You searched for: rails', 'rails', '<a href="search?q=\1">\1</a>') # => You searched for: <a href="search?q=rails">rails</a>
|
99
|
+
def highlight(text, phrases, *args)
|
100
|
+
options = args.extract_options!
|
101
|
+
unless args.empty?
|
102
|
+
options[:highlighter] = args[0] || '<strong class="highlight">\1</strong>'
|
103
|
+
end
|
104
|
+
options.reverse_merge!(:highlighter => '<strong class="highlight">\1</strong>')
|
105
|
+
|
83
106
|
if text.blank? || phrases.blank?
|
84
107
|
text
|
85
108
|
else
|
86
109
|
match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
|
87
|
-
text.gsub(/(#{match})/i, highlighter)
|
110
|
+
text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
|
88
111
|
end
|
89
112
|
end
|
90
113
|
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
prefix + text.chars[start_pos..end_pos].strip + postfix
|
125
|
-
else
|
126
|
-
nil
|
127
|
-
end
|
128
|
-
end
|
114
|
+
# Extracts an excerpt from +text+ that matches the first instance of +phrase+.
|
115
|
+
# The <tt>:radius</tt> option expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
|
116
|
+
# defined in <tt>:radius</tt> (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
|
117
|
+
# then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. The resulting string
|
118
|
+
# will be stripped in any case. If the +phrase+ isn't found, nil is returned.
|
119
|
+
#
|
120
|
+
# ==== Examples
|
121
|
+
# excerpt('This is an example', 'an', :radius => 5)
|
122
|
+
# # => ...s is an exam...
|
123
|
+
#
|
124
|
+
# excerpt('This is an example', 'is', :radius => 5)
|
125
|
+
# # => This is a...
|
126
|
+
#
|
127
|
+
# excerpt('This is an example', 'is')
|
128
|
+
# # => This is an example
|
129
|
+
#
|
130
|
+
# excerpt('This next thing is an example', 'ex', :radius => 2)
|
131
|
+
# # => ...next...
|
132
|
+
#
|
133
|
+
# excerpt('This is also an example', 'an', :radius => 8, :omission => '<chop> ')
|
134
|
+
# # => <chop> is also an example
|
135
|
+
#
|
136
|
+
# You can still use <tt>excerpt</tt> with the old API that accepts the
|
137
|
+
# +radius+ as its optional third and the +ellipsis+ as its
|
138
|
+
# optional forth parameter:
|
139
|
+
# excerpt('This is an example', 'an', 5) # => ...s is an exam...
|
140
|
+
# excerpt('This is also an example', 'an', 8, '<chop> ') # => <chop> is also an example
|
141
|
+
def excerpt(text, phrase, *args)
|
142
|
+
options = args.extract_options!
|
143
|
+
unless args.empty?
|
144
|
+
options[:radius] = args[0] || 100
|
145
|
+
options[:omission] = args[1] || "..."
|
129
146
|
end
|
130
|
-
|
131
|
-
def excerpt(text, phrase, radius = 100, excerpt_string = "...") #:nodoc:
|
132
|
-
if text && phrase
|
133
|
-
phrase = Regexp.escape(phrase)
|
147
|
+
options.reverse_merge!(:radius => 100, :omission => "...")
|
134
148
|
|
135
|
-
|
136
|
-
|
137
|
-
end_pos = [ [ found_pos + phrase.length + radius - 1, 0].max, text.length ].min
|
149
|
+
if text && phrase
|
150
|
+
phrase = Regexp.escape(phrase)
|
138
151
|
|
139
|
-
|
140
|
-
|
152
|
+
if found_pos = text.mb_chars =~ /(#{phrase})/i
|
153
|
+
start_pos = [ found_pos - options[:radius], 0 ].max
|
154
|
+
end_pos = [ [ found_pos + phrase.mb_chars.length + options[:radius] - 1, 0].max, text.mb_chars.length ].min
|
141
155
|
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
156
|
+
prefix = start_pos > 0 ? options[:omission] : ""
|
157
|
+
postfix = end_pos < text.mb_chars.length - 1 ? options[:omission] : ""
|
158
|
+
|
159
|
+
prefix + text.mb_chars[start_pos..end_pos].strip + postfix
|
160
|
+
else
|
161
|
+
nil
|
146
162
|
end
|
147
163
|
end
|
148
164
|
end
|
@@ -172,108 +188,107 @@ module ActionView
|
|
172
188
|
# (which is 80 by default).
|
173
189
|
#
|
174
190
|
# ==== Examples
|
175
|
-
# word_wrap('Once upon a time', 4)
|
176
|
-
# # => Once\nupon\na\ntime
|
177
|
-
#
|
178
|
-
# word_wrap('Once upon a time', 8)
|
179
|
-
# # => Once upon\na time
|
180
191
|
#
|
181
192
|
# word_wrap('Once upon a time')
|
182
193
|
# # => Once upon a time
|
183
194
|
#
|
184
|
-
# word_wrap('Once upon a time
|
195
|
+
# word_wrap('Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding a successor to the throne turned out to be more trouble than anyone could have imagined...')
|
196
|
+
# # => Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding\n a successor to the throne turned out to be more trouble than anyone could have\n imagined...
|
197
|
+
#
|
198
|
+
# word_wrap('Once upon a time', :line_width => 8)
|
199
|
+
# # => Once upon\na time
|
200
|
+
#
|
201
|
+
# word_wrap('Once upon a time', :line_width => 1)
|
185
202
|
# # => Once\nupon\na\ntime
|
186
|
-
|
203
|
+
#
|
204
|
+
# You can still use <tt>word_wrap</tt> with the old API that accepts the
|
205
|
+
# +line_width+ as its optional second parameter:
|
206
|
+
# word_wrap('Once upon a time', 8) # => Once upon\na time
|
207
|
+
def word_wrap(text, *args)
|
208
|
+
options = args.extract_options!
|
209
|
+
unless args.blank?
|
210
|
+
options[:line_width] = args[0] || 80
|
211
|
+
end
|
212
|
+
options.reverse_merge!(:line_width => 80)
|
213
|
+
|
187
214
|
text.split("\n").collect do |line|
|
188
|
-
line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
|
215
|
+
line.length > options[:line_width] ? line.gsub(/(.{1,#{options[:line_width]}})(\s+|$)/, "\\1\n").strip : line
|
189
216
|
end * "\n"
|
190
217
|
end
|
191
218
|
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
textilized = RedCloth.new(text, [ :hard_breaks ])
|
218
|
-
textilized.hard_breaks = true if textilized.respond_to?("hard_breaks=")
|
219
|
-
textilized.to_html
|
220
|
-
end
|
219
|
+
# Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags.
|
220
|
+
#
|
221
|
+
# You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
|
222
|
+
# <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
|
223
|
+
# is available</i>.
|
224
|
+
#
|
225
|
+
# ==== Examples
|
226
|
+
# textilize("*This is Textile!* Rejoice!")
|
227
|
+
# # => "<p><strong>This is Textile!</strong> Rejoice!</p>"
|
228
|
+
#
|
229
|
+
# textilize("I _love_ ROR(Ruby on Rails)!")
|
230
|
+
# # => "<p>I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!</p>"
|
231
|
+
#
|
232
|
+
# textilize("h2. Textile makes markup -easy- simple!")
|
233
|
+
# # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
|
234
|
+
#
|
235
|
+
# textilize("Visit the Rails website "here":http://www.rubyonrails.org/.)
|
236
|
+
# # => "<p>Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>.</p>"
|
237
|
+
def textilize(text)
|
238
|
+
if text.blank?
|
239
|
+
""
|
240
|
+
else
|
241
|
+
textilized = RedCloth.new(text, [ :hard_breaks ])
|
242
|
+
textilized.hard_breaks = true if textilized.respond_to?(:hard_breaks=)
|
243
|
+
textilized.to_html
|
221
244
|
end
|
245
|
+
end
|
222
246
|
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
end
|
248
|
-
rescue LoadError
|
249
|
-
# We can't really help what's not there
|
247
|
+
# Returns the text with all the Textile codes turned into HTML tags,
|
248
|
+
# but without the bounding <p> tag that RedCloth adds.
|
249
|
+
#
|
250
|
+
# You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
|
251
|
+
# <i>This method is requires RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
|
252
|
+
# to be available</i>.
|
253
|
+
#
|
254
|
+
# ==== Examples
|
255
|
+
# textilize_without_paragraph("*This is Textile!* Rejoice!")
|
256
|
+
# # => "<strong>This is Textile!</strong> Rejoice!"
|
257
|
+
#
|
258
|
+
# textilize_without_paragraph("I _love_ ROR(Ruby on Rails)!")
|
259
|
+
# # => "I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!"
|
260
|
+
#
|
261
|
+
# textilize_without_paragraph("h2. Textile makes markup -easy- simple!")
|
262
|
+
# # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
|
263
|
+
#
|
264
|
+
# textilize_without_paragraph("Visit the Rails website "here":http://www.rubyonrails.org/.)
|
265
|
+
# # => "Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>."
|
266
|
+
def textilize_without_paragraph(text)
|
267
|
+
textiled = textilize(text)
|
268
|
+
if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
|
269
|
+
if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
|
270
|
+
return textiled
|
250
271
|
end
|
251
272
|
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
# # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
|
272
|
-
def markdown(text)
|
273
|
-
text.blank? ? "" : BlueCloth.new(text).to_html
|
274
|
-
end
|
275
|
-
rescue LoadError
|
276
|
-
# We can't really help what's not there
|
273
|
+
# Returns the text with all the Markdown codes turned into HTML tags.
|
274
|
+
# <i>This method requires BlueCloth[http://www.deveiate.org/projects/BlueCloth]
|
275
|
+
# to be available</i>.
|
276
|
+
#
|
277
|
+
# ==== Examples
|
278
|
+
# markdown("We are using __Markdown__ now!")
|
279
|
+
# # => "<p>We are using <strong>Markdown</strong> now!</p>"
|
280
|
+
#
|
281
|
+
# markdown("We like to _write_ `code`, not just _read_ it!")
|
282
|
+
# # => "<p>We like to <em>write</em> <code>code</code>, not just <em>read</em> it!</p>"
|
283
|
+
#
|
284
|
+
# markdown("The [Markdown website](http://daringfireball.net/projects/markdown/) has more information.")
|
285
|
+
# # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
|
286
|
+
# # has more information.</p>"
|
287
|
+
#
|
288
|
+
# markdown('![The ROR logo](http://rubyonrails.com/images/rails.png "Ruby on Rails")')
|
289
|
+
# # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
|
290
|
+
def markdown(text)
|
291
|
+
text.blank? ? "" : BlueCloth.new(text).to_html
|
277
292
|
end
|
278
293
|
|
279
294
|
# Returns +text+ transformed into HTML using simple formatting rules.
|
@@ -307,9 +322,9 @@ module ActionView
|
|
307
322
|
text << "</p>"
|
308
323
|
end
|
309
324
|
|
310
|
-
# Turns all URLs and e-mail addresses into clickable links. The
|
325
|
+
# Turns all URLs and e-mail addresses into clickable links. The <tt>:link</tt> option
|
311
326
|
# will limit what should be linked. You can add HTML attributes to the links using
|
312
|
-
#
|
327
|
+
# <tt>:href_options</tt>. Possible values for <tt>:link</tt> are <tt>:all</tt> (default),
|
313
328
|
# <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
|
314
329
|
# e-mail address is yielded and the result is used as the link text.
|
315
330
|
#
|
@@ -318,26 +333,46 @@ module ActionView
|
|
318
333
|
# # => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> and
|
319
334
|
# # say hello to <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
|
320
335
|
#
|
321
|
-
# auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :urls)
|
336
|
+
# auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :link => :urls)
|
322
337
|
# # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
|
323
338
|
# # or e-mail david@loudthinking.com"
|
324
339
|
#
|
325
|
-
# auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :email_addresses)
|
340
|
+
# auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :link => :email_addresses)
|
326
341
|
# # => "Visit http://www.loudthinking.com/ or e-mail <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
|
327
342
|
#
|
328
343
|
# post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com."
|
329
|
-
# auto_link(post_body, :
|
344
|
+
# auto_link(post_body, :href_options => { :target => '_blank' }) do |text|
|
330
345
|
# truncate(text, 15)
|
331
346
|
# end
|
332
347
|
# # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.
|
333
348
|
# Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
|
334
349
|
#
|
335
|
-
|
350
|
+
#
|
351
|
+
# You can still use <tt>auto_link</tt> with the old API that accepts the
|
352
|
+
# +link+ as its optional second parameter and the +html_options+ hash
|
353
|
+
# as its optional third parameter:
|
354
|
+
# post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com."
|
355
|
+
# auto_link(post_body, :urls) # => Once upon\na time
|
356
|
+
# # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\">http://www.myblog.com</a>.
|
357
|
+
# Please e-mail me at me@email.com."
|
358
|
+
#
|
359
|
+
# auto_link(post_body, :all, :target => "_blank") # => Once upon\na time
|
360
|
+
# # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.myblog.com</a>.
|
361
|
+
# Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
|
362
|
+
def auto_link(text, *args, &block)#link = :all, href_options = {}, &block)
|
336
363
|
return '' if text.blank?
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
364
|
+
|
365
|
+
options = args.size == 2 ? {} : args.extract_options! # this is necessary because the old auto_link API has a Hash as its last parameter
|
366
|
+
unless args.empty?
|
367
|
+
options[:link] = args[0] || :all
|
368
|
+
options[:html] = args[1] || {}
|
369
|
+
end
|
370
|
+
options.reverse_merge!(:link => :all, :html => {})
|
371
|
+
|
372
|
+
case options[:link].to_sym
|
373
|
+
when :all then auto_link_email_addresses(auto_link_urls(text, options[:html], &block), options[:html], &block)
|
374
|
+
when :email_addresses then auto_link_email_addresses(text, options[:html], &block)
|
375
|
+
when :urls then auto_link_urls(text, options[:html], &block)
|
341
376
|
end
|
342
377
|
end
|
343
378
|
|
@@ -345,8 +380,10 @@ module ActionView
|
|
345
380
|
# array every time it is called. This can be used for example, to alternate
|
346
381
|
# classes for table rows. You can use named cycles to allow nesting in loops.
|
347
382
|
# Passing a Hash as the last parameter with a <tt>:name</tt> key will create a
|
348
|
-
# named cycle.
|
349
|
-
#
|
383
|
+
# named cycle. The default name for a cycle without a +:name+ key is
|
384
|
+
# <tt>"default"</tt>. You can manually reset a cycle by calling reset_cycle
|
385
|
+
# and passing the name of the cycle. The current cycle string can be obtained
|
386
|
+
# anytime using the current_cycle method.
|
350
387
|
#
|
351
388
|
# ==== Examples
|
352
389
|
# # Alternate CSS classes for even and odd numbers...
|
@@ -393,6 +430,23 @@ module ActionView
|
|
393
430
|
return cycle.to_s
|
394
431
|
end
|
395
432
|
|
433
|
+
# Returns the current cycle string after a cycle has been started. Useful
|
434
|
+
# for complex table highlighing or any other design need which requires
|
435
|
+
# the current cycle string in more than one place.
|
436
|
+
#
|
437
|
+
# ==== Example
|
438
|
+
# # Alternate background colors
|
439
|
+
# @items = [1,2,3,4]
|
440
|
+
# <% @items.each do |item| %>
|
441
|
+
# <div style="background-color:<%= cycle("red","white","blue") %>">
|
442
|
+
# <span style="background-color:<%= current_cycle %>"><%= item %></span>
|
443
|
+
# </div>
|
444
|
+
# <% end %>
|
445
|
+
def current_cycle(name = "default")
|
446
|
+
cycle = get_cycle(name)
|
447
|
+
cycle.current_value unless cycle.nil?
|
448
|
+
end
|
449
|
+
|
396
450
|
# Resets a cycle so that it starts from the first element the next time
|
397
451
|
# it is called. Pass in +name+ to reset a named cycle.
|
398
452
|
#
|
@@ -429,11 +483,29 @@ module ActionView
|
|
429
483
|
@index = 0
|
430
484
|
end
|
431
485
|
|
486
|
+
def current_value
|
487
|
+
@values[previous_index].to_s
|
488
|
+
end
|
489
|
+
|
432
490
|
def to_s
|
433
491
|
value = @values[@index].to_s
|
434
|
-
@index =
|
492
|
+
@index = next_index
|
435
493
|
return value
|
436
494
|
end
|
495
|
+
|
496
|
+
private
|
497
|
+
|
498
|
+
def next_index
|
499
|
+
step_index(1)
|
500
|
+
end
|
501
|
+
|
502
|
+
def previous_index
|
503
|
+
step_index(-1)
|
504
|
+
end
|
505
|
+
|
506
|
+
def step_index(n)
|
507
|
+
(@index + n) % @values.size
|
508
|
+
end
|
437
509
|
end
|
438
510
|
|
439
511
|
private
|
@@ -451,45 +523,44 @@ module ActionView
|
|
451
523
|
end
|
452
524
|
|
453
525
|
AUTO_LINK_RE = %r{
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
(
|
460
|
-
(?:https?://)| # protocol spec, or
|
461
|
-
(?:www\.) # www.*
|
462
|
-
)
|
463
|
-
(
|
464
|
-
[-\w]+ # subdomain or domain
|
465
|
-
(?:\.[-\w]+)* # remaining subdomains or domain
|
466
|
-
(?::\d+)? # port
|
467
|
-
(?:/(?:(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))+)?)* # path
|
468
|
-
(?:\?[\w\+@%&=.;-]+)? # query string
|
469
|
-
(?:\#[\w\-]*)? # trailing anchor
|
470
|
-
)
|
471
|
-
([[:punct:]]|<|$|) # trailing text
|
472
|
-
}x unless const_defined?(:AUTO_LINK_RE)
|
526
|
+
( https?:// | www\. )
|
527
|
+
[^\s<]+
|
528
|
+
}x unless const_defined?(:AUTO_LINK_RE)
|
529
|
+
|
530
|
+
BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
|
473
531
|
|
474
532
|
# Turns all urls into clickable links. If a block is given, each url
|
475
533
|
# is yielded and the result is used as the link text.
|
476
|
-
def auto_link_urls(text,
|
477
|
-
|
534
|
+
def auto_link_urls(text, html_options = {})
|
535
|
+
link_attributes = html_options.stringify_keys
|
478
536
|
text.gsub(AUTO_LINK_RE) do
|
479
|
-
|
480
|
-
|
481
|
-
|
537
|
+
href = $&
|
538
|
+
punctuation = ''
|
539
|
+
left, right = $`, $'
|
540
|
+
# detect already linked URLs and URLs in the middle of a tag
|
541
|
+
if left =~ /<[^>]+$/ && right =~ /^[^>]*>/
|
542
|
+
# do not change string; URL is alreay linked
|
543
|
+
href
|
482
544
|
else
|
483
|
-
|
484
|
-
|
485
|
-
|
545
|
+
# don't include trailing punctuation character as part of the URL
|
546
|
+
if href.sub!(/[^\w\/-]$/, '') and punctuation = $& and opening = BRACKETS[punctuation]
|
547
|
+
if href.scan(opening).size > href.scan(punctuation).size
|
548
|
+
href << punctuation
|
549
|
+
punctuation = ''
|
550
|
+
end
|
551
|
+
end
|
552
|
+
|
553
|
+
link_text = block_given?? yield(href) : href
|
554
|
+
href = 'http://' + href unless href.index('http') == 0
|
555
|
+
|
556
|
+
content_tag(:a, h(link_text), link_attributes.merge('href' => href)) + punctuation
|
486
557
|
end
|
487
558
|
end
|
488
559
|
end
|
489
560
|
|
490
561
|
# Turns all email addresses into clickable links. If a block is given,
|
491
562
|
# each email is yielded and the result is used as the link text.
|
492
|
-
def auto_link_email_addresses(text)
|
563
|
+
def auto_link_email_addresses(text, html_options = {})
|
493
564
|
body = text.dup
|
494
565
|
text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
|
495
566
|
text = $1
|
@@ -498,7 +569,7 @@ module ActionView
|
|
498
569
|
text
|
499
570
|
else
|
500
571
|
display_text = (block_given?) ? yield(text) : text
|
501
|
-
|
572
|
+
mail_to text, display_text, html_options
|
502
573
|
end
|
503
574
|
end
|
504
575
|
end
|