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,63 +0,0 @@
|
|
1
|
-
module Rack
|
2
|
-
# Rack::Builder implements a small DSL to iteratively construct Rack
|
3
|
-
# applications.
|
4
|
-
#
|
5
|
-
# Example:
|
6
|
-
#
|
7
|
-
# app = Rack::Builder.new {
|
8
|
-
# use Rack::CommonLogger
|
9
|
-
# use Rack::ShowExceptions
|
10
|
-
# map "/lobster" do
|
11
|
-
# use Rack::Lint
|
12
|
-
# run Rack::Lobster.new
|
13
|
-
# end
|
14
|
-
# }
|
15
|
-
#
|
16
|
-
# Or
|
17
|
-
#
|
18
|
-
# app = Rack::Builder.app do
|
19
|
-
# use Rack::CommonLogger
|
20
|
-
# lambda { |env| [200, {'Content-Type' => 'text/plain'}, 'OK'] }
|
21
|
-
# end
|
22
|
-
#
|
23
|
-
# +use+ adds a middleware to the stack, +run+ dispatches to an application.
|
24
|
-
# You can use +map+ to construct a Rack::URLMap in a convenient way.
|
25
|
-
|
26
|
-
class Builder
|
27
|
-
def initialize(&block)
|
28
|
-
@ins = []
|
29
|
-
instance_eval(&block) if block_given?
|
30
|
-
end
|
31
|
-
|
32
|
-
def self.app(&block)
|
33
|
-
self.new(&block).to_app
|
34
|
-
end
|
35
|
-
|
36
|
-
def use(middleware, *args, &block)
|
37
|
-
@ins << lambda { |app| middleware.new(app, *args, &block) }
|
38
|
-
end
|
39
|
-
|
40
|
-
def run(app)
|
41
|
-
@ins << app #lambda { |nothing| app }
|
42
|
-
end
|
43
|
-
|
44
|
-
def map(path, &block)
|
45
|
-
if @ins.last.kind_of? Hash
|
46
|
-
@ins.last[path] = self.class.new(&block).to_app
|
47
|
-
else
|
48
|
-
@ins << {}
|
49
|
-
map(path, &block)
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
def to_app
|
54
|
-
@ins[-1] = Rack::URLMap.new(@ins.last) if Hash === @ins.last
|
55
|
-
inner_app = @ins.last
|
56
|
-
@ins[0...-1].reverse.inject(inner_app) { |a, e| e.call(a) }
|
57
|
-
end
|
58
|
-
|
59
|
-
def call(env)
|
60
|
-
to_app.call(env)
|
61
|
-
end
|
62
|
-
end
|
63
|
-
end
|
@@ -1,36 +0,0 @@
|
|
1
|
-
module Rack
|
2
|
-
# Rack::Cascade tries an request on several apps, and returns the
|
3
|
-
# first response that is not 404 (or in a list of configurable
|
4
|
-
# status codes).
|
5
|
-
|
6
|
-
class Cascade
|
7
|
-
attr_reader :apps
|
8
|
-
|
9
|
-
def initialize(apps, catch=404)
|
10
|
-
@apps = apps
|
11
|
-
@catch = [*catch]
|
12
|
-
end
|
13
|
-
|
14
|
-
def call(env)
|
15
|
-
status = headers = body = nil
|
16
|
-
raise ArgumentError, "empty cascade" if @apps.empty?
|
17
|
-
@apps.each { |app|
|
18
|
-
begin
|
19
|
-
status, headers, body = app.call(env)
|
20
|
-
break unless @catch.include?(status.to_i)
|
21
|
-
end
|
22
|
-
}
|
23
|
-
[status, headers, body]
|
24
|
-
end
|
25
|
-
|
26
|
-
def add app
|
27
|
-
@apps << app
|
28
|
-
end
|
29
|
-
|
30
|
-
def include? app
|
31
|
-
@apps.include? app
|
32
|
-
end
|
33
|
-
|
34
|
-
alias_method :<<, :add
|
35
|
-
end
|
36
|
-
end
|
@@ -1,49 +0,0 @@
|
|
1
|
-
require 'rack/utils'
|
2
|
-
|
3
|
-
module Rack
|
4
|
-
|
5
|
-
# Middleware that applies chunked transfer encoding to response bodies
|
6
|
-
# when the response does not include a Content-Length header.
|
7
|
-
class Chunked
|
8
|
-
include Rack::Utils
|
9
|
-
|
10
|
-
def initialize(app)
|
11
|
-
@app = app
|
12
|
-
end
|
13
|
-
|
14
|
-
def call(env)
|
15
|
-
status, headers, body = @app.call(env)
|
16
|
-
headers = HeaderHash.new(headers)
|
17
|
-
|
18
|
-
if env['HTTP_VERSION'] == 'HTTP/1.0' ||
|
19
|
-
STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
|
20
|
-
headers['Content-Length'] ||
|
21
|
-
headers['Transfer-Encoding']
|
22
|
-
[status, headers.to_hash, body]
|
23
|
-
else
|
24
|
-
dup.chunk(status, headers, body)
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
def chunk(status, headers, body)
|
29
|
-
@body = body
|
30
|
-
headers.delete('Content-Length')
|
31
|
-
headers['Transfer-Encoding'] = 'chunked'
|
32
|
-
[status, headers.to_hash, self]
|
33
|
-
end
|
34
|
-
|
35
|
-
def each
|
36
|
-
term = "\r\n"
|
37
|
-
@body.each do |chunk|
|
38
|
-
size = bytesize(chunk)
|
39
|
-
next if size == 0
|
40
|
-
yield [size.to_s(16), term, chunk, term].join
|
41
|
-
end
|
42
|
-
yield ["0", term, "", term].join
|
43
|
-
end
|
44
|
-
|
45
|
-
def close
|
46
|
-
@body.close if @body.respond_to?(:close)
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
@@ -1,61 +0,0 @@
|
|
1
|
-
module Rack
|
2
|
-
# Rack::CommonLogger forwards every request to an +app+ given, and
|
3
|
-
# logs a line in the Apache common log format to the +logger+, or
|
4
|
-
# rack.errors by default.
|
5
|
-
|
6
|
-
class CommonLogger
|
7
|
-
def initialize(app, logger=nil)
|
8
|
-
@app = app
|
9
|
-
@logger = logger
|
10
|
-
end
|
11
|
-
|
12
|
-
def call(env)
|
13
|
-
dup._call(env)
|
14
|
-
end
|
15
|
-
|
16
|
-
def _call(env)
|
17
|
-
@env = env
|
18
|
-
@logger ||= self
|
19
|
-
@time = Time.now
|
20
|
-
@status, @header, @body = @app.call(env)
|
21
|
-
[@status, @header, self]
|
22
|
-
end
|
23
|
-
|
24
|
-
def close
|
25
|
-
@body.close if @body.respond_to? :close
|
26
|
-
end
|
27
|
-
|
28
|
-
# By default, log to rack.errors.
|
29
|
-
def <<(str)
|
30
|
-
@env["rack.errors"].write(str)
|
31
|
-
@env["rack.errors"].flush
|
32
|
-
end
|
33
|
-
|
34
|
-
def each
|
35
|
-
length = 0
|
36
|
-
@body.each { |part|
|
37
|
-
length += part.size
|
38
|
-
yield part
|
39
|
-
}
|
40
|
-
|
41
|
-
@now = Time.now
|
42
|
-
|
43
|
-
# Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
|
44
|
-
# lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 -
|
45
|
-
# %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
|
46
|
-
@logger << %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n} %
|
47
|
-
[
|
48
|
-
@env['HTTP_X_FORWARDED_FOR'] || @env["REMOTE_ADDR"] || "-",
|
49
|
-
@env["REMOTE_USER"] || "-",
|
50
|
-
@now.strftime("%d/%b/%Y %H:%M:%S"),
|
51
|
-
@env["REQUEST_METHOD"],
|
52
|
-
@env["PATH_INFO"],
|
53
|
-
@env["QUERY_STRING"].empty? ? "" : "?"+@env["QUERY_STRING"],
|
54
|
-
@env["HTTP_VERSION"],
|
55
|
-
@status.to_s[0..3],
|
56
|
-
(length.zero? ? "-" : length.to_s),
|
57
|
-
@now - @time
|
58
|
-
]
|
59
|
-
end
|
60
|
-
end
|
61
|
-
end
|
@@ -1,45 +0,0 @@
|
|
1
|
-
require 'rack/utils'
|
2
|
-
|
3
|
-
module Rack
|
4
|
-
|
5
|
-
# Middleware that enables conditional GET using If-None-Match and
|
6
|
-
# If-Modified-Since. The application should set either or both of the
|
7
|
-
# Last-Modified or Etag response headers according to RFC 2616. When
|
8
|
-
# either of the conditions is met, the response body is set to be zero
|
9
|
-
# length and the response status is set to 304 Not Modified.
|
10
|
-
#
|
11
|
-
# Applications that defer response body generation until the body's each
|
12
|
-
# message is received will avoid response body generation completely when
|
13
|
-
# a conditional GET matches.
|
14
|
-
#
|
15
|
-
# Adapted from Michael Klishin's Merb implementation:
|
16
|
-
# http://github.com/wycats/merb-core/tree/master/lib/merb-core/rack/middleware/conditional_get.rb
|
17
|
-
class ConditionalGet
|
18
|
-
def initialize(app)
|
19
|
-
@app = app
|
20
|
-
end
|
21
|
-
|
22
|
-
def call(env)
|
23
|
-
return @app.call(env) unless %w[GET HEAD].include?(env['REQUEST_METHOD'])
|
24
|
-
|
25
|
-
status, headers, body = @app.call(env)
|
26
|
-
headers = Utils::HeaderHash.new(headers)
|
27
|
-
if etag_matches?(env, headers) || modified_since?(env, headers)
|
28
|
-
status = 304
|
29
|
-
body = []
|
30
|
-
end
|
31
|
-
[status, headers, body]
|
32
|
-
end
|
33
|
-
|
34
|
-
private
|
35
|
-
def etag_matches?(env, headers)
|
36
|
-
etag = headers['Etag'] and etag == env['HTTP_IF_NONE_MATCH']
|
37
|
-
end
|
38
|
-
|
39
|
-
def modified_since?(env, headers)
|
40
|
-
last_modified = headers['Last-Modified'] and
|
41
|
-
last_modified == env['HTTP_IF_MODIFIED_SINCE']
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
end
|
@@ -1,29 +0,0 @@
|
|
1
|
-
require 'rack/utils'
|
2
|
-
|
3
|
-
module Rack
|
4
|
-
# Sets the Content-Length header on responses with fixed-length bodies.
|
5
|
-
class ContentLength
|
6
|
-
include Rack::Utils
|
7
|
-
|
8
|
-
def initialize(app)
|
9
|
-
@app = app
|
10
|
-
end
|
11
|
-
|
12
|
-
def call(env)
|
13
|
-
status, headers, body = @app.call(env)
|
14
|
-
headers = HeaderHash.new(headers)
|
15
|
-
|
16
|
-
if !STATUS_WITH_NO_ENTITY_BODY.include?(status) &&
|
17
|
-
!headers['Content-Length'] &&
|
18
|
-
!headers['Transfer-Encoding'] &&
|
19
|
-
(body.respond_to?(:to_ary) || body.respond_to?(:to_str))
|
20
|
-
|
21
|
-
body = [body] if body.respond_to?(:to_str) # rack 0.4 compat
|
22
|
-
length = body.to_ary.inject(0) { |len, part| len + bytesize(part) }
|
23
|
-
headers['Content-Length'] = length.to_s
|
24
|
-
end
|
25
|
-
|
26
|
-
[status, headers, body]
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|
@@ -1,23 +0,0 @@
|
|
1
|
-
require 'rack/utils'
|
2
|
-
|
3
|
-
module Rack
|
4
|
-
|
5
|
-
# Sets the Content-Type header on responses which don't have one.
|
6
|
-
#
|
7
|
-
# Builder Usage:
|
8
|
-
# use Rack::ContentType, "text/plain"
|
9
|
-
#
|
10
|
-
# When no content type argument is provided, "text/html" is assumed.
|
11
|
-
class ContentType
|
12
|
-
def initialize(app, content_type = "text/html")
|
13
|
-
@app, @content_type = app, content_type
|
14
|
-
end
|
15
|
-
|
16
|
-
def call(env)
|
17
|
-
status, headers, body = @app.call(env)
|
18
|
-
headers = Utils::HeaderHash.new(headers)
|
19
|
-
headers['Content-Type'] ||= @content_type
|
20
|
-
[status, headers.to_hash, body]
|
21
|
-
end
|
22
|
-
end
|
23
|
-
end
|
@@ -1,85 +0,0 @@
|
|
1
|
-
require "zlib"
|
2
|
-
require "stringio"
|
3
|
-
require "time" # for Time.httpdate
|
4
|
-
require 'rack/utils'
|
5
|
-
|
6
|
-
module Rack
|
7
|
-
class Deflater
|
8
|
-
def initialize(app)
|
9
|
-
@app = app
|
10
|
-
end
|
11
|
-
|
12
|
-
def call(env)
|
13
|
-
status, headers, body = @app.call(env)
|
14
|
-
headers = Utils::HeaderHash.new(headers)
|
15
|
-
|
16
|
-
# Skip compressing empty entity body responses and responses with
|
17
|
-
# no-transform set.
|
18
|
-
if Utils::STATUS_WITH_NO_ENTITY_BODY.include?(status) ||
|
19
|
-
headers['Cache-Control'].to_s =~ /\bno-transform\b/
|
20
|
-
return [status, headers, body]
|
21
|
-
end
|
22
|
-
|
23
|
-
request = Request.new(env)
|
24
|
-
|
25
|
-
encoding = Utils.select_best_encoding(%w(gzip deflate identity),
|
26
|
-
request.accept_encoding)
|
27
|
-
|
28
|
-
# Set the Vary HTTP header.
|
29
|
-
vary = headers["Vary"].to_s.split(",").map { |v| v.strip }
|
30
|
-
unless vary.include?("*") || vary.include?("Accept-Encoding")
|
31
|
-
headers["Vary"] = vary.push("Accept-Encoding").join(",")
|
32
|
-
end
|
33
|
-
|
34
|
-
case encoding
|
35
|
-
when "gzip"
|
36
|
-
mtime = headers.key?("Last-Modified") ?
|
37
|
-
Time.httpdate(headers["Last-Modified"]) : Time.now
|
38
|
-
body = self.class.gzip(body, mtime)
|
39
|
-
size = Rack::Utils.bytesize(body)
|
40
|
-
headers = headers.merge("Content-Encoding" => "gzip", "Content-Length" => size.to_s)
|
41
|
-
[status, headers, [body]]
|
42
|
-
when "deflate"
|
43
|
-
body = self.class.deflate(body)
|
44
|
-
size = Rack::Utils.bytesize(body)
|
45
|
-
headers = headers.merge("Content-Encoding" => "deflate", "Content-Length" => size.to_s)
|
46
|
-
[status, headers, [body]]
|
47
|
-
when "identity"
|
48
|
-
[status, headers, body]
|
49
|
-
when nil
|
50
|
-
message = "An acceptable encoding for the requested resource #{request.fullpath} could not be found."
|
51
|
-
[406, {"Content-Type" => "text/plain", "Content-Length" => message.length.to_s}, [message]]
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
def self.gzip(body, mtime)
|
56
|
-
io = StringIO.new
|
57
|
-
gzip = Zlib::GzipWriter.new(io)
|
58
|
-
gzip.mtime = mtime
|
59
|
-
|
60
|
-
# TODO: Add streaming
|
61
|
-
body.each { |part| gzip << part }
|
62
|
-
|
63
|
-
gzip.close
|
64
|
-
return io.string
|
65
|
-
end
|
66
|
-
|
67
|
-
DEFLATE_ARGS = [
|
68
|
-
Zlib::DEFAULT_COMPRESSION,
|
69
|
-
# drop the zlib header which causes both Safari and IE to choke
|
70
|
-
-Zlib::MAX_WBITS,
|
71
|
-
Zlib::DEF_MEM_LEVEL,
|
72
|
-
Zlib::DEFAULT_STRATEGY
|
73
|
-
]
|
74
|
-
|
75
|
-
# Loosely based on Mongrel's Deflate handler
|
76
|
-
def self.deflate(body)
|
77
|
-
deflater = Zlib::Deflate.new(*DEFLATE_ARGS)
|
78
|
-
|
79
|
-
# TODO: Add streaming
|
80
|
-
body.each { |part| deflater << part }
|
81
|
-
|
82
|
-
return deflater.finish
|
83
|
-
end
|
84
|
-
end
|
85
|
-
end
|
@@ -1,153 +0,0 @@
|
|
1
|
-
require 'time'
|
2
|
-
require 'rack/utils'
|
3
|
-
require 'rack/mime'
|
4
|
-
|
5
|
-
module Rack
|
6
|
-
# Rack::Directory serves entries below the +root+ given, according to the
|
7
|
-
# path info of the Rack request. If a directory is found, the file's contents
|
8
|
-
# will be presented in an html based index. If a file is found, the env will
|
9
|
-
# be passed to the specified +app+.
|
10
|
-
#
|
11
|
-
# If +app+ is not specified, a Rack::File of the same +root+ will be used.
|
12
|
-
|
13
|
-
class Directory
|
14
|
-
DIR_FILE = "<tr><td class='name'><a href='%s'>%s</a></td><td class='size'>%s</td><td class='type'>%s</td><td class='mtime'>%s</td></tr>"
|
15
|
-
DIR_PAGE = <<-PAGE
|
16
|
-
<html><head>
|
17
|
-
<title>%s</title>
|
18
|
-
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
19
|
-
<style type='text/css'>
|
20
|
-
table { width:100%%; }
|
21
|
-
.name { text-align:left; }
|
22
|
-
.size, .mtime { text-align:right; }
|
23
|
-
.type { width:11em; }
|
24
|
-
.mtime { width:15em; }
|
25
|
-
</style>
|
26
|
-
</head><body>
|
27
|
-
<h1>%s</h1>
|
28
|
-
<hr />
|
29
|
-
<table>
|
30
|
-
<tr>
|
31
|
-
<th class='name'>Name</th>
|
32
|
-
<th class='size'>Size</th>
|
33
|
-
<th class='type'>Type</th>
|
34
|
-
<th class='mtime'>Last Modified</th>
|
35
|
-
</tr>
|
36
|
-
%s
|
37
|
-
</table>
|
38
|
-
<hr />
|
39
|
-
</body></html>
|
40
|
-
PAGE
|
41
|
-
|
42
|
-
attr_reader :files
|
43
|
-
attr_accessor :root, :path
|
44
|
-
|
45
|
-
def initialize(root, app=nil)
|
46
|
-
@root = F.expand_path(root)
|
47
|
-
@app = app || Rack::File.new(@root)
|
48
|
-
end
|
49
|
-
|
50
|
-
def call(env)
|
51
|
-
dup._call(env)
|
52
|
-
end
|
53
|
-
|
54
|
-
F = ::File
|
55
|
-
|
56
|
-
def _call(env)
|
57
|
-
@env = env
|
58
|
-
@script_name = env['SCRIPT_NAME']
|
59
|
-
@path_info = Utils.unescape(env['PATH_INFO'])
|
60
|
-
|
61
|
-
if forbidden = check_forbidden
|
62
|
-
forbidden
|
63
|
-
else
|
64
|
-
@path = F.join(@root, @path_info)
|
65
|
-
list_path
|
66
|
-
end
|
67
|
-
end
|
68
|
-
|
69
|
-
def check_forbidden
|
70
|
-
return unless @path_info.include? ".."
|
71
|
-
|
72
|
-
body = "Forbidden\n"
|
73
|
-
size = Rack::Utils.bytesize(body)
|
74
|
-
return [403, {"Content-Type" => "text/plain","Content-Length" => size.to_s}, [body]]
|
75
|
-
end
|
76
|
-
|
77
|
-
def list_directory
|
78
|
-
@files = [['../','Parent Directory','','','']]
|
79
|
-
glob = F.join(@path, '*')
|
80
|
-
|
81
|
-
Dir[glob].sort.each do |node|
|
82
|
-
stat = stat(node)
|
83
|
-
next unless stat
|
84
|
-
basename = F.basename(node)
|
85
|
-
ext = F.extname(node)
|
86
|
-
|
87
|
-
url = F.join(@script_name, @path_info, basename)
|
88
|
-
size = stat.size
|
89
|
-
type = stat.directory? ? 'directory' : Mime.mime_type(ext)
|
90
|
-
size = stat.directory? ? '-' : filesize_format(size)
|
91
|
-
mtime = stat.mtime.httpdate
|
92
|
-
url << '/' if stat.directory?
|
93
|
-
basename << '/' if stat.directory?
|
94
|
-
|
95
|
-
@files << [ url, basename, size, type, mtime ]
|
96
|
-
end
|
97
|
-
|
98
|
-
return [ 200, {'Content-Type'=>'text/html; charset=utf-8'}, self ]
|
99
|
-
end
|
100
|
-
|
101
|
-
def stat(node, max = 10)
|
102
|
-
F.stat(node)
|
103
|
-
rescue Errno::ENOENT, Errno::ELOOP
|
104
|
-
return nil
|
105
|
-
end
|
106
|
-
|
107
|
-
# TODO: add correct response if not readable, not sure if 404 is the best
|
108
|
-
# option
|
109
|
-
def list_path
|
110
|
-
@stat = F.stat(@path)
|
111
|
-
|
112
|
-
if @stat.readable?
|
113
|
-
return @app.call(@env) if @stat.file?
|
114
|
-
return list_directory if @stat.directory?
|
115
|
-
else
|
116
|
-
raise Errno::ENOENT, 'No such file or directory'
|
117
|
-
end
|
118
|
-
|
119
|
-
rescue Errno::ENOENT, Errno::ELOOP
|
120
|
-
return entity_not_found
|
121
|
-
end
|
122
|
-
|
123
|
-
def entity_not_found
|
124
|
-
body = "Entity not found: #{@path_info}\n"
|
125
|
-
size = Rack::Utils.bytesize(body)
|
126
|
-
return [404, {"Content-Type" => "text/plain", "Content-Length" => size.to_s}, [body]]
|
127
|
-
end
|
128
|
-
|
129
|
-
def each
|
130
|
-
show_path = @path.sub(/^#{@root}/,'')
|
131
|
-
files = @files.map{|f| DIR_FILE % f }*"\n"
|
132
|
-
page = DIR_PAGE % [ show_path, show_path , files ]
|
133
|
-
page.each_line{|l| yield l }
|
134
|
-
end
|
135
|
-
|
136
|
-
# Stolen from Ramaze
|
137
|
-
|
138
|
-
FILESIZE_FORMAT = [
|
139
|
-
['%.1fT', 1 << 40],
|
140
|
-
['%.1fG', 1 << 30],
|
141
|
-
['%.1fM', 1 << 20],
|
142
|
-
['%.1fK', 1 << 10],
|
143
|
-
]
|
144
|
-
|
145
|
-
def filesize_format(int)
|
146
|
-
FILESIZE_FORMAT.each do |format, size|
|
147
|
-
return format % (int.to_f / size) if int >= size
|
148
|
-
end
|
149
|
-
|
150
|
-
int.to_s + 'B'
|
151
|
-
end
|
152
|
-
end
|
153
|
-
end
|