radiant 0.8.0 → 0.8.1
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 +33 -1
- data/CONTRIBUTORS +15 -2
- data/INSTALL +9 -7
- data/README +11 -7
- data/app/controllers/admin/layouts_controller.rb +5 -2
- data/app/controllers/admin/pages_controller.rb +8 -5
- data/app/controllers/admin/snippets_controller.rb +5 -2
- data/app/controllers/application_controller.rb +7 -0
- data/app/helpers/admin/node_helper.rb +2 -2
- data/app/helpers/application_helper.rb +2 -2
- data/app/models/radiant/config.rb +36 -4
- data/app/models/standard_tags.rb +1 -1
- data/app/views/admin/layouts/index.html.haml +15 -12
- data/app/views/admin/page_parts/_page_part.html.haml +2 -2
- data/app/views/admin/pages/index.html.haml +1 -1
- data/app/views/admin/snippets/_form.html.haml +1 -1
- data/app/views/admin/snippets/index.html.haml +14 -10
- data/config/database.db2.yml +20 -0
- data/config/environment.rb +4 -4
- data/config/environments/test.rb +1 -2
- data/features/support/env.rb +2 -1
- data/lib/generators/extension/extension_generator.rb +5 -0
- data/lib/generators/extension/templates/RSpecRakefile +11 -8
- data/lib/generators/extension/templates/cucumber.yml +1 -0
- data/lib/generators/extension/templates/cucumber_env.rb +16 -0
- data/lib/generators/extension/templates/cucumber_paths.rb +14 -0
- data/lib/generators/extension/templates/extension.rb +1 -1
- data/lib/generators/instance/instance_generator.rb +1 -1
- data/lib/generators/instance/templates/databases/db2.yml +40 -0
- data/lib/generators/instance/templates/instance_environment.rb +6 -6
- data/lib/local_time.rb +3 -9
- data/lib/radiant.rb +1 -1
- data/lib/radiant/cache.rb +10 -8
- data/lib/radiant/extension.rb +36 -0
- data/lib/radiant/extension/script.rb +1 -1
- data/lib/radiant/extension_loader.rb +5 -1
- data/lib/radiant/initializer.rb +52 -4
- data/lib/task_support.rb +33 -0
- data/lib/tasks/cucumber.rake +5 -1
- data/lib/tasks/radiant_config.rake +18 -0
- data/lib/tasks/release.rake +1 -0
- data/public/javascripts/admin/admin.js +1 -1
- data/spec/controllers/admin/layouts_controller_spec.rb +18 -12
- data/spec/controllers/admin/pages_controller_spec.rb +35 -29
- data/spec/controllers/admin/snippets_controller_spec.rb +11 -5
- data/spec/controllers/admin/welcome_controller_spec.rb +1 -1
- data/spec/controllers/application_controller_spec.rb +18 -0
- data/spec/fixtures/radiant_config.yml +10 -0
- data/spec/generators/extension_generator_spec.rb +12 -0
- data/spec/helpers/admin/node_helper_spec.rb +6 -0
- data/spec/helpers/application_helper_spec.rb +1 -1
- data/spec/lib/radiant/extension_loader_spec.rb +17 -0
- data/spec/lib/radiant/extension_spec.rb +28 -0
- data/spec/lib/radiant/initializer_spec.rb +34 -0
- data/spec/lib/task_support_spec.rb +42 -0
- data/spec/models/page_spec.rb +6 -2
- data/spec/models/radiant/config_spec.rb +42 -1
- data/spec/models/standard_tags_spec.rb +2 -2
- data/test/fixtures/extensions/01_basic/app/metal/basic_metal.rb +9 -0
- data/test/fixtures/extensions/02_overriding/app/metal/basic_metal.rb +9 -0
- data/vendor/extensions/textile_filter/textile.html +2 -2
- data/vendor/plugins/dataset/CHANGELOG +2 -1
- data/vendor/plugins/dataset/Rakefile +3 -0
- data/vendor/plugins/dataset/VERSION.yml +2 -2
- data/vendor/plugins/dataset/dataset.gemspec +9 -3
- data/vendor/plugins/dataset/lib/dataset.rb +3 -0
- data/vendor/radius/lib/radius.rb +5 -0
- data/vendor/radius/test/radius_test.rb +6 -0
- data/vendor/rails/actionmailer/CHANGELOG +8 -0
- data/vendor/rails/actionmailer/Rakefile +3 -2
- data/vendor/rails/actionmailer/lib/action_mailer/base.rb +2 -1
- data/vendor/rails/actionmailer/lib/action_mailer/version.rb +1 -1
- data/vendor/rails/actionmailer/test/abstract_unit.rb +0 -3
- data/vendor/rails/actionmailer/test/mail_service_test.rb +3 -2
- data/vendor/rails/actionpack/CHANGELOG +16 -0
- data/vendor/rails/actionpack/Rakefile +5 -3
- data/vendor/rails/actionpack/lib/action_controller.rb +2 -7
- data/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb +13 -3
- data/vendor/rails/actionpack/lib/action_controller/base.rb +12 -3
- data/vendor/rails/actionpack/lib/action_controller/caching.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/caching/actions.rb +9 -1
- data/vendor/rails/actionpack/lib/action_controller/caching/sweeper.rb +45 -0
- data/vendor/rails/actionpack/lib/action_controller/caching/sweeping.rb +0 -42
- data/vendor/rails/actionpack/lib/action_controller/cookies.rb +1 -1
- data/vendor/rails/actionpack/lib/action_controller/dispatcher.rb +21 -6
- data/vendor/rails/actionpack/lib/action_controller/failsafe.rb +40 -6
- data/vendor/rails/actionpack/lib/action_controller/flash.rb +11 -3
- data/vendor/rails/actionpack/lib/action_controller/http_authentication.rb +7 -3
- data/vendor/rails/actionpack/lib/action_controller/integration.rb +5 -12
- data/vendor/rails/actionpack/lib/action_controller/middlewares.rb +0 -1
- data/vendor/rails/actionpack/lib/action_controller/params_parser.rb +6 -0
- data/vendor/rails/actionpack/lib/action_controller/reloader.rb +47 -7
- data/vendor/rails/actionpack/lib/action_controller/request.rb +6 -2
- data/vendor/rails/actionpack/lib/action_controller/request_forgery_protection.rb +2 -1
- data/vendor/rails/actionpack/lib/action_controller/resources.rb +17 -13
- data/vendor/rails/actionpack/lib/action_controller/response.rb +8 -2
- data/vendor/rails/actionpack/lib/action_controller/routing.rb +3 -0
- data/vendor/rails/actionpack/lib/action_controller/routing/route_set.rb +20 -6
- data/vendor/rails/actionpack/lib/action_controller/streaming.rb +4 -2
- data/vendor/rails/actionpack/lib/action_controller/test_process.rb +9 -1
- data/vendor/rails/actionpack/lib/action_controller/url_rewriter.rb +1 -1
- data/vendor/rails/actionpack/lib/action_pack/version.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/asset_tag_helper.rb +21 -9
- data/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb +26 -12
- data/vendor/rails/actionpack/lib/action_view/helpers/form_options_helper.rb +71 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/form_tag_helper.rb +10 -4
- data/vendor/rails/actionpack/lib/action_view/helpers/number_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/prototype_helper.rb +7 -7
- data/vendor/rails/actionpack/lib/action_view/helpers/scriptaculous_helper.rb +5 -5
- data/vendor/rails/actionpack/lib/action_view/helpers/tag_helper.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/helpers/text_helper.rb +23 -14
- data/vendor/rails/actionpack/lib/action_view/helpers/url_helper.rb +2 -2
- data/vendor/rails/actionpack/lib/action_view/locale/en.yml +4 -0
- data/vendor/rails/actionpack/lib/action_view/paths.rb +1 -1
- data/vendor/rails/actionpack/lib/action_view/template.rb +22 -33
- data/vendor/rails/actionpack/test/abstract_unit.rb +17 -1
- data/vendor/rails/actionpack/test/activerecord/active_record_store_test.rb +3 -3
- data/vendor/rails/actionpack/test/controller/action_pack_assertions_test.rb +27 -0
- data/vendor/rails/actionpack/test/controller/caching_test.rb +40 -1
- data/vendor/rails/actionpack/test/controller/cookie_test.rb +16 -0
- data/vendor/rails/actionpack/test/controller/dispatcher_test.rb +59 -18
- data/vendor/rails/actionpack/test/controller/failsafe_test.rb +60 -0
- data/vendor/rails/actionpack/test/controller/filter_params_test.rb +3 -1
- data/vendor/rails/actionpack/test/controller/flash_test.rb +6 -1
- data/vendor/rails/actionpack/test/controller/http_basic_authentication_test.rb +25 -0
- data/vendor/rails/actionpack/test/controller/http_digest_authentication_test.rb +63 -9
- data/vendor/rails/actionpack/test/controller/integration_test.rb +31 -3
- data/vendor/rails/actionpack/test/controller/rack_test.rb +18 -1
- data/vendor/rails/actionpack/test/controller/redirect_test.rb +4 -1
- data/vendor/rails/actionpack/test/controller/reloader_test.rb +124 -0
- data/vendor/rails/actionpack/test/controller/render_test.rb +19 -9
- data/vendor/rails/actionpack/test/controller/request/json_params_parsing_test.rb +24 -4
- data/vendor/rails/actionpack/test/controller/request/multipart_params_parsing_test.rb +1 -62
- data/vendor/rails/actionpack/test/controller/request/test_request_test.rb +35 -0
- data/vendor/rails/actionpack/test/controller/request/url_encoded_params_parsing_test.rb +0 -38
- data/vendor/rails/actionpack/test/controller/request/xml_params_parsing_test.rb +15 -0
- data/vendor/rails/actionpack/test/controller/request_forgery_protection_test.rb +6 -5
- data/vendor/rails/actionpack/test/controller/request_test.rb +218 -230
- data/vendor/rails/actionpack/test/controller/resources_test.rb +52 -0
- data/vendor/rails/actionpack/test/controller/routing_test.rb +28 -2
- data/vendor/rails/actionpack/test/controller/send_file_test.rb +12 -2
- data/vendor/rails/actionpack/test/controller/session/cookie_store_test.rb +9 -32
- data/vendor/rails/actionpack/test/controller/test_test.rb +8 -0
- data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb +29 -3
- data/vendor/rails/actionpack/test/fixtures/failsafe/500.html +1 -0
- data/vendor/rails/actionpack/test/fixtures/public/absolute/test.css +23 -0
- data/vendor/rails/actionpack/test/fixtures/public/absolute/test.js +63 -0
- data/vendor/rails/actionpack/test/template/active_record_helper_test.rb +1 -1
- data/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb +46 -0
- data/vendor/rails/actionpack/test/template/atom_feed_helper_test.rb +29 -0
- data/vendor/rails/actionpack/test/template/form_helper_test.rb +143 -6
- data/vendor/rails/actionpack/test/template/form_options_helper_i18n_test.rb +27 -0
- data/vendor/rails/actionpack/test/template/form_options_helper_test.rb +56 -0
- data/vendor/rails/actionpack/test/template/form_tag_helper_test.rb +23 -6
- data/vendor/rails/actionpack/test/template/prototype_helper_test.rb +11 -11
- data/vendor/rails/actionpack/test/template/template_test.rb +32 -0
- data/vendor/rails/actionpack/test/template/text_helper_test.rb +23 -0
- data/vendor/rails/actionpack/test/template/url_helper_test.rb +8 -0
- data/vendor/rails/activerecord/CHANGELOG +18 -0
- data/vendor/rails/activerecord/Rakefile +26 -9
- data/vendor/rails/activerecord/examples/performance.rb +162 -0
- data/vendor/rails/activerecord/lib/active_record/associations.rb +104 -35
- data/vendor/rails/activerecord/lib/active_record/associations/association_collection.rb +10 -5
- data/vendor/rails/activerecord/lib/active_record/associations/association_proxy.rb +2 -2
- data/vendor/rails/activerecord/lib/active_record/associations/belongs_to_association.rb +22 -4
- data/vendor/rails/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb +5 -1
- data/vendor/rails/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +16 -0
- data/vendor/rails/activerecord/lib/active_record/associations/has_many_association.rb +1 -0
- data/vendor/rails/activerecord/lib/active_record/associations/has_many_through_association.rb +13 -3
- data/vendor/rails/activerecord/lib/active_record/associations/has_one_through_association.rb +15 -9
- data/vendor/rails/activerecord/lib/active_record/autosave_association.rb +15 -9
- data/vendor/rails/activerecord/lib/active_record/base.rb +34 -31
- data/vendor/rails/activerecord/lib/active_record/batches.rb +23 -15
- data/vendor/rails/activerecord/lib/active_record/calculations.rb +7 -13
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +16 -2
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +2 -2
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +7 -0
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +17 -8
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +98 -35
- data/vendor/rails/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +15 -0
- data/vendor/rails/activerecord/lib/active_record/dirty.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/fixtures.rb +14 -11
- data/vendor/rails/activerecord/lib/active_record/i18n_interpolation_deprecation.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/locale/en.yml +4 -0
- data/vendor/rails/activerecord/lib/active_record/named_scope.rb +3 -8
- data/vendor/rails/activerecord/lib/active_record/reflection.rb +1 -1
- data/vendor/rails/activerecord/lib/active_record/schema_dumper.rb +6 -3
- data/vendor/rails/activerecord/lib/active_record/serialization.rb +3 -2
- data/vendor/rails/activerecord/lib/active_record/serializers/json_serializer.rb +10 -18
- data/vendor/rails/activerecord/lib/active_record/serializers/xml_serializer.rb +6 -2
- data/vendor/rails/activerecord/lib/active_record/session_store.rb +9 -1
- data/vendor/rails/activerecord/lib/active_record/timestamp.rb +39 -9
- data/vendor/rails/activerecord/lib/active_record/validations.rb +149 -80
- data/vendor/rails/activerecord/lib/active_record/version.rb +1 -1
- data/vendor/rails/activerecord/test/cases/adapter_test.rb +12 -0
- data/vendor/rails/activerecord/test/cases/associations/belongs_to_associations_test.rb +102 -22
- data/vendor/rails/activerecord/test/cases/associations/eager_load_nested_include_test.rb +5 -5
- data/vendor/rails/activerecord/test/cases/associations/eager_test.rb +12 -0
- data/vendor/rails/activerecord/test/cases/associations/habtm_join_table_test.rb +56 -0
- data/vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb +62 -2
- data/vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb +46 -1
- data/vendor/rails/activerecord/test/cases/associations/has_one_through_associations_test.rb +18 -1
- data/vendor/rails/activerecord/test/cases/associations/inner_join_association_test.rb +5 -0
- data/vendor/rails/activerecord/test/cases/associations/join_model_test.rb +4 -4
- data/vendor/rails/activerecord/test/cases/autosave_association_test.rb +22 -0
- data/vendor/rails/activerecord/test/cases/base_test.rb +51 -6
- data/vendor/rails/activerecord/test/cases/calculations_test.rb +14 -14
- data/vendor/rails/activerecord/test/cases/column_definition_test.rb +34 -0
- data/vendor/rails/activerecord/test/cases/copy_table_test_sqlite.rb +5 -5
- data/vendor/rails/activerecord/test/cases/dirty_test.rb +10 -0
- data/vendor/rails/activerecord/test/cases/finder_test.rb +21 -50
- data/vendor/rails/activerecord/test/cases/fixtures_test.rb +6 -1
- data/vendor/rails/activerecord/test/cases/helper.rb +1 -2
- data/vendor/rails/activerecord/test/cases/i18n_test.rb +5 -0
- data/vendor/rails/activerecord/test/cases/json_serialization_test.rb +57 -57
- data/vendor/rails/activerecord/test/cases/method_scoping_test.rb +14 -4
- data/vendor/rails/activerecord/test/cases/migration_test.rb +39 -11
- data/vendor/rails/activerecord/test/cases/modules_test.rb +42 -0
- data/vendor/rails/activerecord/test/cases/named_scope_test.rb +6 -4
- data/vendor/rails/activerecord/test/cases/pk_test.rb +18 -0
- data/vendor/rails/activerecord/test/cases/reflection_test.rb +7 -7
- data/vendor/rails/activerecord/test/cases/schema_dumper_test.rb +35 -7
- data/vendor/rails/activerecord/test/cases/schema_test_postgresql.rb +76 -0
- data/vendor/rails/activerecord/test/cases/timestamp_test.rb +75 -0
- data/vendor/rails/activerecord/test/cases/validations_i18n_test.rb +656 -624
- data/vendor/rails/activerecord/test/cases/validations_test.rb +12 -2
- data/vendor/rails/activerecord/test/cases/xml_serialization_test.rb +20 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database.sqlite3 +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite +0 -0
- data/vendor/rails/activerecord/test/fixtures/fixture_database_2.sqlite3 +0 -0
- data/vendor/rails/activerecord/test/fixtures/posts.yml +3 -0
- data/vendor/rails/activerecord/test/models/author.rb +5 -0
- data/vendor/rails/activerecord/test/models/comment.rb +5 -1
- data/vendor/rails/activerecord/test/models/company.rb +9 -7
- data/vendor/rails/activerecord/test/models/company_in_module.rb +1 -1
- data/vendor/rails/activerecord/test/models/contract.rb +5 -0
- data/vendor/rails/activerecord/test/models/developer.rb +10 -0
- data/vendor/rails/activerecord/test/models/essay.rb +3 -0
- data/vendor/rails/activerecord/test/models/organization.rb +2 -0
- data/vendor/rails/activerecord/test/models/pet.rb +1 -1
- data/vendor/rails/activerecord/test/models/project.rb +1 -1
- data/vendor/rails/activerecord/test/models/reply.rb +2 -1
- data/vendor/rails/activerecord/test/models/topic.rb +1 -2
- data/vendor/rails/activerecord/test/models/toy.rb +2 -0
- data/vendor/rails/activerecord/test/schema/postgresql_specific_schema.rb +13 -2
- data/vendor/rails/activerecord/test/schema/schema.rb +19 -0
- data/vendor/rails/activeresource/CHANGELOG +16 -0
- data/vendor/rails/activeresource/Rakefile +3 -2
- data/vendor/rails/activeresource/lib/active_resource/base.rb +89 -9
- data/vendor/rails/activeresource/lib/active_resource/connection.rb +73 -8
- data/vendor/rails/activeresource/lib/active_resource/exceptions.rb +66 -0
- data/vendor/rails/activeresource/lib/active_resource/formats/json_format.rb +2 -2
- data/vendor/rails/activeresource/lib/active_resource/validations.rb +20 -4
- data/vendor/rails/activeresource/lib/active_resource/version.rb +1 -1
- data/vendor/rails/activeresource/test/abstract_unit.rb +1 -3
- data/vendor/rails/activeresource/test/base/load_test.rb +16 -1
- data/vendor/rails/activeresource/test/base_errors_test.rb +56 -19
- data/vendor/rails/activeresource/test/base_test.rb +147 -0
- data/vendor/rails/activeresource/test/connection_test.rb +42 -0
- data/vendor/rails/activeresource/test/debug.log +7974 -0
- data/vendor/rails/activeresource/test/fixtures/proxy.rb +4 -0
- data/vendor/rails/activesupport/CHANGELOG +13 -0
- data/vendor/rails/activesupport/lib/active_support/all.rb +8 -0
- data/vendor/rails/activesupport/lib/active_support/cache.rb +14 -1
- data/vendor/rails/activesupport/lib/active_support/cache/mem_cache_store.rb +16 -10
- data/vendor/rails/activesupport/lib/active_support/cache/strategy/local_cache.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/array/conversions.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/date/calculations.rb +2 -1
- data/vendor/rails/activesupport/lib/active_support/core_ext/enumerable.rb +2 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb +14 -4
- data/vendor/rails/activesupport/lib/active_support/core_ext/kernel/debugger.rb +4 -2
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/delegation.rb +19 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/module/model_naming.rb +8 -6
- data/vendor/rails/activesupport/lib/active_support/core_ext/numeric/bytes.rb +15 -9
- data/vendor/rails/activesupport/lib/active_support/core_ext/string.rb +1 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/access.rb +29 -5
- data/vendor/rails/activesupport/lib/active_support/core_ext/string/bytesize.rb +5 -0
- data/vendor/rails/activesupport/lib/active_support/core_ext/time/calculations.rb +7 -7
- data/vendor/rails/activesupport/lib/active_support/deprecation.rb +9 -9
- data/vendor/rails/activesupport/lib/active_support/duration.rb +4 -2
- data/vendor/rails/activesupport/lib/active_support/json.rb +1 -22
- data/vendor/rails/activesupport/lib/active_support/json/backends/jsongem.rb +38 -0
- data/vendor/rails/activesupport/lib/active_support/json/backends/yaml.rb +88 -0
- data/vendor/rails/activesupport/lib/active_support/json/decoding.rb +23 -72
- data/vendor/rails/activesupport/lib/active_support/json/encoders/date.rb +9 -8
- data/vendor/rails/activesupport/lib/active_support/json/encoders/date_time.rb +9 -8
- data/vendor/rails/activesupport/lib/active_support/json/encoders/enumerable.rb +14 -9
- data/vendor/rails/activesupport/lib/active_support/json/encoders/false_class.rb +4 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoders/hash.rb +21 -11
- data/vendor/rails/activesupport/lib/active_support/json/encoders/nil_class.rb +4 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoders/numeric.rb +16 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/object.rb +6 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoders/regexp.rb +4 -0
- data/vendor/rails/activesupport/lib/active_support/json/encoders/string.rb +5 -32
- data/vendor/rails/activesupport/lib/active_support/json/encoders/symbol.rb +2 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoders/time.rb +9 -8
- data/vendor/rails/activesupport/lib/active_support/json/encoders/true_class.rb +4 -2
- data/vendor/rails/activesupport/lib/active_support/json/encoding.rb +80 -9
- data/vendor/rails/activesupport/lib/active_support/memoizable.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/message_verifier.rb +16 -3
- data/vendor/rails/activesupport/lib/active_support/multibyte.rb +30 -6
- data/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb +23 -17
- data/vendor/rails/activesupport/lib/active_support/multibyte/utils.rb +61 -0
- data/vendor/rails/activesupport/lib/active_support/ordered_hash.rb +28 -0
- data/vendor/rails/activesupport/lib/active_support/test_case.rb +9 -8
- data/vendor/rails/activesupport/lib/active_support/testing/deprecation.rb +2 -0
- data/vendor/rails/activesupport/lib/active_support/time_with_zone.rb +9 -8
- data/vendor/rails/activesupport/lib/active_support/vendor.rb +6 -7
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb +0 -1
- data/vendor/rails/activesupport/lib/active_support/vendor/{memcache-client-1.6.5 → memcache-client-1.7.4}/memcache.rb +242 -70
- data/vendor/rails/activesupport/lib/active_support/version.rb +1 -1
- data/vendor/rails/activesupport/lib/active_support/xml_mini/jdom.rb +162 -0
- data/vendor/rails/railties/CHANGELOG +10 -0
- data/vendor/rails/railties/Rakefile +13 -9
- data/vendor/rails/railties/bin/about +2 -2
- data/vendor/rails/railties/bin/console +1 -1
- data/vendor/rails/railties/bin/dbconsole +1 -1
- data/vendor/rails/railties/bin/destroy +1 -1
- data/vendor/rails/railties/bin/generate +1 -1
- data/vendor/rails/railties/bin/performance/benchmarker +1 -1
- data/vendor/rails/railties/bin/performance/profiler +1 -1
- data/vendor/rails/railties/bin/plugin +1 -1
- data/vendor/rails/railties/bin/runner +1 -1
- data/vendor/rails/railties/bin/server +1 -1
- data/vendor/rails/railties/builtin/rails_info/rails/info.rb +4 -2
- data/vendor/rails/railties/configs/initializers/new_rails_defaults.rb +2 -0
- data/vendor/rails/railties/configs/routes.rb +1 -1
- data/vendor/rails/railties/configs/seeds.rb +7 -0
- data/vendor/rails/railties/environments/boot.rb +1 -1
- data/vendor/rails/railties/guides/files/javascripts/code_highlighter.js +188 -0
- data/vendor/rails/railties/guides/files/javascripts/guides.js +8 -0
- data/vendor/rails/railties/guides/files/javascripts/highlighters.js +90 -0
- data/vendor/rails/railties/guides/files/stylesheets/main.css +441 -0
- data/vendor/rails/railties/guides/files/stylesheets/print.css +52 -0
- data/vendor/rails/railties/guides/files/stylesheets/reset.css +43 -0
- data/vendor/rails/railties/guides/files/stylesheets/style.css +13 -0
- data/vendor/rails/railties/guides/files/stylesheets/syntax.css +31 -0
- data/vendor/rails/railties/guides/images/belongs_to.png +0 -0
- data/vendor/rails/railties/guides/images/book_icon.gif +0 -0
- data/vendor/rails/railties/guides/images/bullet.gif +0 -0
- data/vendor/rails/railties/guides/images/chapters_icon.gif +0 -0
- data/vendor/rails/railties/guides/images/check_bullet.gif +0 -0
- data/vendor/rails/railties/guides/images/credits_pic_blank.gif +0 -0
- data/vendor/rails/railties/guides/images/csrf.png +0 -0
- data/vendor/rails/railties/guides/images/customized_error_messages.png +0 -0
- data/vendor/rails/railties/guides/images/error_messages.png +0 -0
- data/vendor/rails/railties/guides/images/feature_tile.gif +0 -0
- data/vendor/rails/railties/guides/images/footer_tile.gif +0 -0
- data/vendor/rails/railties/guides/images/fxn.jpg +0 -0
- data/vendor/rails/railties/guides/images/grey_bullet.gif +0 -0
- data/vendor/rails/railties/guides/images/habtm.png +0 -0
- data/vendor/rails/railties/guides/images/has_many.png +0 -0
- data/vendor/rails/railties/guides/images/has_many_through.png +0 -0
- data/vendor/rails/railties/guides/images/has_one.png +0 -0
- data/vendor/rails/railties/guides/images/has_one_through.png +0 -0
- data/vendor/rails/railties/guides/images/header_backdrop.png +0 -0
- data/vendor/rails/railties/guides/images/header_tile.gif +0 -0
- data/vendor/rails/railties/guides/images/i18n/demo_localized_pirate.png +0 -0
- data/vendor/rails/railties/guides/images/i18n/demo_translated_en.png +0 -0
- data/vendor/rails/railties/guides/images/i18n/demo_translated_pirate.png +0 -0
- data/vendor/rails/railties/guides/images/i18n/demo_translation_missing.png +0 -0
- data/vendor/rails/railties/guides/images/i18n/demo_untranslated.png +0 -0
- data/vendor/rails/railties/guides/images/icons/README +5 -0
- data/vendor/rails/railties/guides/images/icons/callouts/1.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/10.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/11.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/12.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/13.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/14.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/15.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/2.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/3.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/4.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/5.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/6.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/7.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/8.png +0 -0
- data/vendor/rails/railties/guides/images/icons/callouts/9.png +0 -0
- data/vendor/rails/railties/guides/images/icons/caution.png +0 -0
- data/vendor/rails/railties/guides/images/icons/example.png +0 -0
- data/vendor/rails/railties/guides/images/icons/home.png +0 -0
- data/vendor/rails/railties/guides/images/icons/important.png +0 -0
- data/vendor/rails/railties/guides/images/icons/next.png +0 -0
- data/vendor/rails/railties/guides/images/icons/note.png +0 -0
- data/vendor/rails/railties/guides/images/icons/prev.png +0 -0
- data/vendor/rails/railties/guides/images/icons/tip.png +0 -0
- data/vendor/rails/railties/guides/images/icons/up.png +0 -0
- data/vendor/rails/railties/guides/images/icons/warning.png +0 -0
- data/vendor/rails/railties/guides/images/nav_arrow.gif +0 -0
- data/vendor/rails/railties/guides/images/polymorphic.png +0 -0
- data/vendor/rails/railties/guides/images/posts_index.png +0 -0
- data/vendor/rails/railties/guides/images/rails_guides_logo.gif +0 -0
- data/vendor/rails/railties/guides/images/rails_logo_remix.gif +0 -0
- data/vendor/rails/railties/guides/images/rails_welcome.png +0 -0
- data/vendor/rails/railties/guides/images/session_fixation.png +0 -0
- data/vendor/rails/railties/guides/images/tab_grey.gif +0 -0
- data/vendor/rails/railties/guides/images/tab_info.gif +0 -0
- data/vendor/rails/railties/guides/images/tab_note.gif +0 -0
- data/vendor/rails/railties/guides/images/tab_red.gif +0 -0
- data/vendor/rails/railties/guides/images/tab_yellow.gif +0 -0
- data/vendor/rails/railties/guides/images/tab_yellow.png +0 -0
- data/vendor/rails/railties/guides/images/validation_error_messages.png +0 -0
- data/vendor/rails/railties/guides/rails_guides.rb +42 -0
- data/vendor/rails/railties/guides/rails_guides/generator.rb +138 -0
- data/vendor/rails/railties/guides/rails_guides/helpers.rb +34 -0
- data/vendor/rails/railties/guides/rails_guides/indexer.rb +55 -0
- data/vendor/rails/railties/guides/rails_guides/textile_extensions.rb +41 -0
- data/vendor/rails/railties/guides/source/2_2_release_notes.textile +422 -0
- data/vendor/rails/railties/guides/source/2_3_release_notes.textile +610 -0
- data/vendor/rails/railties/guides/source/action_controller_overview.textile +776 -0
- data/vendor/rails/railties/guides/source/action_mailer_basics.textile +424 -0
- data/vendor/rails/railties/guides/source/active_record_basics.textile +135 -0
- data/vendor/rails/railties/guides/source/active_record_querying.textile +969 -0
- data/vendor/rails/railties/guides/source/activerecord_validations_callbacks.textile +1086 -0
- data/vendor/rails/railties/guides/source/association_basics.textile +1781 -0
- data/vendor/rails/railties/guides/source/caching_with_rails.textile +524 -0
- data/vendor/rails/railties/guides/source/command_line.textile +589 -0
- data/vendor/rails/railties/guides/source/configuring.textile +234 -0
- data/vendor/rails/railties/guides/source/contribute.textile +71 -0
- data/vendor/rails/railties/guides/source/contributing_to_rails.textile +239 -0
- data/vendor/rails/railties/guides/source/credits.erb.textile +52 -0
- data/vendor/rails/railties/guides/source/debugging_rails_applications.textile +709 -0
- data/vendor/rails/railties/guides/source/form_helpers.textile +766 -0
- data/vendor/rails/railties/guides/source/getting_started.textile +1297 -0
- data/vendor/rails/railties/guides/source/i18n.textile +912 -0
- data/vendor/rails/railties/guides/source/index.erb.textile +124 -0
- data/vendor/rails/railties/guides/source/layout.html.erb +103 -0
- data/vendor/rails/railties/guides/source/layouts_and_rendering.textile +979 -0
- data/vendor/rails/railties/guides/source/migrations.textile +591 -0
- data/vendor/rails/railties/guides/source/nested_model_forms.textile +222 -0
- data/vendor/rails/railties/guides/source/performance_testing.textile +531 -0
- data/vendor/rails/railties/guides/source/plugins.textile +1512 -0
- data/vendor/rails/railties/guides/source/rails_on_rack.textile +309 -0
- data/vendor/rails/railties/guides/source/routing.textile +903 -0
- data/vendor/rails/railties/guides/source/security.textile +986 -0
- data/vendor/rails/railties/guides/source/testing.textile +951 -0
- data/vendor/rails/railties/lib/commands/dbconsole.rb +8 -4
- data/vendor/rails/railties/lib/commands/performance/profiler.rb +1 -1
- data/vendor/rails/railties/lib/initializer.rb +27 -4
- data/vendor/rails/railties/lib/rails/gem_dependency.rb +35 -6
- data/vendor/rails/railties/lib/rails/plugin.rb +12 -0
- data/vendor/rails/railties/lib/rails/plugin/loader.rb +7 -0
- data/vendor/rails/railties/lib/rails/rack/metal.rb +1 -1
- data/vendor/rails/railties/lib/rails/version.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/base.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb +5 -0
- data/vendor/rails/railties/lib/rails_generator/generators/applications/app/template_runner.rb +1 -1
- data/vendor/rails/railties/lib/rails_generator/generators/components/model/model_generator.rb +9 -2
- data/vendor/rails/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +1 -0
- data/vendor/rails/railties/lib/tasks/databases.rake +17 -4
- data/vendor/rails/railties/lib/tasks/gems.rake +19 -6
- data/vendor/rails/railties/lib/tasks/routes.rake +4 -3
- data/vendor/rails/railties/lib/test_help.rb +4 -1
- metadata +158 -58
- data/spec/lib/local_time_spec.rb +0 -40
- data/vendor/rails/actionpack/lib/action_controller/rewindable_input.rb +0 -28
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb +0 -89
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb +0 -22
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb +0 -37
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb +0 -37
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb +0 -58
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb +0 -124
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb +0 -51
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb +0 -55
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb +0 -40
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb +0 -480
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb +0 -63
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb +0 -36
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/chunked.rb +0 -49
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb +0 -61
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb +0 -45
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb +0 -29
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/content_type.rb +0 -23
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb +0 -85
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb +0 -153
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb +0 -88
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb +0 -48
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb +0 -61
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb +0 -8
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb +0 -89
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb +0 -55
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb +0 -84
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb +0 -59
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb +0 -8
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb +0 -18
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb +0 -67
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb +0 -19
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb +0 -462
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb +0 -65
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb +0 -16
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb +0 -27
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb +0 -204
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb +0 -160
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb +0 -57
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb +0 -64
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb +0 -241
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb +0 -179
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb +0 -142
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb +0 -91
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb +0 -109
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb +0 -100
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb +0 -349
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb +0 -106
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb +0 -38
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb +0 -55
- data/vendor/rails/actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb +0 -392
@@ -1,18 +0,0 @@
|
|
1
|
-
require "thin"
|
2
|
-
require "rack/content_length"
|
3
|
-
require "rack/chunked"
|
4
|
-
|
5
|
-
module Rack
|
6
|
-
module Handler
|
7
|
-
class Thin
|
8
|
-
def self.run(app, options={})
|
9
|
-
app = Rack::Chunked.new(Rack::ContentLength.new(app))
|
10
|
-
server = ::Thin::Server.new(options[:Host] || '0.0.0.0',
|
11
|
-
options[:Port] || 8080,
|
12
|
-
app)
|
13
|
-
yield server if block_given?
|
14
|
-
server.start
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
@@ -1,67 +0,0 @@
|
|
1
|
-
require 'webrick'
|
2
|
-
require 'stringio'
|
3
|
-
require 'rack/content_length'
|
4
|
-
|
5
|
-
module Rack
|
6
|
-
module Handler
|
7
|
-
class WEBrick < ::WEBrick::HTTPServlet::AbstractServlet
|
8
|
-
def self.run(app, options={})
|
9
|
-
server = ::WEBrick::HTTPServer.new(options)
|
10
|
-
server.mount "/", Rack::Handler::WEBrick, app
|
11
|
-
trap(:INT) { server.shutdown }
|
12
|
-
yield server if block_given?
|
13
|
-
server.start
|
14
|
-
end
|
15
|
-
|
16
|
-
def initialize(server, app)
|
17
|
-
super server
|
18
|
-
@app = Rack::ContentLength.new(app)
|
19
|
-
end
|
20
|
-
|
21
|
-
def service(req, res)
|
22
|
-
env = req.meta_vars
|
23
|
-
env.delete_if { |k, v| v.nil? }
|
24
|
-
|
25
|
-
env.update({"rack.version" => [0,1],
|
26
|
-
"rack.input" => StringIO.new(req.body.to_s),
|
27
|
-
"rack.errors" => $stderr,
|
28
|
-
|
29
|
-
"rack.multithread" => true,
|
30
|
-
"rack.multiprocess" => false,
|
31
|
-
"rack.run_once" => false,
|
32
|
-
|
33
|
-
"rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
|
34
|
-
})
|
35
|
-
|
36
|
-
env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
|
37
|
-
env["QUERY_STRING"] ||= ""
|
38
|
-
env["REQUEST_PATH"] ||= "/"
|
39
|
-
if env["PATH_INFO"] == ""
|
40
|
-
env.delete "PATH_INFO"
|
41
|
-
else
|
42
|
-
path, n = req.request_uri.path, env["SCRIPT_NAME"].length
|
43
|
-
env["PATH_INFO"] = path[n, path.length-n]
|
44
|
-
end
|
45
|
-
|
46
|
-
status, headers, body = @app.call(env)
|
47
|
-
begin
|
48
|
-
res.status = status.to_i
|
49
|
-
headers.each { |k, vs|
|
50
|
-
if k.downcase == "set-cookie"
|
51
|
-
res.cookies.concat vs.split("\n")
|
52
|
-
else
|
53
|
-
vs.split("\n").each { |v|
|
54
|
-
res[k] = v
|
55
|
-
}
|
56
|
-
end
|
57
|
-
}
|
58
|
-
body.each { |part|
|
59
|
-
res.body << part
|
60
|
-
}
|
61
|
-
ensure
|
62
|
-
body.close if body.respond_to? :close
|
63
|
-
end
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
@@ -1,19 +0,0 @@
|
|
1
|
-
module Rack
|
2
|
-
|
3
|
-
class Head
|
4
|
-
def initialize(app)
|
5
|
-
@app = app
|
6
|
-
end
|
7
|
-
|
8
|
-
def call(env)
|
9
|
-
status, headers, body = @app.call(env)
|
10
|
-
|
11
|
-
if env["REQUEST_METHOD"] == "HEAD"
|
12
|
-
[status, headers, []]
|
13
|
-
else
|
14
|
-
[status, headers, body]
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
19
|
-
end
|
@@ -1,462 +0,0 @@
|
|
1
|
-
require 'rack/utils'
|
2
|
-
|
3
|
-
module Rack
|
4
|
-
# Rack::Lint validates your application and the requests and
|
5
|
-
# responses according to the Rack spec.
|
6
|
-
|
7
|
-
class Lint
|
8
|
-
def initialize(app)
|
9
|
-
@app = app
|
10
|
-
end
|
11
|
-
|
12
|
-
# :stopdoc:
|
13
|
-
|
14
|
-
class LintError < RuntimeError; end
|
15
|
-
module Assertion
|
16
|
-
def assert(message, &block)
|
17
|
-
unless block.call
|
18
|
-
raise LintError, message
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
include Assertion
|
23
|
-
|
24
|
-
## This specification aims to formalize the Rack protocol. You
|
25
|
-
## can (and should) use Rack::Lint to enforce it.
|
26
|
-
##
|
27
|
-
## When you develop middleware, be sure to add a Lint before and
|
28
|
-
## after to catch all mistakes.
|
29
|
-
|
30
|
-
## = Rack applications
|
31
|
-
|
32
|
-
## A Rack application is an Ruby object (not a class) that
|
33
|
-
## responds to +call+.
|
34
|
-
def call(env=nil)
|
35
|
-
dup._call(env)
|
36
|
-
end
|
37
|
-
|
38
|
-
def _call(env)
|
39
|
-
## It takes exactly one argument, the *environment*
|
40
|
-
assert("No env given") { env }
|
41
|
-
check_env env
|
42
|
-
|
43
|
-
env['rack.input'] = InputWrapper.new(env['rack.input'])
|
44
|
-
env['rack.errors'] = ErrorWrapper.new(env['rack.errors'])
|
45
|
-
|
46
|
-
## and returns an Array of exactly three values:
|
47
|
-
status, headers, @body = @app.call(env)
|
48
|
-
## The *status*,
|
49
|
-
check_status status
|
50
|
-
## the *headers*,
|
51
|
-
check_headers headers
|
52
|
-
## and the *body*.
|
53
|
-
check_content_type status, headers
|
54
|
-
check_content_length status, headers, env
|
55
|
-
[status, headers, self]
|
56
|
-
end
|
57
|
-
|
58
|
-
## == The Environment
|
59
|
-
def check_env(env)
|
60
|
-
## The environment must be an true instance of Hash (no
|
61
|
-
## subclassing allowed) that includes CGI-like headers.
|
62
|
-
## The application is free to modify the environment.
|
63
|
-
assert("env #{env.inspect} is not a Hash, but #{env.class}") {
|
64
|
-
env.instance_of? Hash
|
65
|
-
}
|
66
|
-
|
67
|
-
##
|
68
|
-
## The environment is required to include these variables
|
69
|
-
## (adopted from PEP333), except when they'd be empty, but see
|
70
|
-
## below.
|
71
|
-
|
72
|
-
## <tt>REQUEST_METHOD</tt>:: The HTTP request method, such as
|
73
|
-
## "GET" or "POST". This cannot ever
|
74
|
-
## be an empty string, and so is
|
75
|
-
## always required.
|
76
|
-
|
77
|
-
## <tt>SCRIPT_NAME</tt>:: The initial portion of the request
|
78
|
-
## URL's "path" that corresponds to the
|
79
|
-
## application object, so that the
|
80
|
-
## application knows its virtual
|
81
|
-
## "location". This may be an empty
|
82
|
-
## string, if the application corresponds
|
83
|
-
## to the "root" of the server.
|
84
|
-
|
85
|
-
## <tt>PATH_INFO</tt>:: The remainder of the request URL's
|
86
|
-
## "path", designating the virtual
|
87
|
-
## "location" of the request's target
|
88
|
-
## within the application. This may be an
|
89
|
-
## empty string, if the request URL targets
|
90
|
-
## the application root and does not have a
|
91
|
-
## trailing slash. This information should be
|
92
|
-
## decoded by the server if it comes from a
|
93
|
-
## URL.
|
94
|
-
|
95
|
-
## <tt>QUERY_STRING</tt>:: The portion of the request URL that
|
96
|
-
## follows the <tt>?</tt>, if any. May be
|
97
|
-
## empty, but is always required!
|
98
|
-
|
99
|
-
## <tt>SERVER_NAME</tt>, <tt>SERVER_PORT</tt>:: When combined with <tt>SCRIPT_NAME</tt> and <tt>PATH_INFO</tt>, these variables can be used to complete the URL. Note, however, that <tt>HTTP_HOST</tt>, if present, should be used in preference to <tt>SERVER_NAME</tt> for reconstructing the request URL. <tt>SERVER_NAME</tt> and <tt>SERVER_PORT</tt> can never be empty strings, and so are always required.
|
100
|
-
|
101
|
-
## <tt>HTTP_</tt> Variables:: Variables corresponding to the
|
102
|
-
## client-supplied HTTP request
|
103
|
-
## headers (i.e., variables whose
|
104
|
-
## names begin with <tt>HTTP_</tt>). The
|
105
|
-
## presence or absence of these
|
106
|
-
## variables should correspond with
|
107
|
-
## the presence or absence of the
|
108
|
-
## appropriate HTTP header in the
|
109
|
-
## request.
|
110
|
-
|
111
|
-
## In addition to this, the Rack environment must include these
|
112
|
-
## Rack-specific variables:
|
113
|
-
|
114
|
-
## <tt>rack.version</tt>:: The Array [0,1], representing this version of Rack.
|
115
|
-
## <tt>rack.url_scheme</tt>:: +http+ or +https+, depending on the request URL.
|
116
|
-
## <tt>rack.input</tt>:: See below, the input stream.
|
117
|
-
## <tt>rack.errors</tt>:: See below, the error stream.
|
118
|
-
## <tt>rack.multithread</tt>:: true if the application object may be simultaneously invoked by another thread in the same process, false otherwise.
|
119
|
-
## <tt>rack.multiprocess</tt>:: true if an equivalent application object may be simultaneously invoked by another process, false otherwise.
|
120
|
-
## <tt>rack.run_once</tt>:: true if the server expects (but does not guarantee!) that the application will only be invoked this one time during the life of its containing process. Normally, this will only be true for a server based on CGI (or something similar).
|
121
|
-
|
122
|
-
## The server or the application can store their own data in the
|
123
|
-
## environment, too. The keys must contain at least one dot,
|
124
|
-
## and should be prefixed uniquely. The prefix <tt>rack.</tt>
|
125
|
-
## is reserved for use with the Rack core distribution and must
|
126
|
-
## not be used otherwise.
|
127
|
-
##
|
128
|
-
|
129
|
-
%w[REQUEST_METHOD SERVER_NAME SERVER_PORT
|
130
|
-
QUERY_STRING
|
131
|
-
rack.version rack.input rack.errors
|
132
|
-
rack.multithread rack.multiprocess rack.run_once].each { |header|
|
133
|
-
assert("env missing required key #{header}") { env.include? header }
|
134
|
-
}
|
135
|
-
|
136
|
-
## The environment must not contain the keys
|
137
|
-
## <tt>HTTP_CONTENT_TYPE</tt> or <tt>HTTP_CONTENT_LENGTH</tt>
|
138
|
-
## (use the versions without <tt>HTTP_</tt>).
|
139
|
-
%w[HTTP_CONTENT_TYPE HTTP_CONTENT_LENGTH].each { |header|
|
140
|
-
assert("env contains #{header}, must use #{header[5,-1]}") {
|
141
|
-
not env.include? header
|
142
|
-
}
|
143
|
-
}
|
144
|
-
|
145
|
-
## The CGI keys (named without a period) must have String values.
|
146
|
-
env.each { |key, value|
|
147
|
-
next if key.include? "." # Skip extensions
|
148
|
-
assert("env variable #{key} has non-string value #{value.inspect}") {
|
149
|
-
value.instance_of? String
|
150
|
-
}
|
151
|
-
}
|
152
|
-
|
153
|
-
##
|
154
|
-
## There are the following restrictions:
|
155
|
-
|
156
|
-
## * <tt>rack.version</tt> must be an array of Integers.
|
157
|
-
assert("rack.version must be an Array, was #{env["rack.version"].class}") {
|
158
|
-
env["rack.version"].instance_of? Array
|
159
|
-
}
|
160
|
-
## * <tt>rack.url_scheme</tt> must either be +http+ or +https+.
|
161
|
-
assert("rack.url_scheme unknown: #{env["rack.url_scheme"].inspect}") {
|
162
|
-
%w[http https].include? env["rack.url_scheme"]
|
163
|
-
}
|
164
|
-
|
165
|
-
## * There must be a valid input stream in <tt>rack.input</tt>.
|
166
|
-
check_input env["rack.input"]
|
167
|
-
## * There must be a valid error stream in <tt>rack.errors</tt>.
|
168
|
-
check_error env["rack.errors"]
|
169
|
-
|
170
|
-
## * The <tt>REQUEST_METHOD</tt> must be a valid token.
|
171
|
-
assert("REQUEST_METHOD unknown: #{env["REQUEST_METHOD"]}") {
|
172
|
-
env["REQUEST_METHOD"] =~ /\A[0-9A-Za-z!\#$%&'*+.^_`|~-]+\z/
|
173
|
-
}
|
174
|
-
|
175
|
-
## * The <tt>SCRIPT_NAME</tt>, if non-empty, must start with <tt>/</tt>
|
176
|
-
assert("SCRIPT_NAME must start with /") {
|
177
|
-
!env.include?("SCRIPT_NAME") ||
|
178
|
-
env["SCRIPT_NAME"] == "" ||
|
179
|
-
env["SCRIPT_NAME"] =~ /\A\//
|
180
|
-
}
|
181
|
-
## * The <tt>PATH_INFO</tt>, if non-empty, must start with <tt>/</tt>
|
182
|
-
assert("PATH_INFO must start with /") {
|
183
|
-
!env.include?("PATH_INFO") ||
|
184
|
-
env["PATH_INFO"] == "" ||
|
185
|
-
env["PATH_INFO"] =~ /\A\//
|
186
|
-
}
|
187
|
-
## * The <tt>CONTENT_LENGTH</tt>, if given, must consist of digits only.
|
188
|
-
assert("Invalid CONTENT_LENGTH: #{env["CONTENT_LENGTH"]}") {
|
189
|
-
!env.include?("CONTENT_LENGTH") || env["CONTENT_LENGTH"] =~ /\A\d+\z/
|
190
|
-
}
|
191
|
-
|
192
|
-
## * One of <tt>SCRIPT_NAME</tt> or <tt>PATH_INFO</tt> must be
|
193
|
-
## set. <tt>PATH_INFO</tt> should be <tt>/</tt> if
|
194
|
-
## <tt>SCRIPT_NAME</tt> is empty.
|
195
|
-
assert("One of SCRIPT_NAME or PATH_INFO must be set (make PATH_INFO '/' if SCRIPT_NAME is empty)") {
|
196
|
-
env["SCRIPT_NAME"] || env["PATH_INFO"]
|
197
|
-
}
|
198
|
-
## <tt>SCRIPT_NAME</tt> never should be <tt>/</tt>, but instead be empty.
|
199
|
-
assert("SCRIPT_NAME cannot be '/', make it '' and PATH_INFO '/'") {
|
200
|
-
env["SCRIPT_NAME"] != "/"
|
201
|
-
}
|
202
|
-
end
|
203
|
-
|
204
|
-
## === The Input Stream
|
205
|
-
def check_input(input)
|
206
|
-
## The input stream must respond to +gets+, +each+ and +read+.
|
207
|
-
[:gets, :each, :read].each { |method|
|
208
|
-
assert("rack.input #{input} does not respond to ##{method}") {
|
209
|
-
input.respond_to? method
|
210
|
-
}
|
211
|
-
}
|
212
|
-
end
|
213
|
-
|
214
|
-
class InputWrapper
|
215
|
-
include Assertion
|
216
|
-
|
217
|
-
def initialize(input)
|
218
|
-
@input = input
|
219
|
-
end
|
220
|
-
|
221
|
-
def size
|
222
|
-
@input.size
|
223
|
-
end
|
224
|
-
|
225
|
-
def rewind
|
226
|
-
@input.rewind
|
227
|
-
end
|
228
|
-
|
229
|
-
## * +gets+ must be called without arguments and return a string,
|
230
|
-
## or +nil+ on EOF.
|
231
|
-
def gets(*args)
|
232
|
-
assert("rack.input#gets called with arguments") { args.size == 0 }
|
233
|
-
v = @input.gets
|
234
|
-
assert("rack.input#gets didn't return a String") {
|
235
|
-
v.nil? or v.instance_of? String
|
236
|
-
}
|
237
|
-
v
|
238
|
-
end
|
239
|
-
|
240
|
-
## * +read+ must be called without or with one integer argument
|
241
|
-
## and return a string, or +nil+ on EOF.
|
242
|
-
def read(*args)
|
243
|
-
assert("rack.input#read called with too many arguments") {
|
244
|
-
args.size <= 1
|
245
|
-
}
|
246
|
-
if args.size == 1
|
247
|
-
assert("rack.input#read called with non-integer argument") {
|
248
|
-
args.first.kind_of? Integer
|
249
|
-
}
|
250
|
-
end
|
251
|
-
v = @input.read(*args)
|
252
|
-
assert("rack.input#read didn't return a String") {
|
253
|
-
v.nil? or v.instance_of? String
|
254
|
-
}
|
255
|
-
v
|
256
|
-
end
|
257
|
-
|
258
|
-
## * +each+ must be called without arguments and only yield Strings.
|
259
|
-
def each(*args)
|
260
|
-
assert("rack.input#each called with arguments") { args.size == 0 }
|
261
|
-
@input.each { |line|
|
262
|
-
assert("rack.input#each didn't yield a String") {
|
263
|
-
line.instance_of? String
|
264
|
-
}
|
265
|
-
yield line
|
266
|
-
}
|
267
|
-
end
|
268
|
-
|
269
|
-
## * +close+ must never be called on the input stream.
|
270
|
-
def close(*args)
|
271
|
-
assert("rack.input#close must not be called") { false }
|
272
|
-
end
|
273
|
-
end
|
274
|
-
|
275
|
-
## === The Error Stream
|
276
|
-
def check_error(error)
|
277
|
-
## The error stream must respond to +puts+, +write+ and +flush+.
|
278
|
-
[:puts, :write, :flush].each { |method|
|
279
|
-
assert("rack.error #{error} does not respond to ##{method}") {
|
280
|
-
error.respond_to? method
|
281
|
-
}
|
282
|
-
}
|
283
|
-
end
|
284
|
-
|
285
|
-
class ErrorWrapper
|
286
|
-
include Assertion
|
287
|
-
|
288
|
-
def initialize(error)
|
289
|
-
@error = error
|
290
|
-
end
|
291
|
-
|
292
|
-
## * +puts+ must be called with a single argument that responds to +to_s+.
|
293
|
-
def puts(str)
|
294
|
-
@error.puts str
|
295
|
-
end
|
296
|
-
|
297
|
-
## * +write+ must be called with a single argument that is a String.
|
298
|
-
def write(str)
|
299
|
-
assert("rack.errors#write not called with a String") { str.instance_of? String }
|
300
|
-
@error.write str
|
301
|
-
end
|
302
|
-
|
303
|
-
## * +flush+ must be called without arguments and must be called
|
304
|
-
## in order to make the error appear for sure.
|
305
|
-
def flush
|
306
|
-
@error.flush
|
307
|
-
end
|
308
|
-
|
309
|
-
## * +close+ must never be called on the error stream.
|
310
|
-
def close(*args)
|
311
|
-
assert("rack.errors#close must not be called") { false }
|
312
|
-
end
|
313
|
-
end
|
314
|
-
|
315
|
-
## == The Response
|
316
|
-
|
317
|
-
## === The Status
|
318
|
-
def check_status(status)
|
319
|
-
## The status, if parsed as integer (+to_i+), must be greater than or equal to 100.
|
320
|
-
assert("Status must be >=100 seen as integer") { status.to_i >= 100 }
|
321
|
-
end
|
322
|
-
|
323
|
-
## === The Headers
|
324
|
-
def check_headers(header)
|
325
|
-
## The header must respond to each, and yield values of key and value.
|
326
|
-
assert("headers object should respond to #each, but doesn't (got #{header.class} as headers)") {
|
327
|
-
header.respond_to? :each
|
328
|
-
}
|
329
|
-
header.each { |key, value|
|
330
|
-
## The header keys must be Strings.
|
331
|
-
assert("header key must be a string, was #{key.class}") {
|
332
|
-
key.instance_of? String
|
333
|
-
}
|
334
|
-
## The header must not contain a +Status+ key,
|
335
|
-
assert("header must not contain Status") { key.downcase != "status" }
|
336
|
-
## contain keys with <tt>:</tt> or newlines in their name,
|
337
|
-
assert("header names must not contain : or \\n") { key !~ /[:\n]/ }
|
338
|
-
## contain keys names that end in <tt>-</tt> or <tt>_</tt>,
|
339
|
-
assert("header names must not end in - or _") { key !~ /[-_]\z/ }
|
340
|
-
## but only contain keys that consist of
|
341
|
-
## letters, digits, <tt>_</tt> or <tt>-</tt> and start with a letter.
|
342
|
-
assert("invalid header name: #{key}") { key =~ /\A[a-zA-Z][a-zA-Z0-9_-]*\z/ }
|
343
|
-
|
344
|
-
## The values of the header must be Strings,
|
345
|
-
assert("a header value must be a String, but the value of " +
|
346
|
-
"'#{key}' is a #{value.class}") { value.kind_of? String }
|
347
|
-
## consisting of lines (for multiple header values) seperated by "\n".
|
348
|
-
value.split("\n").each { |item|
|
349
|
-
## The lines must not contain characters below 037.
|
350
|
-
assert("invalid header value #{key}: #{item.inspect}") {
|
351
|
-
item !~ /[\000-\037]/
|
352
|
-
}
|
353
|
-
}
|
354
|
-
}
|
355
|
-
end
|
356
|
-
|
357
|
-
## === The Content-Type
|
358
|
-
def check_content_type(status, headers)
|
359
|
-
headers.each { |key, value|
|
360
|
-
## There must be a <tt>Content-Type</tt>, except when the
|
361
|
-
## +Status+ is 1xx, 204 or 304, in which case there must be none
|
362
|
-
## given.
|
363
|
-
if key.downcase == "content-type"
|
364
|
-
assert("Content-Type header found in #{status} response, not allowed") {
|
365
|
-
not Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include? status.to_i
|
366
|
-
}
|
367
|
-
return
|
368
|
-
end
|
369
|
-
}
|
370
|
-
assert("No Content-Type header found") {
|
371
|
-
Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include? status.to_i
|
372
|
-
}
|
373
|
-
end
|
374
|
-
|
375
|
-
## === The Content-Length
|
376
|
-
def check_content_length(status, headers, env)
|
377
|
-
headers.each { |key, value|
|
378
|
-
if key.downcase == 'content-length'
|
379
|
-
## There must not be a <tt>Content-Length</tt> header when the
|
380
|
-
## +Status+ is 1xx, 204 or 304.
|
381
|
-
assert("Content-Length header found in #{status} response, not allowed") {
|
382
|
-
not Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include? status.to_i
|
383
|
-
}
|
384
|
-
|
385
|
-
bytes = 0
|
386
|
-
string_body = true
|
387
|
-
|
388
|
-
if @body.respond_to?(:to_ary)
|
389
|
-
@body.each { |part|
|
390
|
-
unless part.kind_of?(String)
|
391
|
-
string_body = false
|
392
|
-
break
|
393
|
-
end
|
394
|
-
|
395
|
-
bytes += Rack::Utils.bytesize(part)
|
396
|
-
}
|
397
|
-
|
398
|
-
if env["REQUEST_METHOD"] == "HEAD"
|
399
|
-
assert("Response body was given for HEAD request, but should be empty") {
|
400
|
-
bytes == 0
|
401
|
-
}
|
402
|
-
else
|
403
|
-
if string_body
|
404
|
-
assert("Content-Length header was #{value}, but should be #{bytes}") {
|
405
|
-
value == bytes.to_s
|
406
|
-
}
|
407
|
-
end
|
408
|
-
end
|
409
|
-
end
|
410
|
-
|
411
|
-
return
|
412
|
-
end
|
413
|
-
}
|
414
|
-
end
|
415
|
-
|
416
|
-
## === The Body
|
417
|
-
def each
|
418
|
-
@closed = false
|
419
|
-
## The Body must respond to #each
|
420
|
-
@body.each { |part|
|
421
|
-
## and must only yield String values.
|
422
|
-
assert("Body yielded non-string value #{part.inspect}") {
|
423
|
-
part.instance_of? String
|
424
|
-
}
|
425
|
-
yield part
|
426
|
-
}
|
427
|
-
##
|
428
|
-
## If the Body responds to #close, it will be called after iteration.
|
429
|
-
# XXX howto: assert("Body has not been closed") { @closed }
|
430
|
-
|
431
|
-
|
432
|
-
##
|
433
|
-
## If the Body responds to #to_path, it must return a String
|
434
|
-
## identifying the location of a file whose contents are identical
|
435
|
-
## to that produced by calling #each.
|
436
|
-
|
437
|
-
if @body.respond_to?(:to_path)
|
438
|
-
assert("The file identified by body.to_path does not exist") {
|
439
|
-
::File.exist? @body.to_path
|
440
|
-
}
|
441
|
-
end
|
442
|
-
|
443
|
-
##
|
444
|
-
## The Body commonly is an Array of Strings, the application
|
445
|
-
## instance itself, or a File-like object.
|
446
|
-
end
|
447
|
-
|
448
|
-
def close
|
449
|
-
@closed = true
|
450
|
-
@body.close if @body.respond_to?(:close)
|
451
|
-
end
|
452
|
-
|
453
|
-
# :startdoc:
|
454
|
-
|
455
|
-
end
|
456
|
-
end
|
457
|
-
|
458
|
-
## == Thanks
|
459
|
-
## Some parts of this specification are adopted from PEP333: Python
|
460
|
-
## Web Server Gateway Interface
|
461
|
-
## v1.0 (http://www.python.org/dev/peps/pep-0333/). I'd like to thank
|
462
|
-
## everyone involved in that effort.
|